15 files changed, 403 insertions, 106 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 75110021350c..d7967484f8e1 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,10 +1,10 @@
 #
-# $Id: Makefile,v 1.9 1997/02/22 15:44:47 peter Exp $
+# $Id: Makefile,v 1.11 1999/03/26 12:43:56 obrien Exp $
 #
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_tools cc_int cpp cc1 cc cc1obj cc1plus c++ f77 c++filt doc
+SUBDIR= cc_tools cc_int cc_drv cpp cc1 cc cc1obj cc1plus c++ c++filt ## doc
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 105c18384422..99d3722d3adf 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,11 +1,10 @@
 #
-# $Id: Makefile.inc,v 1.24 1998/10/26 18:27:32 imp Exp $
+# $Id: Makefile.inc,v 1.28 1999/03/10 09:04:18 obrien Exp $
 #
 
 # Sometimes this is .include'd several times...
 .if !defined(GCCDIR)
-GCCDIR=		${.CURDIR}/../../../../contrib/gcc
-.PATH:		../cc_tools ${GCCDIR} ${GCCDIR}/cp ${GCCDIR}/objc
+GCCDIR=		${.CURDIR}/../../../../contrib/egcs/gcc
 
 BISON?=		bison
 
@@ -13,16 +12,40 @@ BISON?=		bison
 MD_FILE=	${GCCDIR}/config/${MACHINE_ARCH}/${MACHINE_ARCH}.md
 OUT_FILE=	${MACHINE_ARCH}.c
 OUT_OBJ=	${MACHINE_ARCH}
-.PATH:		${GCCDIR}/config/${MACHINE_ARCH}
 
+.if ${MACHINE_ARCH} != "i386"
+BINFORMAT=	elf
+.else
+BINFORMAT?=	elf
+.endif
+
+# same backend, just change compiled-in default.
+.if ${BINFORMAT} == aout
+CFLAGS+=	-DFREEBSD_AOUT
+target=		${MACHINE_ARCH}-unknown-freebsd-aout
+.endif
+.if ${BINFORMAT} == elf
+CFLAGS+=	-DFREEBSD_ELF
 target=		${MACHINE_ARCH}-unknown-freebsd
+.endif
+
+# These architectures are Cygnus's default for enabling Haifa
+.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc")
+USE_EGCS_HAIFA=1
+.endif
+
 version!=	sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c
+#version!=	sed -e 's/.*\(egcs-[0-9\.]*\).*/\1/' < ${GCCDIR}/version.c 
 
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
 CFLAGS+=	-DFREEBSD_NATIVE
 CFLAGS+=	-DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+=	-DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
+.if defined(USE_EGCS_HAIFA)
+CFLAGS+=	-DHAIFA
+.endif
+
 .if exists(${.OBJDIR}/../cc_tools)
 CFLAGS+=	-I${.OBJDIR}/../cc_tools
 .else
@@ -31,10 +54,12 @@ CFLAGS+=	-I${.CURDIR}/../cc_tools
 
 .if exists(${.OBJDIR}/../cc_int)
 LIBDESTDIR=	${.OBJDIR}/../cc_int
+LIBCC_DRV=	${.OBJDIR}/../cc_drv/libcc_drv.a
 .else
 LIBDESTDIR=	${.CURDIR}/../cc_int
+LIBCC_DRV=	${.CURDIR}/../cc_drv/libcc_drv.a
 .endif
 
 LIBCC_INT=	${LIBDESTDIR}/libcc_int.a
 
-.endif
+.endif # !GCCDIR
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index 0fec07193731..0dc2ec74e687 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,12 +1,21 @@
 #
-# $Id: Makefile,v 1.8 1998/03/08 12:27:04 obrien Exp $
+# $Id: Makefile,v 1.11 1999/03/05 04:54:59 obrien Exp $
 #
 
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}/cp ${GCCDIR}
+
 PROG =	c++
