[llvm-commits] CVS: llvm-test/External/SPEC/Makefile Makefile.spec

[Bill Wendling]

Changes in directory llvm-test/External/SPEC:

Makefile updated: 1.18 -> 1.19
Makefile.spec updated: 1.55 -> 1.56
---
Log message:

Added support for SPEC2006.


---
Diffs of the changes:  (+20 -9)

 Makefile      |   15 +++++++++++++--
 Makefile.spec |   14 +++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)


Index: llvm-test/External/SPEC/Makefile
diff -u llvm-test/External/SPEC/Makefile:1.18 llvm-test/External/SPEC/Makefile:1.19
--- llvm-test/External/SPEC/Makefile:1.18	Mon Oct 25 23:51:51 2004
+++ llvm-test/External/SPEC/Makefile	Fri Sep  1 19:04:00 2006
@@ -1,10 +1,21 @@
+##===- Makefile --------------------------------------------*- Makefile -*-===##
+#
+# This makefile runs the SPEC benchmarks.
+#
+##===----------------------------------------------------------------------===##
+
 LEVEL = ../..
-PARALLEL_DIRS := CFP2000 CINT2000 CFP95 CINT95
+PARALLEL_DIRS := CFP2006 CINT2006 CFP2000 CINT2000 CFP95 CINT95
 include $(LEVEL)/Makefile.config
 
 #
-# Remove SPEC95 and SPEC2000 per the user's configuration
+# Remove SPEC95, SPEC2000, and SPEC2006 per the user's configuration
 #
+ifndef USE_SPEC2006
+PARALLEL_DIRS := $(filter-out CFP2006, $(PARALLEL_DIRS))
+PARALLEL_DIRS := $(filter-out CINT2006, $(PARALLEL_DIRS))
+endif
+
 ifndef USE_SPEC2000
 PARALLEL_DIRS := $(filter-out CFP2000, $(PARALLEL_DIRS))
 PARALLEL_DIRS := $(filter-out CINT2000, $(PARALLEL_DIRS))


Index: llvm-test/External/SPEC/Makefile.spec
diff -u llvm-test/External/SPEC/Makefile.spec:1.55 llvm-test/External/SPEC/Makefile.spec:1.56
--- llvm-test/External/SPEC/Makefile.spec:1.55	Tue Jun 27 15:37:01 2006
+++ llvm-test/External/SPEC/Makefile.spec	Fri Sep  1 19:04:00 2006
@@ -1,7 +1,7 @@
 ##===- Makefile.spec ---------------------------------------*- Makefile -*-===##
 #
-# This makefile is a template for building SPEC as an external
-# test. It is included by Makefile.spec2000 and Makefile.spec95.
+# This makefile is a template for building SPEC as an external test. It is
+# included by Makefile.spec2006, Makefile.spec2000, and Makefile.spec95.
 #
 ##===----------------------------------------------------------------------===##
 
@@ -38,12 +38,12 @@
 
 PROG := $(BENCH_NAME)
 ifndef Source
-Source := $(wildcard $(SPEC_BENCH_DIR)/src/*.c \
-					 $(SPEC_BENCH_DIR)/src/*.C \
-                     $(SPEC_BENCH_DIR)/src/*.cc \
+Source := $(wildcard $(SPEC_BENCH_DIR)/src/*.c   \
+                     $(SPEC_BENCH_DIR)/src/*.C   \
+                     $(SPEC_BENCH_DIR)/src/*.cc  \
                      $(SPEC_BENCH_DIR)/src/*.cpp \
-                     $(SPEC_BENCH_DIR)/src/*.f \
-                     $(SPEC_BENCH_DIR)/src/*.F \
+                     $(SPEC_BENCH_DIR)/src/*.f   \
+                     $(SPEC_BENCH_DIR)/src/*.F   \
                      $(SPEC_BENCH_DIR)/src/*.f90 \
                      $(SPEC_BENCH_DIR)/src/*.F90)
 endif