aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2007-11-11 23:58:52 +0000
committerlloyd <[email protected]>2007-11-11 23:58:52 +0000
commit1c0a6e71db8188d2388c20246bd4b804a118ede2 (patch)
treebb2acd9fee048b3d71f22263a8b06a1c26db5b9b
parent7f3a3d666d9f11f4243c6443e75e0930dd3e9d9b (diff)
Remove amd64 support from the mp_asm64 module. Use mp_amd64 instead.
-rw-r--r--modules/mp_asm64/modinfo.txt2
-rw-r--r--modules/mp_asm64/mp_asm.h9
2 files changed, 1 insertions, 10 deletions
diff --git a/modules/mp_asm64/modinfo.txt b/modules/mp_asm64/modinfo.txt
index 6c51ed5b8..e371c9ede 100644
--- a/modules/mp_asm64/modinfo.txt
+++ b/modules/mp_asm64/modinfo.txt
@@ -8,10 +8,8 @@ load_on asm_ok
mp_asm.h
</replace>
-# Disable amd64 since (nominally) the mp_amd64 module has that covered
<arch>
alpha
-# amd64
ia64
mips64
ppc64
diff --git a/modules/mp_asm64/mp_asm.h b/modules/mp_asm64/mp_asm.h
index b3a60219d..6abab6166 100644
--- a/modules/mp_asm64/mp_asm.h
+++ b/modules/mp_asm64/mp_asm.h
@@ -12,14 +12,7 @@
#error The mp_asm64 module requires that BOTAN_MP_WORD_BITS == 64
#endif
-#if defined(BOTAN_TARGET_ARCH_IS_AMD64)
-
-#define BOTAN_WORD_MUL(a,b,z1,z0) do { \
- asm("mulq %3" : "=d" (z0), "=a" (z1) : \
- "a" (a), "rm" (b) : "cc"); \
-} while(0);
-
-#elif defined(BOTAN_TARGET_ARCH_IS_ALPHA)
+#if defined(BOTAN_TARGET_ARCH_IS_ALPHA)
#define BOTAN_WORD_MUL(a,b,z1,z0) do { \
asm("umulh %1,%2,%0" : "=r" (z0) : "r" (a), "r" (b)); \