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

[Brian Gaeke]

Changes in directory reopt/test:

TEST.reopt.Makefile updated: 1.14 -> 1.15

---
Log message:

More libraries are needed... btw, it's kind of dumb that linking in
executionengine makes you link in lli-jit and lli-interpreter.

Abort if ld fails... I want to know sooner rather than later.


---
Diffs of the changes:  (+5 -4)

Index: reopt/test/TEST.reopt.Makefile
diff -u reopt/test/TEST.reopt.Makefile:1.14 reopt/test/TEST.reopt.Makefile:1.15
--- reopt/test/TEST.reopt.Makefile:1.14	Wed May 26 04:40:18 2004
+++ reopt/test/TEST.reopt.Makefile	Wed May 26 16:21:02 2004
@@ -28,14 +28,15 @@
 # Libraries that contain the Reoptimizer itself
 REOPTIMIZER_OBJS = $(REOPTLIBDIR)/firstTrigger.o \
 	$(REOPTLIBDIR)/tracecache.o $(REOPTLIBDIR)/mapinfo.o \
-	$(REOPTLIBDIR)/scratchmemory.o $(REOPTLIBDIR)/tracetofunction.o
+	$(REOPTLIBDIR)/scratchmemory.o $(REOPTLIBDIR)/tracetofunction.o $(REOPTLIBDIR)/tracejit.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)/sparcv9select.o \
     $(DESTLIBCURRENT)/sparcv9livevar.o $(DESTLIBCURRENT)/sched.o \
-    $(DESTLIBCURRENT)/codegen.o
+    $(DESTLIBCURRENT)/codegen.o $(DESTLIBCURRENT)/executionengine.o \
+    $(DESTLIBCURRENT)/lli-jit.o $(DESTLIBCURRENT)/lli-interpreter.o
 
 # Library archive files that contain common LLVM code the Reoptimizer depends on
 REOPTIMIZER_LLVMLIBS = $(DESTLIBCURRENT)/libsparcv9regalloc.a \
@@ -73,7 +74,7 @@
 $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc.s): \
 Output/%.reopt-llc.s: Output/%.llvm.bc
 	@echo "===== Building Reoptimizer version of $(TESTNAME) ====="
-	-$(LOPT) -q -inline -lowerswitch -enable-correct-eh-support \
+	$(LOPT) -q -inline -lowerswitch -enable-correct-eh-support \
 	-lowerinvoke -branch-combine -emitfuncs -instloops $< | $(LLC) \
 	$(LLCFLAGS) -disable-sched -disable-strip -f -enable-maps \
 	-save-ra-state -o $@
@@ -82,7 +83,7 @@
 # compiler.
 $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc): \
 Output/%.reopt-llc: Output/%.reopt-llc.s $(REOPTIMIZER_LIBDEPS)
-	-$(CXX) $(CFLAGS) $< -o $@ $(REOPTIMIZER_LDADD)
+	$(CXX) $(CFLAGS) $< -o $@ $(REOPTIMIZER_LDADD)
 
 # 3. Run the reoptimized version.
 $(PROGRAMS_TO_TEST:%=Output/%.out-reopt-llc): \