-SRCS =	g++.c
+SRCS =	gcc.c g++spec.c
 BINDIR=	/usr/bin
 LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
+CFLAGS+= -DLANG_SPECIFIC_DRIVER
+
+DPADD+=	${LIBCC_DRV} 
+LDADD+=	${LIBCC_DRV}
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index 34cd99e598a3..27074966c527 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,7 +1,11 @@
 #
-# $Id: Makefile,v 1.3 1997/02/22 15:44:50 peter Exp $
+# $Id: Makefile,v 1.5 1999/03/05 04:55:03 obrien Exp $
 #
 
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}
+
 PROG =	c++filt
 SRCS =	cplus-dem.c getopt.c getopt1.c underscore.c
 BINDIR=	/usr/bin
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 91400cc7ea32..398878d25a24 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,20 +1,20 @@
 #
-# $Id: Makefile,v 1.12 1997/02/22 15:44:52 peter Exp $
+# $Id: Makefile,v 1.15 1999/03/05 04:55:03 obrien Exp $
 #
 
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}
+
 PROG =	cc
 MAN1 =  gcc.1
 SRCS =	gcc.c
 BINDIR=	/usr/bin
-SRCS+=	multilib.h obstack.c version.c
-LINKS=	${BINDIR}/cc ${BINDIR}/gcc
-MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1
-CLEANFILES+= multilib.h
 
-CFLAGS+= -I.	# I mean it!
-CFLAGS+= -I${.CURDIR}
+LINKS=	${BINDIR}/cc ${BINDIR}/gcc
+MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
-multilib.h: genmultilib
-	echo '#define MULTILIB_SELECT "aout maout;elf !maout;"' > multilib.h
+DPADD+=	${LIBCC_DRV} 
+LDADD+=	${LIBCC_DRV}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/f2c-specs.h b/gnu/usr.bin/cc/cc/f2c-specs.h
deleted file mode 100644
index aafab0ee4fd4..000000000000
--- a/gnu/usr.bin/cc/cc/f2c-specs.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/***** ljo's Fortran rule *****/
-  {".f", "@f2c"},
-  {"@f2c",
-   "f2c %{checksubscripts:-C} %{I2} %{onetrip} %{honorcase:-U} %{u} %{w}\
-        %{ANSIC:-A} %{a} %{C++}\
-        %{c} %{E} %{ec} %{ext} %{f} %{72} %{g} %{h} %{i2} %{kr} %{krd}\
-        %{P} %{p} %{v} %{r} %{r8} %{s} %{w8} %{z} %{N*}\
-        %i %{!pipe: -o %g.c} %{pipe:-o -}|\n",
-   "cpp -lang-c %{nostdinc*} %{C} %{v} %{A*} %{I*} %{P} %I\
-	%{C:%{!E:%eGNU C does not support -C without using -E}}\
-	%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\
-        -undef -D__GNUC__=%v1 -D__GNUC_MINOR__=%v2\
-	%{ansi:-trigraphs -$ -D__STRICT_ANSI__}\
-	%{!undef:%{!ansi:%p} %P} %{trigraphs} \
-        %c %{O*:%{!O0:-D__OPTIMIZE__}} %{traditional} %{ftraditional:-traditional}\
-        %{traditional-cpp:-traditional}\
-	%{g*} %{W*} %{w} %{pedantic*} %{H} %{d*} %C %{D*} %{U*} %{i*}\
-        %{pipe:-} %{!pipe:%g.c} %{!M:%{!MM:%{!E:%{!pipe:%g.i}}}}%{E:%W{o*}}%{M:%W{o*}}%{MM:%W{o*}} |\n",
-   "%{!M:%{!MM:%{!E:cc1 %{!pipe:%g.i} %1 \
-		   %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a}\
-		   %{g*} %{O*} %{W*} %{w} %{pedantic*} %{ansi} \
-		   %{traditional} %{v:-version} %{pg:-p} %{p} %{f*}\
-		   %{aux-info*}\
-		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
-		   %{S:%W{o*}%{!o*:-o %b.s}}%{!S:-o %{|!pipe:%g.s}} |\n\
-              %{!S:as %{R} %{j} %{J} %{h} %{d2} %a %Y\
-		      %{c:%W{o*}%{!o*:-o %w%b.o}}%{!c:-o %d%w%u.o}\
-                      %{!pipe:%g.s} %A\n }}}}"},
-/***** End of ljo's Fortran rule *****/
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 9be434311459..091203ee9920 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,11 +1,15 @@
 #
