[m-dev.] diff: fixes for bugs in GCC back-end changes

[Fergus Henderson]

Estimated hours taken: 0.25

Fix some bugs in my changes to add the GCC back-end interface.

tools/bootcheck:
	Link main.c into the stage2 and stage3 directories.

compiler/Mmakefile:
	Use `$O' rather than `.o'.
	Make sure to clean up ../main.$O.

Workspace: /home/pgrad/fjh/ws/hg
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.36
diff -u -d -r1.36 Mmakefile
--- compiler/Mmakefile	2001/01/13 06:48:40	1.36
+++ compiler/Mmakefile	2001/01/13 13:32:20
@@ -44,7 +44,7 @@
 C2INITFLAGS =	--library
 ML	=	MERCURY_C_LIB_DIR=. $(SCRIPTS_DIR)/ml
 MLFLAGS =	--mercury-libs none
-MLLIBS  =	../main.o \
+MLLIBS  =	../main.$O \
 		$(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A \
 		$(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A \
 		$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A \
@@ -162,14 +162,14 @@
 mercury:	mercury_compile
 
 .PHONY: libmmc
-libmmc:		libmercury_compile.a mercury_compile_init.o
+libmmc:		libmercury_compile.a mercury_compile_init.$O
 
 #-----------------------------------------------------------------------------#
 
 # Add some additional dependencies, so that Mmake knows to remake the
 # compiler if one of the libraries changes.
 
-mercury_compile: ../main.o
+mercury_compile: ../main.$O
 mercury_compile: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mercury_compile: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 mercury_compile: $(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A
@@ -206,12 +206,13 @@
 #-----------------------------------------------------------------------------#
 
 .PHONY: os cs
-os: $(mercury_compile.os) $(os_subdir)mercury_compile_init.o
+os: $(mercury_compile.os) $(os_subdir)mercury_compile_init.$O
 cs: $(mercury_compile.cs) $(cs_subdir)mercury_compile_init.c
 
 #-----------------------------------------------------------------------------#
 
 clean_local:
+	rm -f ../main.$O
 	for file in *.pp; do \
 		if [ "$$file" != "*.pp" ]; then \
 			rm -f `basename $$file .pp`.m; \
Index: tools/bootcheck
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/bootcheck,v
retrieving revision 1.107
diff -u -d -r1.107 bootcheck
--- tools/bootcheck	2000/12/14 03:01:49	1.107
+++ tools/bootcheck	2001/01/13 13:26:02
@@ -352,6 +352,7 @@
 	set +x
 	echo linking stage 2... 1>&2
 	cd stage2
+	$LN_S $root/main.c .
 	mkdir compiler
 	cd compiler
 	# Break up the links into several chunks.
@@ -562,6 +563,7 @@
 	echo linking stage 3... 1>&2
 	set +x
 	cd stage3
+	$LN_S $root/main.c .
 	mkdir compiler
 	cd compiler
 	# Break up the links into several chunks.

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
                                    |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------