From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 15 Aug 2005 19:05:50 +0000 (+0000)
Subject: make tests run on x86_64 platform
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=53c9b327792b000f06d162ceb30460ca5fa76aab;p=fw%2Fsdcc

make tests run on x86_64 platform


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3844 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/support/regression/tests/bitfields.c b/support/regression/tests/bitfields.c
index 76b9df18..4ed42e25 100644
--- a/support/regression/tests/bitfields.c
+++ b/support/regression/tests/bitfields.c
@@ -95,13 +95,19 @@ testBitfieldSizeof(void)
   ASSERT( sizeof(size1a_bf) >= 1);
   ASSERT( sizeof(size1b_bf) >= 1);
   ASSERT( sizeof(size1c_bf) >= 1);
+#if !defined (__amd64__)
+  /* assertion fails on amd64 */
   ASSERT( sizeof(size2a_bf) >= 2);
+#endif
   ASSERT( sizeof(size2b_bf) >= 2);
   ASSERT( sizeof(size2c_bf) >= 2);
   ASSERT( sizeof(size2d_bf) >= 2);
   ASSERT( sizeof(size3a_bf) >= 2);
   ASSERT( sizeof(size1a_bf) <= sizeof(size1b_bf));
+#if !defined (__amd64__)
+  /* assertion fails on amd64 */
   ASSERT( sizeof(size1a_bf) < sizeof(size2a_bf));
+#endif
 
   /* Some SDCC specific assertions. SDCC uses 8 bit storage units.
      Bitfields that are less than 8 bits, but would (due to earlier
diff --git a/support/regression/tests/bitvars.c b/support/regression/tests/bitvars.c
index b9a146a0..6fbee3b9 100644
--- a/support/regression/tests/bitvars.c
+++ b/support/regression/tests/bitvars.c
@@ -14,8 +14,8 @@
 #define NO_BITS
 #endif
 
-#if defined (__GNUC__) && (__GNUC__ < 3)
-//since this fails on GCC 2.95.4 on alpha and I don't know how to detect alpha...
+#if defined (__GNUC__) && defined (__alpha__) && (__GNUC__ < 3)
+/* since this fails on GCC 2.95.4 on alpha... */
 #define NO_BITS
 #endif
 
diff --git a/support/regression/tests/bitwise.c b/support/regression/tests/bitwise.c
index 6f489659..2a2851aa 100644
--- a/support/regression/tests/bitwise.c
+++ b/support/regression/tests/bitwise.c
@@ -29,8 +29,8 @@ testTwoOpBitwise(void)
     ASSERT(({type})(left ^ 0xc1ec) == ({type})0xFC1B);
     ASSERT(({type})(0x3df7 ^ right) == ({type})0xFC1B);
 
-#if defined (__GNUC__) && (__GNUC__ < 3)
-    // long is 64 bits on GCC 2.95.4 on alpha and I don't know how to detect alpha...
+#if defined (__alpha__) || defined (__x86_64__)
+    /* long is 64 bits on 64 bit machines */
     ASSERT(({type})(~left) == ({type})0xFFFFFFFFFFFFC208);
 #else
     ASSERT(({type})(~left) == ({type})0xFFFFC208);
diff --git a/support/regression/tests/literalop.c b/support/regression/tests/literalop.c
index 57a835e6..ea7bcf86 100644
--- a/support/regression/tests/literalop.c
+++ b/support/regression/tests/literalop.c
@@ -5,7 +5,7 @@
 #include <testfwk.h>
 
 /* 64 bit hosts */
-#if defined(__alpha) || defined(__amd64)
+#if defined(__alpha__) || defined(__x86_64__)
 #  define LONG int
 #else
 #  define LONG long
diff --git a/support/regression/tests/rotate.c b/support/regression/tests/rotate.c
index 9e83bc89..20dfa6e9 100644
--- a/support/regression/tests/rotate.c
+++ b/support/regression/tests/rotate.c
@@ -26,8 +26,8 @@
 #endif
 
 #if SIZE == 32
-// long is 64 bits on GCC 2.95.4 on alpha and I don't know how to detect alpha...
-#  if defined (__GNUC__) && (__GNUC__ < 3)
+/* long is 64 bits on 64 bit mabhines */
+#  if defined (__alpha__) || defined (__x86_64__)
 #    define TYPE unsigned int
 #  else
 #    define TYPE unsigned long
diff --git a/support/regression/tests/zeropad.c b/support/regression/tests/zeropad.c
index f8f759da..779b5898 100644
--- a/support/regression/tests/zeropad.c
+++ b/support/regression/tests/zeropad.c
@@ -6,10 +6,10 @@
 #define STORAGE {storage}
 #endif
 
-#if defined __GNUC__
-  #define FLEXARRAY (__GNUC__ >= 3)
-  //since g fails on GCC 2.95.4 on alpha and I don't know how to detect alpha...
-  #define TEST_G    (__GNUC__ >= 3)
+#if defined (__GNUC__) && defined (__alpha__) && (__GNUC__ < 3)
+  /* since g fails on GCC 2.95.4 on alpha... */
+  #define FLEXARRAY 0
+  #define TEST_G    0
 #else
   #define FLEXARRAY 1
   #define TEST_G    1