Fix a crash in gen-apply under x86-64.

diff --git a/ChangeLog b/ChangeLog
index d97fd13f5938170e39f8fe2e748d5fcdfdf3ac1c..533736e5bcbdc4da4119589014a1cb796af10b5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 
+2004-06-25  Rhys Weatherley  <rweather@southern-storm.com.au>
+
+       * tools/gen-apply.c: fix a crash in gen-apply under x86-64.
+
 2004-06-24  Rhys Weatherley  <rweather@southern-storm.com.au>
 
        * jit/jit-reg-alloc.c, jit/jit-rules-arm.h, jit/jit-rules-interp.c,

diff --git a/tools/gen-apply.c b/tools/gen-apply.c
index 41194f0741d5aa481d28afec30381e88f5cf42f2..dc46fb1d13f7a59b1e7dc301f8f719a6311da999 100644 (file)
--- a/tools/gen-apply.c
+++ b/tools/gen-apply.c
@@ -51,6 +51,9 @@ the "jit-apply-rules.h" file.
 #if defined(__APPLE__) && defined(__MACH__)
        #define PLATFORM_IS_MACOSX      1
 #endif
+#if defined(__x86_64__) || defined(__x86_64)
+       #define PLATFORM_IS_X86_64      1
+#endif
 
 #if defined(PLATFORM_IS_GCC) || defined(PLATFORM_IS_WIN32)
 
@@ -924,6 +927,7 @@ void detect_struct_conventions(void)
        call_struct_test(14);
        call_struct_test(15);
        call_struct_test(16);
+#ifndef PLATFORM_IS_X86_64
        call_struct_test(17);
        call_struct_test(18);
        call_struct_test(19);
@@ -972,6 +976,7 @@ void detect_struct_conventions(void)
        call_struct_test(62);
        call_struct_test(63);
        call_struct_test(64);
+#endif /* PLATFORM_IS_X86_64 */
 }
 
 /*