-# $Id: Makefile,v 1.11 1997/02/22 15:44:53 peter Exp $
+# $Id: Makefile,v 1.14 1999/03/05 04:55:03 obrien Exp $
 #
+
+.include "../Makefile.inc"
+
+.PATH: ../cc_tools ${GCCDIR}
  
 PROG =	cc1
 SRCS =	c-parse.c \
-	c-aux-info.c c-convert.c c-decl.c c-iterate.c c-lang.c c-lex.c \
-	c-typeck.c
+	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lang.c \
+	c-lex.c c-pragma.c c-typeck.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 05aac08e818f..71245e8c8c78 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,15 +1,22 @@
 #
-# $Id: Makefile,v 1.4 1997/02/22 15:44:54 peter Exp $
+# $Id: Makefile,v 1.7 1999/03/05 04:55:03 obrien Exp $
 #
 
+.include "../Makefile.inc"
+
+.PATH: ../cc_tools ${GCCDIR}/objc ${GCCDIR}
+
 PROG =	cc1obj
 SRCS =	objc-parse.c objc-act.c
 # Ugh, compiled twice...
-SRCS +=	c-aux-info.c c-convert.c c-decl.c c-iterate.c c-lex.c c-typeck.c
+SRCS +=	c-aux-info.c c-common.c c-convert.c c-decl.c c-iterate.c c-lex.c \
+	c-pragma.c c-typeck.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
 
+CFLAGS+= -I${GCCDIR}/objc
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 51435074f2c9..f9b4051379f0 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,21 +1,22 @@
 #
-# $Id: Makefile,v 1.12 1997/06/29 06:03:27 pst Exp $
+# $Id: Makefile,v 1.16 1999/03/05 04:55:03 obrien Exp $
 #
 
-#First, so that we get cp/tree.c and cp/expr.c instead of the C version
-.PATH:	${.CURDIR}/../../../../contrib/gcc/cp
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}/cp
 
 PROG =	cc1plus
-SRCS =	parse.c parse.h \
-	call.c class.c cvt.c decl.c decl2.c edsel.c errfn.c \
-	error.c except.c expr.c gc.c init.c lex.c method.c pt.c \
-	ptree.c repo.c search.c sig.c spew.c tree.c typeck.c typeck2.c xref.c
+SRCS =	parse.c parse.h
+SRCS +=	call.c class.c cvt.c decl.c decl2.c errfn.c error.c except.c expr.c \
+	friend.c init.c lex.c method.c pt.c ptree.c repo.c rtti.c \
+	search.c semantics.c sig.c spew.c tree.c typeck.c typeck2.c xref.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED=yes
 DPADD+=	${LIBCC_INT} 
 LDADD+=	${LIBCC_INT}
-CFLAGS+= -I.	# I mean it.
+CFLAGS+= -I${GCCDIR}/cp -I.
 
 .ORDER: parse.c parse.h
 parse.c parse.h: parse.y
@@ -24,4 +25,11 @@ parse.c parse.h: parse.y
 
 CLEANFILES+=	parse.c parse.h
 
