[llvm-commits] CVS: llvm-java/test/Makefile.test

[Alkis Evlogimenos]

Changes in directory llvm-java/test:

Makefile.test updated: 1.18 -> 1.19
---
Log message:

Fix rules to make more sense when compiling from a single .class file
to a bytecode file.


---
Diffs of the changes:  (+8 -7)

Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.18 llvm-java/test/Makefile.test:1.19
--- llvm-java/test/Makefile.test:1.18	Wed Nov 24 14:33:38 2004
+++ llvm-java/test/Makefile.test	Thu Dec  2 17:24:34 2004
@@ -19,15 +19,16 @@
 # intermediate results
 .PRECIOUS: Output/.dir %.linked.bc %.raw.bc %.ll %.llvm.bc
 
-#rule to link in runtime to raw bytecode
-%.linked.bc: %.raw.bc $(LibDir)/libjrt.bc $(EXTRA_OBJS)
-	$(Echo) Linking $< with the Java runtime
-	$(Verb)$(LLINK) $^ -o=$@
+# -simplifycfg -mem2reg -instcombine 
 
-# rule to optimize the linked bytecode
-%.llvm.bc: %.linked.bc $(LOPT)
+# rule to link bytecode with runtime
+%.llvm: %.linked.bc $(LibDir)/libjrt.bca $(EXTRA_OBJS) $(LOPT)
 	$(Echo) Optimizing $<
-	$(Verb)$(LOPT) -simplifycfg -mem2reg -instcombine -f -o=$@ $<
+	$(Verb)$(GCCLD) -disable-opt -o=$*.llvm $< -L $(LibDir) -ljrt $(EXTRA_OBJS)
+# rule to link bytecode with runtime
+%.llvm.bc: %.linked.bc $(LibDir)/libjrt.bca $(EXTRA_OBJS) $(LOPT)
+	$(Echo) Optimizing $<
+	$(Verb)$(GCCLD) -disable-opt -o=$*.llvm $< -L $(LibDir) -ljrt $(EXTRA_OBJS)
 
 # rule to make assembly from bytecode
 %.dis-ll: %.bc