Rename all references of ia32 to x86-32 and amd64 to x86-64.

Back the reported version from 1.10.0 to 1.9.17 for the time
being. Still on the fence if this will be 1.10.0 or another release
candidate instead.

6 files changed, 13 insertions, 13 deletions

diff --git a/src/utils/asm_ia32/asm_macr_ia32.h b/src/utils/asm_x86_32/asm_x86_32.h
index 2ea69512b..d5482c419 100644
--- a/src/utils/asm_ia32/asm_macr_ia32.h
+++ b/src/utils/asm_x86_32/asm_x86_32.h
@@ -1,12 +1,12 @@
 /*
-* Assembly Macros
+* Assembly Macros for 32-bit x86
 * (C) 1999-2008 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_IA32_ASM_MACROS_H__
-#define BOTAN_IA32_ASM_MACROS_H__
+#ifndef BOTAN_ASM_MACROS_X86_32_H__
+#define BOTAN_ASM_MACROS_X86_32_H__
 
 /*
 * General/Global Macros
diff --git a/src/utils/asm_ia32/info.txt b/src/utils/asm_x86_32/info.txt
index 997d51b8c..8534d9aef 100644
--- a/src/utils/asm_ia32/info.txt
+++ b/src/utils/asm_x86_32/info.txt
@@ -1,11 +1,11 @@
 load_on dep
 
 <header:internal>
-asm_macr_ia32.h
+asm_x86_32.h
 </header:internal>
 
 <arch>
-ia32
+x86_32
 </arch>
 
 # ELF systems
diff --git a/src/utils/asm_amd64/asm_macr_amd64.h b/src/utils/asm_x86_64/asm_x86_64.h
index 287fa3e88..7abc1f392 100644
--- a/src/utils/asm_amd64/asm_macr_amd64.h
+++ b/src/utils/asm_x86_64/asm_x86_64.h
@@ -1,12 +1,12 @@
 /*
-* Assembly Macros
+* Assembly Macros for 64-bit x86
 * (C) 1999-2008 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_AMD64_ASM_MACROS_H__
-#define BOTAN_AMD64_ASM_MACROS_H__
+#ifndef BOTAN_ASM_MACROS_X86_64_H__
+#define BOTAN_ASM_MACROS_X86_64_H__
 
 /*
 * General/Global Macros
diff --git a/src/utils/asm_amd64/info.txt b/src/utils/asm_x86_64/info.txt
index 404aeca7b..3173f3b14 100644
--- a/src/utils/asm_amd64/info.txt
+++ b/src/utils/asm_x86_64/info.txt
@@ -1,11 +1,11 @@
 load_on dep
 
 <header:internal>
-asm_macr_amd64.h
+asm_x86_64.h
 </header:internal>
 
 <arch>
-amd64
+x86_64
 </arch>
 
 <cc>
diff --git a/src/utils/bswap.h b/src/utils/bswap.h
index 66a230d46..9d2c9bc28 100644
--- a/src/utils/bswap.h
+++ b/src/utils/bswap.h
@@ -59,7 +59,7 @@ inline u32bit reverse_bytes(u32bit val)
 
    return val;
 
-#elif defined(_MSC_VER) && defined(BOTAN_TARGET_ARCH_IS_IA32)
+#elif defined(_MSC_VER) && defined(BOTAN_TARGET_ARCH_IS_X86_32)
 
    // Visual C++ inline asm for 32-bit x86, by Yves Jerschow
    __asm mov eax, val;
@@ -84,7 +84,7 @@ inline u64bit reverse_bytes(u64bit val)
    // GCC intrinsic added in 4.3, works for a number of CPUs
    return __builtin_bswap64(val);
 
-#elif BOTAN_USE_GCC_INLINE_ASM && defined(BOTAN_TARGET_ARCH_IS_AMD64)
+#elif BOTAN_USE_GCC_INLINE_ASM && defined(BOTAN_TARGET_ARCH_IS_X86_64)
    // GCC-style inline assembly for x86-64
    asm("bswapq %0" : "=r" (val) : "0" (val));
    return val;
diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index 468ae9d3d..cb6fdaba5 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -164,7 +164,7 @@ void CPUID::initialize()
 
    x86_processor_flags = (static_cast<u64bit>(cpuid[2]) << 32) | cpuid[3];
 
-#if defined(BOTAN_TARGET_ARCH_IS_AMD64)
+#if defined(BOTAN_TARGET_ARCH_IS_X86_64)
    /*
    * If we don't have access to CPUID, we can still safely assume that
    * any x86-64 processor has SSE2.