[llvm-commits] CVS: llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile

Reid Spencer reid at x10sys.com
Tue Nov 28 16:47:34 PST 2006



Changes in directory llvm-test/External/SPEC/CINT2000/253.perlbmk:

Makefile updated: 1.11 -> 1.12
---
Log message:

Makefile changes necessary in order to allow 253.perlbmk to comile 
properly on Linux or Win32.


---
Diffs of the changes:  (+31 -6)

 Makefile |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)


Index: llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile
diff -u llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile:1.11 llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile:1.12
--- llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile:1.11	Mon Apr  4 15:01:29 2005
+++ llvm-test/External/SPEC/CINT2000/253.perlbmk/Makefile	Tue Nov 28 18:47:17 2006
@@ -1,10 +1,12 @@
 LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
-CPPFLAGS = -DSPEC_CPU2000_LINUX -Dbool=char -DI_TIME -DI_SYS_TIME
+include $(LEVEL)/Makefile.config
 
-ifeq ($(ARCH),Alpha)
-  CPPFLAGS += -DSPEC_CPU2000_LINUX_ALPHA
-endif
+SPEC_ROOT := $(SPEC2000_ROOT)
+
+include $(LEVEL)/External/SPEC/Makefile.spec.config
+
+CPPFLAGS += -DSPEC_CPU2000_LINUX_I386 -DSPEC_CPU2000_NEED_BOOL
 
 ifeq ($(RUN_TYPE),test)
 RUN_OPTIONS     = test.pl
@@ -15,9 +17,32 @@
 STDOUT_FILENAME := scrabbl.out
 endif
 
-include ../../Makefile.spec2000
+NT_SOURCES     = nt_perlmain.c win32.c win32sck.c win32threads.c perllib.c
+UNIX_SOURCES   = unix_perlmain.c
+
+ifeq ($(strip $(OS)),Win32)
+CPPFLAGS       += -Iwin32 -I. -DWIN32 -D_CONSOLE
+LIBS           += advapi32.lib wsock32.lib
+DO_NOT_COMPILE := $(UNIX_SOURCES)
+else
+DO_NOT_COMPILE := $(NT_SOURCES)
+endif
+
+Source := $(wildcard $(SPEC_BENCH_DIR)/src/*.c)
+Source := $(filter-out $(foreach xyz,$(DO_NOT_COMPILE),%/$(xyz)),$(Source))
+
+SPEC2K_DO_NOT_RECONFIGURE := 1
+include $(LEVEL)/External/SPEC/Makefile.spec2000
+
+ifeq ($(strip $(OS)),Linux)
+CPPFLAGS := $(filter-out -DSPEC_CPU2000,$(CPPFLAGS))
+ifeq ($(ARCH),Alpha)
+  CPPFLAGS += -DSPEC_CPU2000_LINUX_ALPHA
+else
+  CPPFLAGS += -DSPEC_CPU2000_LINUX_I386
+endif
+endif
 
 ifeq ($(ENDIAN),little)
 CPPFLAGS += -D__LITTLE_ENDIAN__
 endif
-






More information about the llvm-commits mailing list