diff --git a/llvm/test/Makefile.target b/llvm/test/Makefile.target
index c9f1e3882e6918b649f83adf037f78aed4f208f0..7e54ccc555f5b155970d89399470a813c974414f 100644
--- a/llvm/test/Makefile.target
+++ b/llvm/test/Makefile.target
@@ -1,3 +1,8 @@
+## -*-Makefile-*-
+##------------------------------------------------------------------------
+## Common rules for generating, linking, and compiling via LLVM.
+##------------------------------------------------------------------------
+
 .PHONY: clean default
 
 ## Special targets to build a program from multiple source files
@@ -20,7 +25,7 @@ LLINK    = $(TOOLS)/link
 LLCFLAGS =
 
 LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -DTORONTO -O2 $(LOCAL_CFLAGS) -Wall
+LCFLAGS  = -O2 $(LOCAL_CFLAGS) -Wall
 
 LLCLIB   = $(LEVEL)/test/runtime.o
 LIBS     = $(LLCLIB) $(LOCAL_LIBS)
@@ -58,7 +63,8 @@ clean :
 	$(LLC) -f -trace $(LLCFLAGS) $<
 
 %.o: %.c
-	$(LCC) $(LCFLAGS) -c $<
+	$(LCC) $(LCFLAGS) -S -o $*.ll $<
+	$(LAS) -o $@ $*.ll
 
 %.bc: %.ll
 	$(LAS) -f $<
diff --git a/llvm/test/Makefile.tests b/llvm/test/Makefile.tests
index c9f1e3882e6918b649f83adf037f78aed4f208f0..7e54ccc555f5b155970d89399470a813c974414f 100644
--- a/llvm/test/Makefile.tests
+++ b/llvm/test/Makefile.tests
@@ -1,3 +1,8 @@
+## -*-Makefile-*-
+##------------------------------------------------------------------------
+## Common rules for generating, linking, and compiling via LLVM.
+##------------------------------------------------------------------------
+
 .PHONY: clean default
 
 ## Special targets to build a program from multiple source files
@@ -20,7 +25,7 @@ LLINK    = $(TOOLS)/link
 LLCFLAGS =
 
 LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -DTORONTO -O2 $(LOCAL_CFLAGS) -Wall
+LCFLAGS  = -O2 $(LOCAL_CFLAGS) -Wall
 
 LLCLIB   = $(LEVEL)/test/runtime.o
 LIBS     = $(LLCLIB) $(LOCAL_LIBS)
@@ -58,7 +63,8 @@ clean :
 	$(LLC) -f -trace $(LLCFLAGS) $<
 
 %.o: %.c
-	$(LCC) $(LCFLAGS) -c $<
+	$(LCC) $(LCFLAGS) -S -o $*.ll $<
+	$(LAS) -o $@ $*.ll
 
 %.bc: %.ll
 	$(LAS) -f $<