[llvm-commits] CVS: reopt/test/TEST.reopt.Makefile

[Brian Gaeke]

Changes in directory reopt/test:

TEST.reopt.Makefile updated: 1.25 -> 1.26
---
Log message:

Use the new "whole reoptimizer" library.


---
Diffs of the changes:  (+3 -39)

Index: reopt/test/TEST.reopt.Makefile
diff -u reopt/test/TEST.reopt.Makefile:1.25 reopt/test/TEST.reopt.Makefile:1.26
--- reopt/test/TEST.reopt.Makefile:1.25	Fri Oct  1 13:51:34 2004
+++ reopt/test/TEST.reopt.Makefile	Mon Oct  4 15:15:28 2004
@@ -28,47 +28,11 @@
 REOPTLLC = $(PROJECT_DIR)/tools/$(CONFIGURATION)/reopt-llc
 
 # Libraries that contain the Reoptimizer itself
-#REOPTIMIZER_OBJS = $(PROJECT_DIR)/lib/Debug/firstTrigger.o
-
-REOPTIMIZER_OBJS = $(REOPTLIBDIR)/firstTrigger.o \
-	$(REOPTLIBDIR)/tracecache.o $(REOPTLIBDIR)/mapinfo.o \
-	$(REOPTLIBDIR)/scratchmemory.o $(REOPTLIBDIR)/tracetofunction.o \
-	$(REOPTLIBDIR)/tracejit.o $(REOPTLIBDIR)/traceio.o
-
-# Object files that contain common LLVM code the Reoptimizer depends on
-REOPTIMIZER_LLVMOBJS = $(LLVMLIBCURRENTSOURCE)/vmcore.o \
-    $(LLVMLIBCURRENTSOURCE)/bcreader.o $(LLVMLIBCURRENTSOURCE)/bcwriter.o \
-    $(LLVMLIBCURRENTSOURCE)/sparcv9.o \
-    $(LLVMLIBCURRENTSOURCE)/sparcv9livevar.o $(LLVMLIBCURRENTSOURCE)/sched.o \
-    $(LLVMLIBCURRENTSOURCE)/codegen.o $(LLVMLIBCURRENTSOURCE)/executionengine.o \
-    $(LLVMLIBCURRENTSOURCE)/lli-jit.o $(LLVMLIBCURRENTSOURCE)/lli-interpreter.o
-
-# Library archive files that contain common LLVM code the Reoptimizer depends on
-REOPTIMIZER_LLVMLIBS = $(LLVMLIBCURRENTSOURCE)/libsparcv9regalloc.a \
-	$(LLVMLIBCURRENTSOURCE)/libtarget.a \
-	$(LLVMLIBCURRENTSOURCE)/libscalaropts.a \
-	$(LLVMLIBCURRENTSOURCE)/libtransformutils.a \
-	$(LLVMLIBCURRENTSOURCE)/libanalysis.a \
-	$(LLVMLIBCURRENTSOURCE)/libsupport.a \
-	$(LLVMLIBCURRENTSOURCE)/libLLVMsystem.a
+REOPTIMIZER_LIB = $(REOPTLIBDIR)/libwholereoptimizer.a
 
 # Solaris libraries that the Reoptimizer depends on
 REOPTIMIZER_SOLARISLIBS = -lcpc -lm -lrt -lmalloc -ldl
 
-MYLD = $(shell $(CXX) --print-prog-name=ld)
-
-WHOLE_REOPTIMIZER = $(REOPTLIBDIR)/wholereoptimizer.o
-$(WHOLE_REOPTIMIZER): $(REOPTIMIZER_OBJS) $(REOPTIMIZER_LLVMOBJS)
-	$(MYLD) -r -o $@ $+
-
-# Libraries that should be checked for freshness when doing 
-# Reoptimizer tests (http://www.goodegg.com/eggdating.html)
-REOPTIMIZER_LIBDEPS = $(WHOLE_REOPTIMIZER) $(REOPTIMIZER_LLVMLIBS)
-
-# Things that need to be added to the link line when linking a
-# program with the Reoptimizer
-REOPTIMIZER_LDADD = $(WHOLE_REOPTIMIZER) $(REOPTIMIZER_LLVMLIBS) $(REOPTIMIZER_SOLARISLIBS)
-
 .PRECIOUS: Output/%.out-reopt-llc
 
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
@@ -94,8 +58,8 @@
 # 2. Link the instrumented binary with the necessary parts of the
 # compiler.
 $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc): \
-Output/%.reopt-llc: Output/%.reopt-llc.s $(REOPTIMIZER_LIBDEPS)
-	$(CXX) $(CFLAGS) $< -o $@ $(REOPTIMIZER_LDADD)
+Output/%.reopt-llc: Output/%.reopt-llc.s $(REOPTIMIZER_LIB)
+	$(CXX) $(CFLAGS) $< -o $@ $(REOPTIMIZER_LIB) $(REOPTIMIZER_SOLARISLIBS)
 
 # 3. Run the reoptimized version.
 ifdef SPECTEST