+CPPHDRS=	exception new new.h typeinfo
+
+beforeinstall:
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${CPPHDRS:S;^;${GCCDIR}/cp/inc/;} \
+		${DESTDIR}/usr/include/g++
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_drv/Makefile b/gnu/usr.bin/cc/cc_drv/Makefile
new file mode 100644
index 000000000000..1388c87a1bff
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_drv/Makefile
@@ -0,0 +1,24 @@
+#
+# $Id: Makefile,v 1.2 1999/03/05 04:55:03 obrien Exp $
+#
+.include "../Makefile.inc"
+
+.PATH: ../cc_tools ${GCCDIR} 
+
+SRCS=	multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c
+#	XXX change choose-temp.c to use stock mkstemp()
+SRCS+=	mkstemp.c
+
+CFLAGS+=	-DPREFIX=\"/usr\"
+CFLAGS+=	-DIN_GCC
+
+LIB=		cc_drv
+NOPROFILE=	YES
+NOPIC=		YES
+
+install:
+	@true
+
+${OUT_OBJ}.o ${OUT_OBJ}.so:	${OUT_FILE}
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 3c0f2e8f2b82..a00b9b6cc693 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,10 +1,11 @@
 #
-# $Id: Makefile,v 1.14 1997/02/22 15:44:57 peter Exp $
+# $Id: Makefile,v 1.17 1999/03/05 04:55:03 obrien Exp $
 #
 .include "../Makefile.inc"
 
-SRCS=	bc-emit.c bc-optab.c \
-	c-common.c c-pragma.c \
+.PATH: ../cc_tools ${GCCDIR}/config/${MACHINE_ARCH} ${GCCDIR}
+
+SRCS=	c-common.c c-pragma.c \
 	caller-save.c calls.c combine.c convert.c cse.c \
 	dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \
 	final.c flow.c fold-const.c function.c getpwd.c global.c \
@@ -15,8 +16,12 @@ SRCS=	bc-emit.c bc-optab.c \
 	reload.c reload1.c reorg.c rtl.c rtlanal.c \
 	sched.c sdbout.c stmt.c stor-layout.c stupid.c \
 	toplev.c tree.c unroll.c varasm.c version.c xcoffout.c \
+	alias.c bitmap.c dwarf2out.c dyn-string.c except.c \
+	gcse.c genrtl.c profile.c regmove.c varray.c \
 	${OUT_FILE}
 
+CFLAGS+=	-DTARGET_NAME=\"${MACHINE_ARCH}-unknown-freebsd\"
+
 LIB=		cc_int
 NOPROFILE=	YES
 NOPIC=		YES
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 72e563c16d80..f7cbe0cdc20d 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.16 1999/03/05 04:55:03 obrien Exp $
 #
 
 #
@@ -13,32 +13,11 @@
 # Prevent mkdep from using it, so that we don't have to give rules for
 # aliases of generated headers.
 #
-CFLAGS+=	-I.
+CFLAGS+=	-I${GCCDIR}/objc
 
 .include "../Makefile.inc"
 
-#-----------------------------------------------------------------------
-# Bytecode components
-
-.for i in arity opcode opname
-build-tools: bi-$i
-
-bc-$i.h: bi-$i bytecode.def
-	./bi-$i < ${GCCDIR}/bytecode.def > bc-$i.h
-
-bi-$i: bi-$i.o bi-parser.o bi-lexer.o bi-reverse.o
-	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-GENSRCS+=	bc-$i.h bi-$i.c
-CLEANFILES+=	bi-$i
-.endfor
-
-.ORDER: bi-parser.c bi-parser.h
-bi-parser.c bi-parser.h: bi-parser.y
-	${BISON} ${BISONFLAGS} -d ${.ALLSRC} -o bi-parser.c
-
-SRCS+=		bi-lexer.c bi-reverse.c
-GENSRCS+=	bi-parser.c bi-parser.h
+.PATH: ${GCCDIR} ${GCCDIR}/cp
 
 #-----------------------------------------------------------------------
 # insn-* gunk
@@ -58,25 +37,40 @@ GENSRCS+=	insn-$i.c
 .for i in attr codes config emit extract flags opinit output peep recog
 build-tools: gen$i
 
