diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 6a6837cb2aa2..4656b87ad6c6 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../contrib/egcs/libf2c
+SRCDIR=	${.CURDIR}/../../../contrib/libf2c
 
 .PATH: ${SRCDIR} ${SRCDIR}/libU77 ${SRCDIR}/libF77 ${SRCDIR}/libI77
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 60f6a34523bd..bde276955f00 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-GCCDIR=	${.CURDIR}/../../../contrib/egcs/gcc
+GCCDIR=	${.CURDIR}/../../../contrib/gcc
 
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
@@ -86,14 +86,22 @@ config.h:
 	echo '#include <xm-freebsd.h>'				>> ${.TARGET}
 
 tconfig.h:
-	echo '#include "${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h"'	> ${.TARGET}
+	echo '#include "gansidecl.h"'				> ${.TARGET}
+	echo '#include "${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h"'	>> ${.TARGET}
 
+#	KEEP THIS IN SYNC with src/gcc/usr.bin/cc/cc_tools/Makefile !!
 tm.h:
 	echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"'	> ${.TARGET}
 .if ${MACHINE_ARCH} == "i386"
 	echo '#include "${MACHINE_ARCH}/att.h"'			>> ${.TARGET}
+	echo '#include "svr4.h"'				>> ${.TARGET}
 .endif
+	echo '#include <freebsd.h>'				>> ${.TARGET}
+.if ${MACHINE_ARCH} == "alpha"
+	echo '#include "${MACHINE_ARCH}/freebsd4.h"'		>> ${.TARGET}
+.else
 	echo '#include "${MACHINE_ARCH}/freebsd.h"'		>> ${.TARGET}
+.endif
 .if ${MACHINE_ARCH} == "i386"
 	echo '#include "${MACHINE_ARCH}/perform.h"'		>> ${.TARGET}
 .endif
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 7e7b4ca1f13d..8a3eb60b9955 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-GCCDIR=	${.CURDIR}/../../../contrib/egcs/gcc
+GCCDIR=	${.CURDIR}/../../../contrib/gcc
 
 .PATH:	${GCCDIR}/objc
 
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 28fa9d4b479c..0c26b31a1d78 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../contrib/egcs/libstdc++
+SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
 
 .PATH: ${SRCDIR} ${SRCDIR}/stl ${SRCDIR}/../libio
 
@@ -20,13 +20,15 @@ DPADD+=		${LIBM}
 HDRS=	cassert cctype cerrno cfloat ciso646 climits clocale cmath complex \
 	csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime \
 	cwchar cwctype fstream iomanip iosfwd iostream stdexcept string \
-	strstream complex.h stl.h
+	strstream complex.h stl.h valarray
 
-SHDRS=	bastring.cc bastring.h complext.cc complext.h dcomplex.h fcomplex.h \
-	ldcomplex.h straits.h
+STDHDRS=bastring.cc bastring.h complext.cc complext.h dcomplex.h fcomplex.h \
+	gslice.h gslice_array.h indirect_array.h ldcomplex.h mask_array.h \
+	slice.h slice_array.h std_valarray.h straits.h valarray_array.h \
+	valarray_array.tcc valarray_meta.h
 
-STLHDRS=algo.h algobase.h algorithm alloc.h bvector.h defalloc.h deque deque.h \
-	function.h functional hash_map hash_map.h hash_set hash_set.h \
+STLHDRS=algo.h algobase.h algorithm alloc.h bitset bvector.h defalloc.h deque \
+	deque.h function.h functional hash_map hash_map.h hash_set hash_set.h \
 	hashtable.h heap.h iterator iterator.h list list.h map map.h memory \
 	multimap.h multiset.h numeric pair.h pthread_alloc pthread_alloc.h \
 	queue rope rope.h ropeimpl.h set set.h slist slist.h stack stack.h \
@@ -75,7 +77,7 @@ beforeinstall:
 	    ${STLHDRS:S;^;${SRCDIR}/stl/;} \
 	    ${DESTDIR}/usr/include/g++
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${SHDRS:S;^;${SRCDIR}/std/;} \
+	    ${STDHDRS:S;^;${SRCDIR}/std/;} \
 	    ${DESTDIR}/usr/include/g++/std
 
 CLEANFILES+=	dummy.h dummy.c dummy.C
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index abfe55c88f83..093b8ff7fcf9 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -4,7 +4,7 @@
 
 # Sometimes this is .include'd several times...
 .if !defined(GCCDIR)
-GCCDIR=		${.CURDIR}/../../../../contrib/egcs/gcc
+GCCDIR=		${.CURDIR}/../../../../contrib/gcc
 
 .if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb"
 GCC_ARCH=mips
@@ -26,7 +26,7 @@ USE_EGCS_HAIFA=1
 version!=	sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${GCCDIR}/version.c
 #version!=	sed -e 's/.*\(egcs-[0-9\.]*\).*/\1/' < ${GCCDIR}/version.c 
 
-CFLAGS+=	-DFREEBSD_NATIVE -DHAVE_CONFIG_H
+CFLAGS+=	-DFREEBSD_NATIVE -DIN_GCC -DHAVE_CONFIG_H
 CFLAGS+=	-DDEFAULT_TARGET_VERSION=\"$(version)\"
 CFLAGS+=	-DDEFAULT_TARGET_MACHINE=\"$(target)\"
 
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index 1bdbcc303915..f4e58c3a9864 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -10,8 +10,6 @@ LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
-CFLAGS+= -DLANG_SPECIFIC_DRIVER
-
 DPADD+=	${LIBCC_DRV} 
 LDADD+=	${LIBCC_DRV}
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 1e05747f7196..a796e9ed1987 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -6,7 +6,7 @@
 
 PROG=	cc
 MAN1=	gcc.1
