[llvm-commits] [test-suite] r64219 - in /test-suite/trunk/External/SPEC: CFP2006/482.sphinx3/Makefile CINT2000/176.gcc/Makefile CINT2000/252.eon/Makefile CINT2000/254.gap/Makefile CINT2000/255.vortex/Makefile Makefile.spec2000 Makefile.spec2006

Dan Gohman gohman at apple.com
Tue Feb 10 07:07:08 PST 2009 

Author: djg
Date: Tue Feb 10 09:07:08 2009
New Revision: 64219

URL: http://llvm.org/viewvc/llvm-project?rev=64219&view=rev
Log:
Add -DSPEC_CPU2000_LP64 and -DSPEC_CPU_LP64 to CPPFLAGS in the top-level
SPEC Makefiles, instead of in individual benchmark Makefiles. Also, set
them when ARCH is x86_64.

Modified:
    test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/Makefile
    test-suite/trunk/External/SPEC/CINT2000/176.gcc/Makefile
    test-suite/trunk/External/SPEC/CINT2000/252.eon/Makefile
    test-suite/trunk/External/SPEC/CINT2000/254.gap/Makefile
    test-suite/trunk/External/SPEC/CINT2000/255.vortex/Makefile
    test-suite/trunk/External/SPEC/Makefile.spec2000
    test-suite/trunk/External/SPEC/Makefile.spec2006

Modified: test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/Makefile?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/Makefile (original)
+++ test-suite/trunk/External/SPEC/CFP2006/482.sphinx3/Makefile Tue Feb 10 09:07:08 2009
@@ -10,7 +10,7 @@
 
 include ../../Makefile.spec2006
 
-CPPFLAGS += -I$(SPEC_BENCH_DIR)/src/libutil -DHAVE_CONFIG_H -DSPEC_CPU
+CPPFLAGS += -I$(SPEC_BENCH_DIR)/src/libutil -DHAVE_CONFIG_H
 
 ifeq ($(RUN_TYPE),test)
   RUN_OPTIONS      = `cp an406-fcaw-b.be.raw an406-fcaw-b.raw` \

Modified: test-suite/trunk/External/SPEC/CINT2000/176.gcc/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/176.gcc/Makefile?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/176.gcc/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/176.gcc/Makefile Tue Feb 10 09:07:08 2009
@@ -23,13 +23,3 @@
   ## SPEC portability note for GCC says to use these flags and cross fingers:
   CPPFLAGS += -DSPEC_CPU2000_LP64
 endif
-ifeq ($(ARCH),Alpha)
-  ## SPEC portability note for GCC says to use these flags and cross fingers:
-  CPPFLAGS += -DSPEC_CPU2000_LP64
-endif
-ifeq ($(ARCH),IA64)
-  ## SPEC portability note for GCC says to use these flags and cross fingers:
-  CPPFLAGS += -DSPEC_CPU2000_LP64
-endif
-
-

Modified: test-suite/trunk/External/SPEC/CINT2000/252.eon/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/252.eon/Makefile?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/252.eon/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/252.eon/Makefile Tue Feb 10 09:07:08 2009
@@ -13,10 +13,6 @@
  CPPFLAGS += -DFMAX_IS_DOUBLE
 endif
 
-ifeq ($(ARCH),Alpha)
- CPPFLAGS += -DSPEC_CPU2000_LP64
-endif
-
 Source = $(addprefix $(SPEC_BENCH_DIR)/src/,  \
             ggCoverageSolidTexture.cc ggPathDielectricMaterial.cc ggBox2.cc \
             ggBox3.cc ggRasterSurfaceTexture.cc ggJitterSample1.cc \

Modified: test-suite/trunk/External/SPEC/CINT2000/254.gap/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/254.gap/Makefile?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/254.gap/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/254.gap/Makefile Tue Feb 10 09:07:08 2009
@@ -10,12 +10,6 @@
 ifeq ($(ARCH),Sparc)
 CPPFLAGS+= -DSPEC_CPU2000_LP64
 endif
-ifeq ($(ARCH),Alpha)
-CPPFLAGS+= -DSPEC_CPU2000_LP64
-endif
-ifeq ($(ARCH),IA64)
-CPPFLAGS+= -DSPEC_CPU2000_LP64
-endif
 
 ifeq ($(OS),Darwin)
 CPPFLAGS += -DSYS_IS_BSD

Modified: test-suite/trunk/External/SPEC/CINT2000/255.vortex/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/255.vortex/Makefile?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/255.vortex/Makefile (original)
+++ test-suite/trunk/External/SPEC/CINT2000/255.vortex/Makefile Tue Feb 10 09:07:08 2009
@@ -14,15 +14,3 @@
   ## SPEC portability note for vortex says to use this flag on 64-bit machines
   CPPFLAGS += -DSPEC_CPU2000_LP64
 endif
-
-ifeq ($(ARCH),Alpha)
-  ## SPEC portability note for vortex says to use this flag on 64-bit machines
-  CPPFLAGS += -DSPEC_CPU2000_LP64
-endif
-
-ifeq ($(ARCH),IA64)
-  ## SPEC portability note for vortex says to use this flag on 64-bit machines
-  CPPFLAGS += -DSPEC_CPU2000_LP64
-endif
-
-

Modified: test-suite/trunk/External/SPEC/Makefile.spec2000
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec2000?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec2000 (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec2000 Tue Feb 10 09:07:08 2009
@@ -9,6 +9,16 @@
 SPEC_ROOT := $(SPEC2000_ROOT)
 CPPFLAGS += -DSPEC_CPU2000
 
+ifeq ($(ARCH),x86_64)
+  CPPFLAGS += -DSPEC_CPU2000_LP64
+endif
+ifeq ($(ARCH),Alpha)
+  CPPFLAGS += -DSPEC_CPU2000_LP64
+endif
+ifeq ($(ARCH),IA64)
+  CPPFLAGS += -DSPEC_CPU2000_LP64
+endif
+
 # RUN_TYPE - Either ref, test, or train.  May be specified on the command line.
 # individual tests may override this to provide better input sizes
 ifndef RUN_TYPE

Modified: test-suite/trunk/External/SPEC/Makefile.spec2006
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec2006?rev=64219&r1=64218&r2=64219&view=diff

==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec2006 (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec2006 Tue Feb 10 09:07:08 2009
@@ -9,6 +9,16 @@
 SPEC_ROOT := $(SPEC2006_ROOT)
 CPPFLAGS += -DSPEC_CPU2006
 
+ifeq ($(ARCH),x86_64)
+  CPPFLAGS += -DSPEC_CPU_LP64
+endif
+ifeq ($(ARCH),Alpha)
+  CPPFLAGS += -DSPEC_CPU_LP64
+endif
+ifeq ($(ARCH),IA64)
+  CPPFLAGS += -DSPEC_CPU_LP64
+endif
+
 # RUN_TYPE - Either ref, test, or train. May be specified on the command line.
 # Individual tests may override this to provide better input sizes.
 ifndef RUN_TYPE

More information about the llvm-commits mailing list