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

[Brian Gaeke]

Changes in directory reopt/test:

TEST.reopt.Makefile updated: 1.22 -> 1.23
---
Log message:

Use LLVMLIBCURRENTSOURCE instead of DESTLIBCURRENT.
Don't call llc with -debug.


---
Diffs of the changes:  (+14 -11)

Index: reopt/test/TEST.reopt.Makefile
diff -u reopt/test/TEST.reopt.Makefile:1.22 reopt/test/TEST.reopt.Makefile:1.23
--- reopt/test/TEST.reopt.Makefile:1.22	Sun Aug 22 22:10:32 2004
+++ reopt/test/TEST.reopt.Makefile	Thu Sep 23 14:48:36 2004
@@ -26,24 +26,26 @@
 REOPTLIBDIR = $(PROJECT_DIR)/lib/$(CONFIGURATION)
 
 # 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 = $(DESTLIBCURRENT)/vmcore.o \
-    $(DESTLIBCURRENT)/bcreader.o $(DESTLIBCURRENT)/bcwriter.o \
-    $(DESTLIBCURRENT)/sparcv9.o \
-    $(DESTLIBCURRENT)/sparcv9livevar.o $(DESTLIBCURRENT)/sched.o \
-    $(DESTLIBCURRENT)/codegen.o $(DESTLIBCURRENT)/executionengine.o \
-    $(DESTLIBCURRENT)/lli-jit.o $(DESTLIBCURRENT)/lli-interpreter.o
+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 = $(DESTLIBCURRENT)/libsparcv9regalloc.a \
-    $(DESTLIBCURRENT)/libtarget.a \
-    $(DESTLIBCURRENT)/libscalaropts.a $(DESTLIBCURRENT)/libtransformutils.a \
-    $(DESTLIBCURRENT)/libanalysis.a $(DESTLIBCURRENT)/libsupport.a 
+REOPTIMIZER_LLVMLIBS = $(LLVMLIBCURRENTSOURCE)/libsparcv9regalloc.a \
+    $(LLVMLIBCURRENTSOURCE)/libtarget.a \
+    $(LLVMLIBCURRENTSOURCE)/libscalaropts.a $(LLVMLIBCURRENTSOURCE)/libtransformutils.a \
+    $(LLVMLIBCURRENTSOURCE)/libanalysis.a $(LLVMLIBCURRENTSOURCE)/libsupport.a 
 
 # Solaris libraries that the Reoptimizer depends on
 REOPTIMIZER_SOLARISLIBS = -lcpc -lm -lrt -lmalloc -ldl
@@ -77,7 +79,7 @@
 	@echo "===== Building Reoptimizer version of $(TESTNAME) ====="
 	$(LOPT) -q -inline -lowerswitch -enable-correct-eh-support \
 	-lowerinvoke -branch-combine -emitfuncs -instloops $< | $(LLC) \
-	$(LLCFLAGS) -debug -dregalloc=y -print-machineinstrs -disable-sched \
+	$(LLCFLAGS) -dregalloc=y -print-machineinstrs -disable-sched \
 	-disable-strip -f -enable-maps -save-ra-state -o $@ 2>$@.log
 
 # 2. Link the instrumented binary with the necessary parts of the
@@ -100,6 +102,7 @@
 $(PROGRAMS_TO_TEST:%=Output/%.out-reopt-llc): \
 Output/%.out-reopt-llc: Output/%.reopt-llc
 	@echo "===== Running Reoptimizer version of $(TESTNAME) ====="
+#	$< $(RUN_OPTIONS) < $(STDIN_FILENAME) > $@
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 endif