-SRCS=	gcc.c
+SRCS=	gcc.c gccspec.c
 
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 4b0b62b5f177..4c64f9aadfac 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -7,13 +7,13 @@
 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 \
-	insn-attrtab.c insn-emit.c insn-extract.c insn-opinit.c \
+	final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \
+	hash.c insn-attrtab.c insn-emit.c insn-extract.c insn-opinit.c \
 	insn-output.c insn-peep.c insn-recog.c \
-	integrate.c jump.c local-alloc.c loop.c obstack.c optabs.c \
+	integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \
 	print-rtl.c print-tree.c real.c recog.c reg-stack.c regclass.c \
 	reload.c reload1.c reorg.c rtl.c rtlanal.c \
-	sdbout.c stmt.c stor-layout.c stupid.c \
+	sbitmap.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 \
@@ -24,6 +24,9 @@ SRCS+=	haifa-sched.c
 SRCS+=	sched.c
 .endif
 
+#	stuff that makes libiberty now required (2.95) and shouldn't be...
+SRCS+=	obstack.c splay-tree.c
+
 CFLAGS+=	-DTARGET_NAME=\"${target}\"
 
 LIB=		cc_int
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 9e23f2dd7198..6f815c12e152 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -37,7 +37,7 @@ 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 bitmap.o
+gen$i: gen$i.o rtl.o obstack.o print-rtl.o bitmap.o
 	${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$i.c
@@ -132,11 +132,17 @@ CLEANFILES+=	objc-parse.y objc-parse.y.out	# insurance
 # the host/target compiler config.
 
 COMMONHDRS=	config.h hconfig.h multilib.h options.h specs.h tconfig.h tm.h
-GENSRCS+=	${COMMONHDRS}
+GENSRCS+=	${COMMONHDRS} gencheck.h
 
 config.h hconfig.h:
 	echo '#include "auto-host.h"'			> ${.TARGET}
+	echo '#include "gansidecl.h"'			>> ${.TARGET}
 	echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"'	>> ${.TARGET}
+	echo '#include "hwint.h"'			>> ${.TARGET}
+
+gencheck.h:
+	echo '#include "cp/cp-tree.def"'		> ${.TARGET}
+	echo '#include "objc/objc-tree.def"'		>> ${.TARGET}
 
 multilib.h:
 	echo 'static char *multilib_raw[] = { \
@@ -152,16 +158,20 @@ options.h:
 specs.h:
 	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
 	echo '#include "f/lang-specs.h"'		>> ${.TARGET}
+	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
 
 tconfig.h:
-	echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"'	> ${.TARGET}
+	echo '#include "gansidecl.h"'			> ${.TARGET}
+	echo '#include "${GCC_ARCH}/xm-${GCC_ARCH}.h"'	>> ${.TARGET}
 
+#	KEEP THIS IN SYNC with src/gcc/lib/libgcc/Makefile !!
 tm.h:
 	echo '#include "${GCC_ARCH}/${GCC_ARCH}.h"'	> ${.TARGET}
 .if ${GCC_ARCH} == "i386"
 	echo '#include "${GCC_ARCH}/att.h"'		>> ${.TARGET}
 	echo '#include "svr4.h"'			>> ${.TARGET}
 .endif
+	echo '#include <freebsd.h>'			>> ${.TARGET}
 	echo '#include "${GCC_ARCH}/freebsd.h"'		>> ${.TARGET}
 .if ${GCC_ARCH} == "i386"
 	echo '#include "${GCC_ARCH}/perform.h"'		>> ${.TARGET}
@@ -193,7 +203,7 @@ OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
 # all headers.  Filter out the objects that would cause problems (i.e.,
 # objects that will be used to create programs that will generate headers).
 #
-${OBJS:Nbitmap.o:Ngenattr.o:Ngencheck.o:Ngencodes.o:Ngenconfig.o:Ngenflags.o:Ngengenrtl.o:Nobstack.o:Nrtl.o}: ${SRCS:M*.h}
+${OBJS:Nbitmap.o:Ngenattr.o:Ngencheck.o:Ngencodes.o:Ngenconfig.o:Ngenflags.o:Ngengenrtl.o:Nobstack.o:Nprint-rtl.o:Nrtl.o}: ${SRCS:M*.h}
 
 # Next, make each of the problematic objects depend on only most headers.
 # Filter out the headers that would cause problems (and a few more when it
@@ -201,6 +211,6 @@ ${OBJS:Nbitmap.o:Ngenattr.o:Ngencheck.o:Ngencodes.o:Ngenconfig.o:Ngenflags.o:Nge
 #
 bitmap.o genattr.o gencodes.o genconfig.o genflags.o obstack.o rtl.o: \
     ${SRCS:M*.h:Ninsn-*.h}
-gencheck.o: ${SRCS:M*.h:Ngenrtl.h:Ntree-check.h:Ninsn-*.h}
+gencheck.o: gencheck.h ${SRCS:M*.h:Ngenrtl.h:Ntree-check.h:Ninsn-*.h}
 gengenrtl.o: ${SRCS:M*.h:Ngenrtl.h:Ninsn-*.h}
 .endif
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index d1d572e52d39..47ef41021f5f 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -7,8 +7,6 @@
 PROG=	f77
 SRCS=	gcc.c g77spec.c version.c
 
-CFLAGS+=	-DLANG_SPECIFIC_DRIVER
-
 DPADD=	${LIBCC_DRV} 
 LDADD=	${LIBCC_DRV}