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

[Brian Gaeke]

Changes in directory reopt/test:

TEST.reopt.Makefile updated: 1.7 -> 1.8

---
Log message:

Link in .a files whenever possible.


---
Diffs of the changes:  (+20 -16)

Index: reopt/test/TEST.reopt.Makefile
diff -u reopt/test/TEST.reopt.Makefile:1.7 reopt/test/TEST.reopt.Makefile:1.8
--- reopt/test/TEST.reopt.Makefile:1.7	Thu Jan  8 15:38:17 2004
+++ reopt/test/TEST.reopt.Makefile	Fri Mar  5 00:00:22 2004
@@ -16,33 +16,37 @@
 REOPTLIBDIR = $(PROJECT_DIR)/lib/Debug
 
 # Libraries that contain the Reoptimizer itself
-REOPTIMIZER_LIBS = $(REOPTLIBDIR)/firstTrigger.o \
+REOPTIMIZER_OBJS = $(REOPTLIBDIR)/firstTrigger.o \
 	$(REOPTLIBDIR)/tracecache.o $(REOPTLIBDIR)/mapinfo.o \
 	$(REOPTLIBDIR)/scratchmemory.o
 
-# Libraries that contain common LLVM code the Reoptimizer depends on
-REOPTIMIZER_LLVM_SUPPORT_LIBS = \
-	$(DESTLIBCURRENT)/vmcore.o \
-	$(DESTLIBCURRENT)/bcreader.o $(DESTLIBCURRENT)/bcwriter.o \
-	$(DESTLIBCURRENT)/sparc.o $(DESTLIBCURRENT)/sched.o \
-	$(DESTLIBCURRENT)/libsupport.a $(DESTLIBCURRENT)/select.o \
-	$(DESTLIBCURRENT)/target.o $(DESTLIBCURRENT)/libregalloc.a \
-	$(DESTLIBCURRENT)/livevar.o $(DESTLIBCURRENT)/codegen.o \
-	$(DESTLIBCURRENT)/libscalaropts.a \
-	$(DESTLIBCURRENT)/libtransformutils.a \
-	$(DESTLIBCURRENT)/libanalysis.a
+# 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
+
+# Library archive files that contain common LLVM code the Reoptimizer depends on
+REOPTIMIZER_LLVMLIBS = $(DESTLIBCURRENT)/libsparcv9regalloc.a \
+    $(DESTLIBCURRENT)/libsupport.a $(DESTLIBCURRENT)/libtarget.a \
+    $(DESTLIBCURRENT)/libscalaropts.a $(DESTLIBCURRENT)/libtransformutils.a \
+    $(DESTLIBCURRENT)/libanalysis.a
 
 # Solaris libraries that the Reoptimizer depends on
-REOPTIMIZER_SOLARIS_SUPPORT_LIBS = -lcpc -lm -lrt -lmalloc
+REOPTIMIZER_SOLARISLIBS = -lcpc -lm -lrt -lmalloc
+
+WHOLE_REOPTIMIZER = $(DESTLIBCURRENT)/wholereoptimizer.o
+$(WHOLE_REOPTIMIZER): $(REOPTIMIZER_OBJS) $(REOPTIMIZER_LLVMOBJS)
+	/usr/ccs/bin/ld -s -r -o $@ $+
 
 # Libraries that should be checked for freshness when doing 
 # Reoptimizer tests (http://www.goodegg.com/eggdating.html)
-REOPTIMIZER_LIBDEPS = $(REOPTIMIZER_LIBS) $(REOPTIMIZER_LLVM_SUPPORT_LIBS)
+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 = $(REOPTIMIZER_LIBS) $(REOPTIMIZER_LLVM_SUPPORT_LIBS) \
-	$(REOPTIMIZER_SOLARIS_SUPPORT_LIBS)
+REOPTIMIZER_LDADD = $(WHOLE_REOPTIMIZER) $(REOPTIMIZER_LLVMLIBS) $(REOPTIMIZER_SOLARISLIBS)
 
 .PRECIOUS: Output/%.out-reopt-llc