diff: remove .garb files.

[Tyson Richard DOWD]

Hi,

More size reduction for the compiler.

I'll commit this now and fix it if there are any comments.

===================================================================

Estimated hours taken: 0.5

compiler/modules.m:
scripts/Mmake.rules:
	Remove references to .garb files.
	We are not going to use a separate link phase for accurate gc
	anymore.

Index: compiler/modules.m
===================================================================
RCS file: /home/staff/zs/imp/mercury/compiler/modules.m,v
retrieving revision 1.33
diff -u -r1.33 modules.m
--- modules.m	1997/04/07 05:39:38	1.33
+++ modules.m	1997/06/03 06:38:30
@@ -744,50 +744,13 @@
 	write_compact_dependencies_list(Modules, ".opt", Basis, DepStream),
 	io__write_string(DepStream, "\n\n"),
 
-	globals__io_lookup_string_option(gc, GC_Opt),
-	( { GC_Opt = "accurate" } ->
-		{ map__init(AllMap) },
-		trans_impl_dependencies([ModuleName], AllMap, yes,
-			AllDeps, _),
-		io__write_string(DepStream, ModuleName),
-		io__write_string(DepStream, ".garbs = "),
-		write_compact_dependencies_list(AllDeps, ".garb",
-			Basis, DepStream),
-		io__write_string(DepStream, "\n\n")
-	;
-		[]
-	),
-
-	( { GC_Opt = "accurate" } ->
-		io__write_strings(DepStream, [
-			ModuleName, "_garb.c : $(",
-			ModuleName, ".garbs)\n",
-                        "\t$(MLINK) $(MLINKFLAGS) -o ", ModuleName,
-                        "_garb.c $(", ModuleName, ".garbs)\n\n"
-		])
-	;
-		[]
-	),
-
-	( { GC_Opt = "accurate" } ->
-		io__write_strings(DepStream, [
-			ModuleName, " : $(", ModuleName, ".os) ",
-			ModuleName, "_init.o ",
-			ModuleName, "_garb.o\n",
+	io__write_strings(DepStream, [
+		ModuleName, " : $(", ModuleName, ".os) ",
+		ModuleName, "_init.o\n",
 		"\t$(ML) -s $(GRADE) $(MLFLAGS) -o ", ModuleName, " ",
-			ModuleName, "_garb.o ",
-			ModuleName, "_init.o \\\n",
-			"\t$(", ModuleName, ".os) $(MLLIBS)\n\n"
-		])
-	;
-		io__write_strings(DepStream, [
-			ModuleName, " : $(", ModuleName, ".os) ",
-			ModuleName, "_init.o\n",
-			"\t$(ML) -s $(GRADE) $(MLFLAGS) -o ", ModuleName, " ",
-			ModuleName, "_init.o \\\n",
-			"\t$(", ModuleName, ".os) $(MLLIBS)\n\n"
-		])
-	),
+		ModuleName, "_init.o \\\n",
+		"\t$(", ModuleName, ".os) $(MLLIBS)\n\n"
+	]),
 
 	io__write_strings(DepStream, [
 		ModuleName, ".split : ", ModuleName, ".split.a ",
@@ -876,15 +839,7 @@
 		"\t-rm -f $(", ModuleName, ".errs)\n"
 	]),
 
-	( { GC_Opt = "accurate" } ->
-		io__write_strings(DepStream, [
-			"\t-rm -f $(", ModuleName, ".garbs)\n",
-			"\t-rm -f ", ModuleName, "_garb.o ", ModuleName, 
-				"_garb.c ", ModuleName, "_garb.s\n\n"
-		])
-	;
-		io__write_string(DepStream, "\n")
-	),
+	io__write_string(DepStream, "\n"),
 
 	io__write_strings(DepStream, [
 		ModuleName, ".change_clean :\n",
Index: scripts/Mmake.rules
===================================================================
RCS file: /home/staff/zs/imp/mercury/scripts/Mmake.rules,v
retrieving revision 1.41
diff -u -r1.41 Mmake.rules
--- Mmake.rules	1997/05/23 00:39:14	1.41
+++ Mmake.rules	1997/06/03 06:40:10
@@ -14,7 +14,7 @@
 .SUFFIXES: .m .nl .no .err .int .int2 .int3 .opt .dep .depend .doit \
 		.ugly .date .date3 .optdate .mod .c .nu .o .pic_o \
 		.i .s .pic_s \
-		.garb .ql .pl
+		.ql .pl
 
 .PRECIOUS: %.date %.date3 %.optdate
 
@@ -75,9 +75,6 @@
 
 .optdate.opt:
 	@:
-
-.m.garb:
-	$(MCG) -s $(GRADE) --garbage-collection accurate $(MCGFLAGS) $<
 
 .m.ugly:
 	$(MC) --convert-to-mercury $(MCFLAGS) $<

-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't eveyone's cup of
     trd at cs.mu.oz.au        #  fur.
http://www.cs.mu.oz.au/~trd #