[llvm-commits] [test-suite] r64287 - /test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile

[Dan Gohman]

Author: djg
Date: Tue Feb 10 22:26:53 2009
New Revision: 64287

URL: http://llvm.org/viewvc/llvm-project?rev=64287&view=rev
Log:
Fix 186.crafty's Makefile to handle ARCH=x86_64. Predefine the
individual macros instead of using LINUX_i386, so that crafy's
preset values don't override the Makefile's specified values.

Modified:
    test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile

Modified: test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile?rev=64287&r1=64286&r2=64287&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/186.crafty/Makefile Tue Feb 10 22:26:53 2009
@@ -17,7 +17,10 @@
   CPPFLAGS += -DALPHA -DLINUX
 endif
 ifeq ($(ARCH),x86)
-  CPPFLAGS += -DLINUX_i386
+  CPPFLAGS += -DHAS_LONGLONG
+endif
+ifeq ($(ARCH),x86_64)
+  CPPFLAGS += -DLONG_HAS_64BITS -DHAS_LONGLONG
 endif
 ifeq ($(ARCH),PowerPC)
    CPPFLAGS += -DLINUX_PPC32
@@ -26,13 +29,16 @@
    CPPFLAGS += -DSUN_BSD
 endif
 ifeq ($(TARGET_ARCH),ARM)
-   CPPFLAGS += -DHAS_LONGLONG
+  CPPFLAGS += -DHAS_LONGLONG
 endif
 ifeq ($(OS),Darwin)
-   CPPFLAGS += -DUNIX -DLINUX
+  CPPFLAGS += -DUNIX -DLINUX
+endif
+ifeq ($(OS),Linux)
+  CPPFLAGS += -DUNIX -DLINUX
 endif
 ifeq ($(ENDIAN),little)
-   CPPFLAGS += -DLITTLE_ENDIAN_ARCH
+  CPPFLAGS += -DLITTLE_ENDIAN_ARCH
 endif
 
 include ../../Makefile.spec2000