Flatten out the mp directory since no alternative asm implemenations

for Montgomery or multiply/square currently exist and almost ceratainly
won't be added during 1.10

Fix the name for Sun Studio in mp_asm64

6 files changed, 3 insertions, 13 deletions

diff --git a/src/math/mp/info.txt b/src/math/mp/info.txt
index 911093699..bf7f40d3c 100644
--- a/src/math/mp/info.txt
+++ b/src/math/mp/info.txt
@@ -4,6 +4,8 @@ define BIGINT_MP
 mp_asm.cpp
 mp_comba.cpp
 mp_karat.cpp
+mp_monty.cpp
+mp_mulop.cpp
 mp_misc.cpp
 mp_shift.cpp
 </source>
@@ -18,6 +20,4 @@ mp_core.h
 
 <requires>
 mp_x86_64|mp_msvc64|mp_asm64|mp_x86_32|mp_x86_32_msvc|mp_generic
-monty_generic
-mulop_generic
 </requires>
diff --git a/src/math/mp/monty_generic/info.txt b/src/math/mp/monty_generic/info.txt
deleted file mode 100644
index cd05ccdc0..000000000
--- a/src/math/mp/monty_generic/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-load_on dep
-
-<source>
-mp_monty.cpp
-</source>
diff --git a/src/math/mp/mp_asm64/info.txt b/src/math/mp/mp_asm64/info.txt
index 42363e8b0..9af7c4ae7 100644
--- a/src/math/mp/mp_asm64/info.txt
+++ b/src/math/mp/mp_asm64/info.txt
@@ -20,5 +20,5 @@ sparc64
 # win, so it's probably worth using elsewhere.
 <cc>
 gcc
-sunwspro
+sunstudio
 </cc>
diff --git a/src/math/mp/monty_generic/mp_monty.cpp b/src/math/mp/mp_monty.cpp
index d7f7e0306..d7f7e0306 100644
--- a/src/math/mp/monty_generic/mp_monty.cpp
+++ b/src/math/mp/mp_monty.cpp
diff --git a/src/math/mp/mulop_generic/mp_mulop.cpp b/src/math/mp/mp_mulop.cpp
index e6a8ba891..e6a8ba891 100644
--- a/src/math/mp/mulop_generic/mp_mulop.cpp
+++ b/src/math/mp/mp_mulop.cpp
diff --git a/src/math/mp/mulop_generic/info.txt b/src/math/mp/mulop_generic/info.txt
deleted file mode 100644
index 548d0f44b..000000000
--- a/src/math/mp/mulop_generic/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-load_on dep
-
-<source>
-mp_mulop.cpp
-</source>