Instead of having two asm_macr.h files being switched in based on module

build magic, name them asm_macr_ARCH.h. Change all including files accordingly.

12 files changed, 8 insertions, 16 deletions

diff --git a/src/block/serpent_ia32/serp_ia32_imp.S b/src/block/serpent_ia32/serp_ia32_imp.S
index 5ab630f43..8b4a79937 100644
--- a/src/block/serpent_ia32/serp_ia32_imp.S
+++ b/src/block/serpent_ia32/serp_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_ia32.h>
 
 START_LISTING(serp_ia32.S)
 
diff --git a/src/hash/md4_ia32/md4_ia32_imp.S b/src/hash/md4_ia32/md4_ia32_imp.S
index 50f30d9b8..1df972bb9 100644
--- a/src/hash/md4_ia32/md4_ia32_imp.S
+++ b/src/hash/md4_ia32/md4_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_ia32.h>
 
 START_LISTING(md4_ia32.S)
 
diff --git a/src/hash/md5_ia32/md5_ia32_imp.S b/src/hash/md5_ia32/md5_ia32_imp.S
index bf85a26b6..d1aecb834 100644
--- a/src/hash/md5_ia32/md5_ia32_imp.S
+++ b/src/hash/md5_ia32/md5_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_ia32.h>
 
 START_LISTING(md5_ia32.S)
 
diff --git a/src/hash/sha1_amd64/sha1_amd64_imp.S b/src/hash/sha1_amd64/sha1_amd64_imp.S
index e648453dc..d45e2fd86 100644
--- a/src/hash/sha1_amd64/sha1_amd64_imp.S
+++ b/src/hash/sha1_amd64/sha1_amd64_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_amd64.h>
 
 START_LISTING(sha1_amd64.S)
 
diff --git a/src/hash/sha1_ia32/sha1_ia32_imp.S b/src/hash/sha1_ia32/sha1_ia32_imp.S
index 3411313c3..3167fce9a 100644
--- a/src/hash/sha1_ia32/sha1_ia32_imp.S
+++ b/src/hash/sha1_ia32/sha1_ia32_imp.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_ia32.h>
 
 START_LISTING(sha1_ia32.S)
 
diff --git a/src/math/bigint/monty_amd64/mp_monty.S b/src/math/bigint/monty_amd64/mp_monty.S
index d5f97601d..fa493aaa2 100644
--- a/src/math/bigint/monty_amd64/mp_monty.S
+++ b/src/math/bigint/monty_amd64/mp_monty.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_amd64.h>
 
 START_LISTING(mp_monty.S)
 
diff --git a/src/math/bigint/mulop_amd64/mp_mulop_amd64.S b/src/math/bigint/mulop_amd64/mp_mulop_amd64.S
index 63ac55e95..dd794bccd 100644
--- a/src/math/bigint/mulop_amd64/mp_mulop_amd64.S
+++ b/src/math/bigint/mulop_amd64/mp_mulop_amd64.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_amd64.h>
 
 START_LISTING(mp_mulop.S)
 
diff --git a/src/math/bigint/mulop_ia32/mp_mulop.S b/src/math/bigint/mulop_ia32/mp_mulop.S
index 988ef573c..0ca559659 100644
--- a/src/math/bigint/mulop_ia32/mp_mulop.S
+++ b/src/math/bigint/mulop_ia32/mp_mulop.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr.h>
+#include <botan/asm_macr_ia32.h>
 
 START_LISTING(mp_muladd.S)
 
diff --git a/src/utils/asm_amd64/asm_macr.h b/src/utils/asm_amd64/asm_macr_amd64.h
index 287fa3e88..287fa3e88 100644
--- a/src/utils/asm_amd64/asm_macr.h
+++ b/src/utils/asm_amd64/asm_macr_amd64.h
diff --git a/src/utils/asm_amd64/info.txt b/src/utils/asm_amd64/info.txt
index a5588669c..fdfcbcb6a 100644
--- a/src/utils/asm_amd64/info.txt
+++ b/src/utils/asm_amd64/info.txt
@@ -1,9 +1,5 @@
 load_on dep
 
-<add>
-asm_macr.h
-</add>
-
 <arch>
 amd64
 </arch>
diff --git a/src/utils/asm_ia32/asm_macr.h b/src/utils/asm_ia32/asm_macr_ia32.h
index 2ea69512b..2ea69512b 100644
--- a/src/utils/asm_ia32/asm_macr.h
+++ b/src/utils/asm_ia32/asm_macr_ia32.h
diff --git a/src/utils/asm_ia32/info.txt b/src/utils/asm_ia32/info.txt
index 63b57e0f8..d19fdd192 100644
--- a/src/utils/asm_ia32/info.txt
+++ b/src/utils/asm_ia32/info.txt
@@ -1,9 +1,5 @@
 load_on dep
 
-<add>
-asm_macr.h
-</add>
-
 <arch>
 ia32
 </arch>