Changes in directory llvm-test/External/SPEC:
Makefile.spec.config added (r1.1) Makefile.spec updated: 1.57 -> 1.58 Makefile.spec2000 updated: 1.7 -> 1.8 Makefile.spec2006 updated: 1.1 -> 1.2 Makefile.spec95 updated: 1.10 -> 1.11 --- Log message: Makefile changes necessary in order to allow 253.perlbmk to comile properly on Linux or Win32. --- Diffs of the changes: (+58 -47) Makefile.spec | 47 ------------------------------------------- Makefile.spec.config | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.spec2000 | 1 Makefile.spec2006 | 1 Makefile.spec95 | 1 5 files changed, 58 insertions(+), 47 deletions(-) Index: llvm-test/External/SPEC/Makefile.spec.config diff -c /dev/null llvm-test/External/SPEC/Makefile.spec.config:1.1 *** /dev/null Tue Nov 28 18:47:27 2006 --- llvm-test/External/SPEC/Makefile.spec.config Tue Nov 28 18:47:17 2006 *************** *** 0 **** --- 1,55 ---- + ##===- Makefile.spec ---------------------------------------*- Makefile -*-===## + # + # This makefile is a template for building SPEC as an external test. It is + # included by Makefile.spec2006, Makefile.spec2000, and Makefile.spec95. + # + ##===----------------------------------------------------------------------===## + + ## Information the test should have provided... + ifndef STDOUT_FILENAME + STDOUT_FILENAME := standard.out + endif + LDFLAGS += -lm + + # Get the current directory, the name of the benchmark, and the current + # subdirectory of the SPEC directory we are in (ie, CINT2000/164.gzip) + # + ifndef CURRENT_DIR + CURRENT_DIR := $(shell cd .; pwd) + endif + ifndef BENCH_NAME + BENCH_NAME := $(subst $(shell cd .. ; pwd),,$(CURRENT_DIR)) + # Remove any leading /'s from the paths + BENCH_NAME := $(patsubst /%,%,$(BENCH_NAME)) + endif + + ## SPEC_SUBDIR - Allow SPEC configuration files to override "CINT2000" with + ## something else. + + ifndef SPEC_SUBDIR + SPEC_SUBDIR := $(subst $(shell cd ../..; pwd),,$(CURRENT_DIR)) + SPEC_SUBDIR := $(patsubst /%,%,$(SPEC_SUBDIR)) + else + SPEC_SUBDIR := $(SPEC_SUBDIR)/$(BENCH_NAME) + endif + + ifndef SPEC_BENCH_DIR + SPEC_BENCH_DIR := $(SPEC_ROOT)/$(SPEC_SUBDIR) + endif + + ifndef Source + 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/*.f90 \ + $(SPEC_BENCH_DIR)/src/*.F90) + endif + + PROG := $(BENCH_NAME) + + # Disable the default Output/%.out-* targets... + PROGRAMS_HAVE_CUSTOM_RUN_RULES := 1 + SourceDir := $(SPEC_BENCH_DIR)/src/ Index: llvm-test/External/SPEC/Makefile.spec diff -u llvm-test/External/SPEC/Makefile.spec:1.57 llvm-test/External/SPEC/Makefile.spec:1.58 --- llvm-test/External/SPEC/Makefile.spec:1.57 Tue Nov 28 18:30:49 2006 +++ llvm-test/External/SPEC/Makefile.spec Tue Nov 28 18:47:17 2006 @@ -5,53 +5,6 @@ # ##===----------------------------------------------------------------------===## -include $(LEVEL)/Makefile.config - -## Information the test should have provided... -ifndef STDOUT_FILENAME -STDOUT_FILENAME := standard.out -endif -LDFLAGS += -lm - -# Get the current directory, the name of the benchmark, and the current -# subdirectory of the SPEC directory we are in (ie, CINT2000/164.gzip) -# -CURRENT_DIR := $(shell cd .; pwd) -BENCH_NAME := $(subst $(shell cd .. ; pwd),,$(CURRENT_DIR)) - -# Remove any leading /'s from the paths -BENCH_NAME := $(patsubst /%,%,$(BENCH_NAME)) - -## SPEC_SUITEDIR - Allow SPEC configuration files to override "CINT2000" with -## something else. - -ifndef SPEC_SUITEDIR -SPEC_SUBDIR := $(subst $(shell cd ../..; pwd),,$(CURRENT_DIR)) -SPEC_SUBDIR := $(patsubst /%,%,$(SPEC_SUBDIR)) -else -SPEC_SUBDIR := $(SPEC_SUITEDIR)/$(BENCH_NAME) -endif - -ifndef SPEC_BENCH_DIR -SPEC_BENCH_DIR := $(SPEC_ROOT)/$(SPEC_SUBDIR) -endif - -PROG := $(BENCH_NAME) -ifndef Source -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/*.f90 \ - $(SPEC_BENCH_DIR)/src/*.F90) -endif - -# Disable the default Output/%.out-* targets... -PROGRAMS_HAVE_CUSTOM_RUN_RULES := 1 -SourceDir := $(SPEC_BENCH_DIR)/src/ - include $(LEVEL)/MultiSource/Makefile.multisrc # Do not pass -Wall to compile commands... Index: llvm-test/External/SPEC/Makefile.spec2000 diff -u llvm-test/External/SPEC/Makefile.spec2000:1.7 llvm-test/External/SPEC/Makefile.spec2000:1.8 --- llvm-test/External/SPEC/Makefile.spec2000:1.7 Mon Sep 6 23:18:02 2004 +++ llvm-test/External/SPEC/Makefile.spec2000 Tue Nov 28 18:47:17 2006 @@ -19,4 +19,5 @@ endif endif +include $(LEVEL)/External/SPEC/Makefile.spec.config include $(LEVEL)/External/SPEC/Makefile.spec Index: llvm-test/External/SPEC/Makefile.spec2006 diff -u llvm-test/External/SPEC/Makefile.spec2006:1.1 llvm-test/External/SPEC/Makefile.spec2006:1.2 --- llvm-test/External/SPEC/Makefile.spec2006:1.1 Thu Aug 31 14:29:24 2006 +++ llvm-test/External/SPEC/Makefile.spec2006 Tue Nov 28 18:47:17 2006 @@ -22,6 +22,7 @@ # Don't use CINT2006/CFP2006, always use CPU2006. SPEC_SUITEDIR := CPU2006 +include $(LEVEL)/External/SPEC/Makefile.spec.config include $(LEVEL)/External/SPEC/Makefile.spec CPPFLAGS += -DSPEC_CPU Index: llvm-test/External/SPEC/Makefile.spec95 diff -u llvm-test/External/SPEC/Makefile.spec95:1.10 llvm-test/External/SPEC/Makefile.spec95:1.11 --- llvm-test/External/SPEC/Makefile.spec95:1.10 Mon Sep 6 22:36:04 2004 +++ llvm-test/External/SPEC/Makefile.spec95 Tue Nov 28 18:47:17 2006 @@ -19,4 +19,5 @@ endif endif +include $(LEVEL)/External/SPEC/Makefile.spec.config include $(LEVEL)/External/SPEC/Makefile.spec _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
