[m-dev.] for review: GCC back-end: rename cc1mercury as mercury1

[Fergus Henderson]

BTW, I have started committing my unreviewed changes for the GCC
back-end interface on a new `gcc-backend-branch' cvs branch.  This
makes it easier for me to continue work on subsequent changes without
waiting for reviews.  I'll commit them on the main branch once they've
been reviewed.

----------

Estimated hours taken: 0.5

gcc/mercury/Make-lang.in:
gcc/mercury/Mmakefile:
	Rename `cc1mercury', the executable for the Mercury front-end
	to GCC (using GCC's main()), as `mercury1', and move it from
	the `gcc/mercury' directory to `gcc'.  This change is in
	response to suggestions by Richard Henderson and Robert Dewar
	on the gcc mailing list.

gcc/mercury/Mmakefile:
	A few minor changes to the settings of the various *FLAGS
	variables.  This Mmakefile is just for testing.

cvs diff: Diffing .
Index: Make-lang.in
===================================================================
RCS file: /home/mercury1/repository/gcc/mercury/Make-lang.in,v
retrieving revision 1.3.2.1
diff -u -d -u -r1.3.2.1 Make-lang.in
--- Make-lang.in	2001/01/14 04:08:48	1.3.2.1
+++ Make-lang.in	2001/01/14 09:10:30
@@ -70,7 +70,7 @@
 # MERCURY_GENERATED = $(srcdir)/mercury/parse.c
 MERCURY_GENERATED =
 
-MERCURY_EXES = mercury/cc1mercury$(exeext)
+MERCURY_EXES = mercury1$(exeext)
 
 # specify additional GCC warning options here
 # The following are enabled by default (see LOOSE_WARN in ../Makefile.in):
@@ -84,9 +84,9 @@
 
 .PHONY: mercury MERCURY
 
-mercury MERCURY: mercury/cc1mercury$(exeext) mercury/testmercury$(exeext)
+mercury MERCURY: mercury1$(exeext) mercury/testmercury$(exeext)
 
-mercury/cc1mercury$(exeext): $(MERCURY_FRONT_END_LIBS) $(MERCURY_GCC_OBJS) \
+mercury1$(exeext): $(MERCURY_FRONT_END_LIBS) $(MERCURY_GCC_OBJS) \
 		$(BACKEND) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) \
 		$(MERCURY_GCC_OBJS) $(MERCURY_FRONT_END_LIBS) $(BACKEND) \
@@ -110,9 +110,9 @@
 		-o $@ 
 
 # Ensure that we build the Mercury compiler front-end library
-# before linking cc1mercury
+# before linking mercury1
 
-mercury/cc1mercury$(exeext): libmmc
+mercury1$(exeext): libmmc
 
 .PHONY: libmmc
 libmmc:
@@ -141,8 +141,8 @@
 	$(CC) -o $@ -c $(ALL_CFLAGS) $(INCLUDES) $< 
 
 #generate the code
-mercury/test.s: mercury/cc1mercury$(exeext) $(srcdir)/mercury/test.m
-	./mercury/cc1mercury$(exeext) -quiet -g -O2 \
+mercury/test.s: mercury1$(exeext) $(srcdir)/mercury/test.m
+	./mercury1$(exeext) -quiet -g -O2 \
 		--mmc-flag=-I$(MERCURY_FRONT_END_SRC_DIR)/library \
 		--mmc-flag=-O2 $(srcdir)/mercury/test.m -o $@
 
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/gcc/mercury/Mmakefile,v
retrieving revision 1.2
diff -u -d -u -r1.2 Mmakefile
--- Mmakefile	2001/01/01 13:57:05	1.2
+++ Mmakefile	2001/01/14 09:12:50
@@ -20,15 +20,19 @@
 # GMCFLAGS = -O2 -fomit-frame-pointer
 GMCFLAGS = --mmc-flag=-I../../mercury/library
 GMCFLAGS += -save-temps -g
+CFLAGS += -save-temps -g
 GMCFLAGS += --mmc-flag=-O0 --mmc-flag=--no-static-ground-terms
 MCFLAGS += -O0 --no-static-ground-terms
 MLFLAGS = -g
-MGNUCFLAGS = -v
+MGNUCFLAGS = -v --no-c-optimize
 
-%.o : %.m cc1mercury Mmakefile
+GMCFLAGS += --mmc-flag=--infer-all
+MCFLAGS += --infer-all
+
+%.o : %.m ../mercury1 Mmakefile
 	$(GCC) -x mercury $(GMCFLAGS) -c $<
 
-%.s : %.m cc1mercury Mmakefile
+%.s : %.m ../mercury1 Mmakefile
 	$(GCC) -x mercury $(GMCFLAGS) -S $<
 
 %.s0 : %.c

-- 
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
--------------------------------------------------------------------------