Use cpp symbol __x86_64__ rather than __amd64__ on the advice of

Michael Matz.

git-svn-id: svn://svn.valgrind.org/vex/trunk@1111

diff --git a/VEX/pub/libvex_basictypes.h b/VEX/pub/libvex_basictypes.h
index db191efa74b51c3933b8169155d15eea87972492..a45020a31edc6f0343a708d041cd3b7685781d7f 100644 (file)
--- a/VEX/pub/libvex_basictypes.h
+++ b/VEX/pub/libvex_basictypes.h
@@ -124,7 +124,7 @@ typedef  unsigned long HWord;
 
 #undef VEX_HOST_WORDSIZE
 
-#if defined(__amd64__)
+#if defined(__x86_64__)
 #   define VEX_HOST_WORDSIZE 8
 #elif defined(__i386__)
 #   define VEX_HOST_WORDSIZE 4

diff --git a/VEX/switchback/linker.c b/VEX/switchback/linker.c
index 57f9ed4337a7a19f6f8786c58e88827df256e7a8..860ac80e41dae6ae5452eb58fda531709ea6403c 100644 (file)
--- a/VEX/switchback/linker.c
+++ b/VEX/switchback/linker.c
@@ -18,7 +18,7 @@
 static int debug_linker = 0;
 
 
-#if defined(__amd64__)
+#if defined(__x86_64__)
 #   define x86_64_TARGET_ARCH
 #elif defined(__i386__)
 #   define i386_TARGET_ARCH
@@ -1175,7 +1175,7 @@ ocGetNames_ELF ( ObjectCode* oc )
 
          if (secno == SHN_COMMON) {
             isLocal = FALSE;
-#           if defined(__amd64__)
+#           if defined(__x86_64__)
             ad = calloc_below2G(1, stab[j].st_size);
 #           else
             ad = calloc(1, stab[j].st_size);

diff --git a/VEX/switchback/switchback.c b/VEX/switchback/switchback.c
index 2e49936f39f4644e678e6569b7947650306f4778..51dd57db533aa9f32e501eba572b33c624fde077 100644 (file)
--- a/VEX/switchback/switchback.c
+++ b/VEX/switchback/switchback.c
@@ -35,7 +35,7 @@ static Int   n_translations_made = 0;
 #  define VexArch                   VexArchX86
 #  define VexSubArch                VexSubArchX86_sse1
 #  define GuestPC                   guest_EIP
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
 #  define VexGuestState             VexGuestAMD64State
 #  define LibVEX_Guest_initialise   LibVEX_GuestAMD64_initialise
 #  define VexArch                   VexArchAMD64
@@ -143,7 +143,7 @@ void switchback ( void )
    switchback_asm(); // never returns
 }
 
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
 
 asm(
 "switchback_asm:\n"
@@ -340,7 +340,7 @@ asm(
 "   ret\n"
 );
 
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
 asm(
 "run_translation_asm:\n"
 
@@ -656,7 +656,7 @@ static void run_simulator ( void )
             gst.guest_ESP = esp+4;
             next_guest = gst.guest_EIP;
          }
-#        elif defined(__amd64__)
+#        elif defined(__x86_64__)
          {
             HWord esp = gst.guest_RSP;
             gst.guest_RIP = *(UInt*)(esp+0);
@@ -772,7 +772,7 @@ int main ( Int argc, HChar** argv )
    gst.guest_ESP = (UInt)&gstack[25000];
    *(UInt*)(gst.guest_ESP+4) = (UInt)serviceFn;
    *(UInt*)(gst.guest_ESP+0) = 0x12345678;
-#  elif defined(__amd64__)
+#  elif defined(__x86_64__)
    gst.guest_RIP = (ULong)entry;
    gst.guest_RSP = (ULong)&gstack[25000];
    gst.guest_RDI = (ULong)serviceFn;