4 files changed, 34 insertions, 18 deletions
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 105c18384422..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.24 1998/10/26 18:27:32 imp Exp $
+# $Id: Makefile.inc,v 1.22 1998/01/25 09:49:00 jb Exp $
 #
 
 # Sometimes this is .include'd several times...
@@ -15,6 +15,22 @@ OUT_FILE=	${MACHINE_ARCH}.c
 OUT_OBJ=	${MACHINE_ARCH}
 .PATH:		${GCCDIR}/config/${MACHINE_ARCH}
 
+.if ${MACHINE} == "alpha"
+BINFORMAT=	elf
+.else
+# Pick aout for now. the elf config is not binary compatable.
+BINFORMAT?=	aout
+#BINFORMAT?=	elf
+.endif
+
+# same backend, just change compiled-in default.
+.if ${BINFORMAT} == aout
+CFLAGS+=	-DFREEBSD_AOUT
+.endif
+.if ${BINFORMAT} == elf
+CFLAGS+=	-DFREEBSD_ELF
+.endif
+
 target=		${MACHINE_ARCH}-unknown-freebsd
 version!=	sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c
 
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 3c0f2e8f2b82..3b085c6eb3b9 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.14 1997/02/22 15:44:57 peter Exp $
+# $Id$
 #
 .include "../Makefile.inc"
 
@@ -24,6 +24,6 @@ NOPIC=		YES
 install:
 	@true
 
-${OUT_OBJ}.o ${OUT_OBJ}.So:	${OUT_FILE}
+${OUT_OBJ}.o ${OUT_OBJ}.so:	${OUT_FILE}
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 72e563c16d80..42a13c8c6a3e 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.13 1998/08/20 21:45:46 jb Exp $
+# $Id: Makefile,v 1.12 1998/07/07 01:46:41 bde Exp $
 #
 
 #
@@ -124,18 +124,18 @@ CLEANFILES+=	objc-parse.y		# insurance
 #-----------------------------------------------------------------------
 # the host/target compiler config.
 
-COMMONHDRS=	config.h hconfig.h options.h specs.h tconfig.h tm.h
-GENSRCS+=	${COMMONHDRS}
+COMMONHDRS=	config.h hconfig.h tconfig.h tm.h options.h specs.h
+
+${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
+	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
 
-config.h hconfig.h tconfig.h:
-	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > ${.TARGET}
-options.h:
-	echo '#include "cp/lang-options.h"' > ${.TARGET}
-specs.h:
-	echo '#include "cp/lang-specs.h"'> ${.TARGET}
-	echo '#include "f2c-specs.h"'    >> ${.TARGET}
-tm.h:
-	echo '#include "${MACHINE_ARCH}/freebsd.h"' > ${.TARGET}
+GENSRCS+=	${COMMONHDRS}
 
 #-----------------------------------------------------------------------
 # General things.
diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index 260001aaab49..cbae22a28c54 100644
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.18 1998/10/06 11:28:29 peter Exp $
+# $Id: Makefile,v 1.17 1998/07/08 00:45:50 bde Exp $
 #
 
 LIB=	gcc
@@ -50,8 +50,8 @@ CLEANFILES+=	${COMMONHDRS}
 
 LIB1OBJS=	${LIB1FUNCS:S/$/.o/}
 LIB2OBJS=	${LIB2FUNCS:S/$/.o/}
-LIB1SOBJS=	${LIB1FUNCS:S/$/.So/}
-LIB2SOBJS=	${LIB2FUNCS:S/$/.So/}
+LIB1SOBJS=	${LIB1FUNCS:S/$/.so/}
+LIB2SOBJS=	${LIB2FUNCS:S/$/.so/}
 LIB1POBJS=	${LIB1FUNCS:S/$/.po/}
 LIB2POBJS=	${LIB2FUNCS:S/$/.po/}