Cleaned up egcs changes (mainly to minimise diffs with the gcc version

and restore order to sorted lists).

1 files changed, 25 insertions, 22 deletions

diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 872761b..e17b785 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.25 1999/04/09 18:46:48 bde Exp $
+# $Id: Makefile,v 1.26 1999/04/11 04:11:27 bde Exp $
 #
 
 #
@@ -17,10 +17,10 @@ CFLAGS+=	-I.
 
 .include "../Makefile.inc"
 
-CFLAGS+=	-I${GCCDIR}/objc
-
 .PATH: ${GCCDIR} ${GCCDIR}/cp
 
+CFLAGS+=	-I${GCCDIR}/objc
+
 #-----------------------------------------------------------------------
 # insn-* gunk
 
@@ -46,33 +46,34 @@ GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i
 .endfor
 
-.for i in check genrtl
+.for i in attrtab
 build-tools: gen$i
 
-gen$i: gen$i.o
+gen$i: gen$i.o rtl.o rtlanal.o print-rtl.o obstack.o bitmap.o
 	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i
 .endfor
 
-.ORDER: genrtl.c genrtl.h
-genrtl.h genrtl.c: gengenrtl
-	./gengenrtl genrtl.h genrtl.c
+SRCS+=		bitmap.c obstack.c print-rtl.c rtl.c rtlanal.c
 
-GENSRCS+=	genrtl.c genrtl.h
-
-.for i in attrtab
+.for i in check genrtl
 build-tools: gen$i
 
-gen$i: gen$i.o rtl.o rtlanal.o print-rtl.o obstack.o bitmap.o
+gen$i: gen$i.o
 	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i
 .endfor
 
-SRCS+=		bitmap.c print-rtl.c rtl.c rtlanal.c obstack.c
+.ORDER: genrtl.c genrtl.h
+genrtl.c genrtl.h: gengenrtl
+	./gengenrtl genrtl.h genrtl.c
+
+GENSRCS+=	genrtl.c genrtl.h
+
 #-----------------------------------------------------------------------
 # C hash codes
 c-gperf.h: c-parse.gperf
@@ -88,7 +89,7 @@ hash.h: gxx.gperf
 GENSRCS+=	hash.h
 
 #-----------------------------------------------------------------------
-# common parser stuff
+# Common parser stuff.
 
 tree-check.h: gencheck
 	./gencheck > ${.TARGET}
@@ -127,15 +128,19 @@ CLEANFILES+=	objc-parse.y		# insurance
 #-----------------------------------------------------------------------
 # the host/target compiler config.
 
-COMMONHDRS=	config.h hconfig.h options.h specs.h tconfig.h tm.h multilib.h
+COMMONHDRS=	config.h hconfig.h multilib.h options.h specs.h tconfig.h tm.h
 GENSRCS+=	${COMMONHDRS}
 
 config.h hconfig.h:
 	echo '#include "auto-host.h"' > ${.TARGET}
 	echo '#include "${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h"' >> ${.TARGET}
 
-tconfig.h:
-	echo '#include "${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h"' > ${.TARGET}
+multilib.h:
+	echo 'static char *multilib_raw[] = { \
+	    "aout maout;", "elf !maout;", NULL };' > ${.TARGET}
+	echo 'static char *multilib_matches_raw[] = { \
+	    "maout maout;", "melf melf;", NULL };' >> ${.TARGET}
+	echo 'static char *multilib_extra = "";' >> ${.TARGET}
 
 options.h:
 	echo '#include "cp/lang-options.h"' > ${.TARGET}
@@ -145,6 +150,9 @@ specs.h:
 	echo '#include "cp/lang-specs.h"' > ${.TARGET}
 	#echo '#include "f/lang-specs.h"'    >> ${.TARGET}
 
+tconfig.h:
+	echo '#include "${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h"' > ${.TARGET}
+
 tm.h:
 	echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"' > ${.TARGET}
 .if ${MACHINE_ARCH} == "i386"
@@ -155,11 +163,6 @@ tm.h:
 	echo '#include "${MACHINE_ARCH}/perform.h"' >> ${.TARGET}
 .endif
 
-multilib.h: genmultilib
-	echo 'static char *multilib_raw[] = {"aout maout;", "elf !maout;", NULL};' > multilib.h
-	echo 'static char *multilib_matches_raw[] = {"maout maout;", "melf melf;", NULL};' >> multilib.h
-	echo 'static char *multilib_extra = "";' >> multilib.h
-
 #-----------------------------------------------------------------------
 # General things.