3 files changed, 17 insertions, 34 deletions

diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 0284d7d899e1..f5c9c2b66fb0 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.inc,v 1.21 1998/01/11 04:10:26 jb Exp $
+# $Id: Makefile.inc,v 1.22 1998/01/25 09:49:00 jb Exp $
 #
 
 # Sometimes this is .include'd several times...
@@ -23,15 +23,15 @@ BINFORMAT?=	aout
 #BINFORMAT?=	elf
 .endif
 
+# same backend, just change compiled-in default.
 .if ${BINFORMAT} == aout
 CFLAGS+=	-DFREEBSD_AOUT
-target=		${MACHINE_ARCH}-unknown-freebsd
 .endif
 .if ${BINFORMAT} == elf
 CFLAGS+=	-DFREEBSD_ELF
-target=		${MACHINE_ARCH}-unknown-freebsdelf
 .endif
 
+target=		${MACHINE_ARCH}-unknown-freebsd
 version!=	sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c
 
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 8fd206a06412..91400cc7ea32 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $Id: Makefile,v 1.12 1997/02/22 15:44:52 peter Exp $
 #
 
 PROG =	cc
@@ -14,9 +14,7 @@ CLEANFILES+= multilib.h
 CFLAGS+= -I.	# I mean it!
 CFLAGS+= -I${.CURDIR}
 
-# I have NO idea what this is for, it appears to be m68k specific.
 multilib.h: genmultilib
-	sh ${GCCDIR}/genmultilib "$(MULTILIB_OPTIONS)" \
-		"$(MULTILIB_DIRNAMES)" "$(MULTILIB_MATCHES)" > multilib.h
+	echo '#define MULTILIB_SELECT "aout maout;elf !maout;"' > multilib.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 1d22fc6d57d9..76ba0457b35a 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.6 1998/01/25 09:47:46 jb Exp $
+# $Id: Makefile,v 1.7 1998/03/06 13:34:36 bde Exp $
 #
 
 #
@@ -116,24 +116,11 @@ CLEANFILES+= objc-parse.y		# insurance
 #-----------------------------------------------------------------------
 # CPP parser done in its own makefile
 #-----------------------------------------------------------------------
-# Everything in ${SRCS} is generated
-CLEANFILES+=	${SRCS}
-
-#-----------------------------------------------------------------------
-all:		${BINFORMAT} ${SRCS}
-
-#-----------------------------------------------------------------------
-beforedepend:	${BINFORMAT}
-
-#-----------------------------------------------------------------------
 # the host/target compiler config.
 
 COMMONHDRS=	config.h hconfig.h tconfig.h tm.h options.h specs.h
 
-${COMMONHDRS}:	${BINFORMAT}
-
-aout:
-	@rm -f elf
+${COMMONHDRS}:
 	echo '#include "${MACHINE_ARCH}/freebsd.h"'     > tm.h
 	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"'  > config.h
 	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"'  > hconfig.h
@@ -141,22 +128,20 @@ aout:
 	echo '#include "cp/lang-options.h"'             > options.h
 	echo '#include "cp/lang-specs.h"'               > specs.h
 	echo '#include "f2c-specs.h"'                   >> specs.h
-	@touch aout
-
-elf:
-	@rm -f aout
-	echo '#include "${MACHINE_ARCH}/freebsd-elf.h"' > tm.h
-	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"'  > config.h
-	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"'  > hconfig.h
-	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"'  > tconfig.h
-	echo '#include "cp/lang-options.h"'             > options.h
-	echo '#include "cp/lang-specs.h"'               > specs.h
-	echo '#include "f2c-specs.h"'                   >> specs.h
-	@touch elf
 
 SRCS+=	${COMMONHDRS}
 CLEANFILES+=	elf aout
 
+#-----------------------------------------------------------------------
+# Everything in ${SRCS} is generated
+CLEANFILES+=	${SRCS}
+
+#-----------------------------------------------------------------------
+all:		${COMMONHDRS} ${SRCS}
+
+#-----------------------------------------------------------------------
+beforedepend:	${COMMONHDRS}
+
 # We kept ${LOCOBJS} separate from ${OBJS} because adding all the
 # objects to ${OBJS} would give too many (cyclic) dependencies.
 # Add just enough dependencies for `make -j 1000' to work.