-gen$i: gen$i.o rtl.o obstack.o
+gen$i: gen$i.o rtl.o obstack.o bitmap.o
 	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i
 .endfor
 
-.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
+gen$i: gen$i.o
 	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
 CLEANFILES+=	gen$i
 .endfor
 
-SRCS+=		print-rtl.c rtl.c rtlanal.c obstack.c
+genrtl.h genrtl.c: gengenrtl
+	./gengenrtl genrtl.h genrtl.c
+
+#GENSRCS+=	genrtl.c genrtl.h
+CLEANFILES+=	genrtl.c genrtl.h
+
+.for i in attrtab
+build-tools: gen$i
+
+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
 
+SRCS+=		bitmap.c print-rtl.c rtl.c rtlanal.c obstack.c
 #-----------------------------------------------------------------------
 # C hash codes
 c-gperf.h: c-parse.gperf
@@ -92,6 +86,19 @@ hash.h: gxx.gperf
 GENSRCS+=	hash.h
 
 #-----------------------------------------------------------------------
+# common parser stuff
+
+.for i in c objc
+$i-parse.c: tree-check.h
+.endfor
+
+tree-check.h: gencheck
+	./gencheck > ${.TARGET}
+
+##GENSRCS+=	tree-check.h
+CLEANFILES+=	tree-check.h
+
+#-----------------------------------------------------------------------
 # C parser
 .ORDER: c-parse.c c-parse.h
 c-parse.c c-parse.h: c-parse.in
@@ -124,18 +131,35 @@ CLEANFILES+=	objc-parse.y		# insurance
 #-----------------------------------------------------------------------
 # the host/target compiler config.
 
-COMMONHDRS=	config.h hconfig.h options.h specs.h tconfig.h tm.h
+COMMONHDRS=	config.h hconfig.h options.h specs.h tconfig.h tm.h multilib.h
 GENSRCS+=	${COMMONHDRS}
 
-config.h hconfig.h tconfig.h:
-	echo '#include "${MACHINE_ARCH}/xm-freebsd.h"' > ${.TARGET}
+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}
+
 options.h:
 	echo '#include "cp/lang-options.h"' > ${.TARGET}
+	#echo '#include "f/lang-options.h"' >> ${.TARGET}
+
 specs.h:
-	echo '#include "cp/lang-specs.h"'> ${.TARGET}
-	echo '#include "f2c-specs.h"'    >> ${.TARGET}
+	echo '#include "cp/lang-specs.h"' > ${.TARGET}
+	#echo '#include "f/lang-specs.h"'    >> ${.TARGET}
+
 tm.h:
-	echo '#include "${MACHINE_ARCH}/freebsd.h"' > ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"' > ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/att.h"' >> ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/freebsd.h"' >> ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/perform.h"' >> ${.TARGET}
+
+multilib.h: genmultilib
+	echo 'static char *multilib_raw[] = {"aout maout;elf !maout;", NULL};' > multilib.h
+	echo 'static char *orig_port_multilib_raw[] = {".;", NULL};' >> multilib.h
+	echo 'static char *multilib_matches_raw[] = {NULL};' >> multilib.h
+	echo 'static char **multilib_extra = "";' >> multilib.h
 
 #-----------------------------------------------------------------------
 # General things.
@@ -158,12 +182,12 @@ OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
 .if !exists(${DEPENDFILE})
 # Fudge pre-dependfile dependencies of objects the same as bsd.prog.mk
 # would do if we defined PROG, except for leaving out dependencies on
-# bc-*.h and insn-*.h because these dependencies would be circular.
+# insn-*.h because these dependencies would be circular.
 #
-${OBJS}: ${SRCS:M*.h:Nbc-*.h:Ninsn-*.h}
+${OBJS}: ${SRCS:M*.h:Ninsn-*.h}
 
