orcx86: use HAVE_AMD64 and HAVE_I386 defines everywhere

Some places were checking for __amd64__ and __i386__ explicitly,
but MSVC doesn't define __amd64__ in 64-bit mode, so use the
define from config.h instead. Fixes incorrect asm generation
on 64-bit Windows

diff --git a/orc/orccpu-x86.c b/orc/orccpu-x86.c
index f55b2c5..f5620b0 100644 (file)
--- a/orc/orccpu-x86.c
+++ b/orc/orccpu-x86.c
@@ -88,14 +88,14 @@ get_cpuid_ecx (orc_uint32 op, orc_uint32 init_ecx, orc_uint32 *a, orc_uint32 *b,
 {
   *a = op;
   *c = init_ecx;
-#ifdef __i386__
+#if defined(HAVE_I386)
   __asm__ (
       "  pushl %%ebx\n"
       "  cpuid\n"
       "  mov %%ebx, %%esi\n"
       "  popl %%ebx\n"
       : "+a" (*a), "=S" (*b), "+c" (*c), "=d" (*d));
-#elif defined(__amd64__)
+#elif defined(HAVE_AMD64)
   __asm__ (
       "  cpuid\n"
       : "+a" (*a), "=b" (*b), "+c" (*c), "=d" (*d));

diff --git a/orc/orcprogram-mmx.c b/orc/orcprogram-mmx.c
index 50169ef..a4f3f8e 100644 (file)
--- a/orc/orcprogram-mmx.c
+++ b/orc/orcprogram-mmx.c
@@ -88,7 +88,7 @@ orc_compiler_mmx_get_default_flags (void)
 {
   unsigned int flags = 0;
 
-#ifdef __amd64__
+#if defined (HAVE_AMD64)
   flags |= ORC_TARGET_MMX_64BIT;
 #endif
   if (_orc_compiler_flag_debug) {

diff --git a/orc/orcprogram-sse.c b/orc/orcprogram-sse.c
index 51c1536..0f27b9a 100644 (file)
--- a/orc/orcprogram-sse.c
+++ b/orc/orcprogram-sse.c
@@ -88,7 +88,7 @@ orc_compiler_sse_get_default_flags (void)
 {
   unsigned int flags = 0;
 
-#ifdef __amd64__
+#if defined(HAVE_AMD64)
   flags |= ORC_TARGET_SSE_64BIT;
 #endif
   if (_orc_compiler_flag_debug) {