-# Give all dependencies on bc-*.h and insn-*.h explicitly (none here for
-# bc-*.h).  This suffices for `make -j<any> depend', and after that all
+# Give all dependencies on insn-*.h explicitly
+# This suffices for `make -j<any> depend', and after that all
 # the dependencies will be in .depend since all .c source files are in
 # SRCS.
 #
@@ -173,4 +197,6 @@ insn-emit.o: insn-codes.h insn-config.h insn-flags.h
 insn-opinit.o: insn-codes.h insn-config.h insn-flags.h
 insn-output.o: insn-attr.h insn-codes.h insn-config.h insn-flags.h
 insn-recog.o: insn-config.h
+
+genattr.o gencodes.o genconfig.o genemit.o genextract.o genflags.o genopinit.o genoutput.o genpeep.o genrecog.o: genrtl.h
 .endif
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
new file mode 100644
index 000000000000..d171704d2f48
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -0,0 +1,204 @@
+/* auto-host.h.  Generated automatically by configure.  */
+
+/* config.in.  Generated automatically from configure.in by autoheader.  */
+/* Define if printf supports "%p".  */
+#define HAVE_PRINTF_PTR 1
+
+/* Define if you want expensive run-time checks. */
+/* #undef ENABLE_CHECKING */
+
+/* Define if your cpp understands the stringify operator.  */
+#define HAVE_CPP_STRINGIFY 1
+
+/* Define if your compiler understands volatile.  */
+#define HAVE_VOLATILE 1
+
+/* Define if your assembler supports specifying the maximum number
+   of bytes to skip when using the GAS .p2align command. */
+/* #undef HAVE_GAS_MAX_SKIP_P2ALIGN */
+
+/* Define if your assembler supports .balign and .p2align.  */
+/* #undef HAVE_GAS_BALIGN_AND_P2ALIGN */
+
+/* Define if you have a working <inttypes.h> header file.  */
+/* #undef HAVE_INTTYPES_H */
+
+/* Whether malloc must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_MALLOC */
+
+/* Whether realloc must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_REALLOC */
+
+/* Whether calloc must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_CALLOC */
+
+/* Whether free must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_FREE */
+
+/* Whether bcopy must be declared even if <string.h> is included.  */
+/* #undef NEED_DECLARATION_BCOPY */
+
+/* Whether bcmp must be declared even if <string.h> is included.  */
+/* #undef NEED_DECLARATION_BCMP */
+
+/* Whether bzero must be declared even if <string.h> is included.  */
+/* #undef NEED_DECLARATION_BZERO */
+
+/* Whether index must be declared even if <string.h> is included.  */
+/* #undef NEED_DECLARATION_INDEX */
+
+/* Whether rindex must be declared even if <string.h> is included.  */
+/* #undef NEED_DECLARATION_RINDEX */
+
+/* Whether getenv must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_GETENV */
+
+/* Whether atol must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_ATOL */
+
+/* Whether sbrk must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_SBRK */
+
+/* Whether abort must be declared even if <stdlib.h> is included.  */
+/* #undef NEED_DECLARATION_ABORT */
+
+/* Whether strerror must be declared even if <string.h> is included.  */
+/* #undef NEED_DECLARATION_STRERROR */
+
+/* Whether getcwd must be declared even if <unistd.h> is included.  */
+/* #undef NEED_DECLARATION_GETCWD */
+
+/* Whether getwd must be declared even if <unistd.h> is included.  */
+/* #undef NEED_DECLARATION_GETWD */
+
+/* Whether getrlimit must be declared even if <sys/resource.h> is included.  */
+#define NEED_DECLARATION_GETRLIMIT 1
+
+/* Whether setrlimit must be declared even if <sys/resource.h> is included.  */
+#define NEED_DECLARATION_SETRLIMIT 1
+
+/* Define if you want expensive run-time checks. */
+/* #undef ENABLE_CHECKING */
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have the vprintf function.  */
+#define HAVE_VPRINTF 1
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if `sys_siglist' is declared by <signal.h>.  */
+#define SYS_SIGLIST_DECLARED 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define if you have the atoll function.  */
+/* #undef HAVE_ATOLL */
+
+/* Define if you have the atoq function.  */
+/* #undef HAVE_ATOQ */
+
+/* Define if you have the bcmp function.  */
+#define HAVE_BCMP 1
+
+/* Define if you have the bcopy function.  */
+#define HAVE_BCOPY 1
+
+/* Define if you have the bsearch function.  */
+#define HAVE_BSEARCH 1
+
+/* Define if you have the bzero function.  */
+#define HAVE_BZERO 1
+
+/* Define if you have the getrlimit function.  */
+#define HAVE_GETRLIMIT 1
+
+/* Define if you have the gettimeofday function.  */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define if you have the index function.  */
+#define HAVE_INDEX 1
+
+/* Define if you have the isascii function.  */
+#define HAVE_ISASCII 1
+
+/* Define if you have the kill function.  */
+#define HAVE_KILL 1
+
+/* Define if you have the popen function.  */
+#define HAVE_POPEN 1
+
+/* Define if you have the putenv function.  */
+#define HAVE_PUTENV 1
+
+/* Define if you have the rindex function.  */
+#define HAVE_RINDEX 1
+
+/* Define if you have the setrlimit function.  */
+#define HAVE_SETRLIMIT 1
+
+/* Define if you have the strchr function.  */
+#define HAVE_STRCHR 1
+
+/* Define if you have the strerror function.  */
+#define HAVE_STRERROR 1
+
+/* Define if you have the strrchr function.  */
+#define HAVE_STRRCHR 1
+
+/* Define if you have the strtoul function.  */
+#define HAVE_STRTOUL 1
+
+/* Define if you have the sysconf function.  */
+#define HAVE_SYSCONF 1
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <limits.h> header file.  */
+#define HAVE_LIMITS_H 1
+
+/* Define if you have the <stab.h> header file.  */
+#define HAVE_STAB_H 1
+
+/* Define if you have the <stddef.h> header file.  */
+#define HAVE_STDDEF_H 1
+
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the <string.h> header file.  */
+#define HAVE_STRING_H 1
+
+/* Define if you have the <strings.h> header file.  */
+#define HAVE_STRINGS_H 1
+
+/* Define if you have the <sys/file.h> header file.  */
+#define HAVE_SYS_FILE_H 1
+
+/* Define if you have the <sys/param.h> header file.  */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define if you have the <sys/resource.h> header file.  */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define if you have the <sys/time.h> header file.  */
+#define HAVE_SYS_TIME_H 1
+
+/* Define if you have the <sys/times.h> header file.  */
+#define HAVE_SYS_TIMES_H 1
+
+/* Define if you have the <sys/wait.h> header file.  */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define if you have the <time.h> header file.  */
+#define HAVE_TIME_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the <wait.h> header file.  */
+/* #undef HAVE_WAIT_H */
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index 35efdec4f063..881c5f5daa89 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -1,7 +1,12 @@
-#	$Id$
+#	$Id: Makefile,v 1.13 1999/03/05 04:55:03 obrien Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}
 
 PROG=	cpp
-SRCS=	cccp.c cexp.y obstack.c version.c
+SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
+CFLAGS+= -DPREFIX=\"/usr\"
 YACC=	${BISON}
 YFLAGS=
 BINDIR=	/usr/libexec
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index 35efdec4f063..881c5f5daa89 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,7 +1,12 @@
-#	$Id$
+#	$Id: Makefile,v 1.13 1999/03/05 04:55:03 obrien Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${GCCDIR}
 
 PROG=	cpp
-SRCS=	cccp.c cexp.y obstack.c version.c
+SRCS=	cccp.c cexp.y obstack.c prefix.c version.c
+CFLAGS+= -DPREFIX=\"/usr\"
 YACC=	${BISON}
 YFLAGS=
 BINDIR=	/usr/libexec