17 files changed, 675 insertions, 648 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index d8ea8c26ae28..69b4eb93e275 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -10,7 +10,7 @@ SUBDIR+= cpp
 .endif
 
 .if !defined(NO_CXX)
-SUBDIR+= cc1plus c++ c++filt
+SUBDIR+= cc1plus c++
 .if !defined(NO_COLLECT2)
 #SUBDIR+= collect2
 .endif
diff --git a/gnu/usr.bin/cc/Makefile.fe b/gnu/usr.bin/cc/Makefile.fe
index c4a02f88bf23..a7057b162bac 100644
--- a/gnu/usr.bin/cc/Makefile.fe
+++ b/gnu/usr.bin/cc/Makefile.fe
@@ -3,3 +3,13 @@
 #	Front-end-only bits
 
 version!=	sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'
+
+#
+# These were previously defined in gcc.c.  Just copy previous values from
+# there. We ifdef most of them out for FREEBSD_NATIVE builds anyway.
+# gcc.c won't compile without them though.
+DRIVER_DEFINES = \
+	-DDEFAULT_TARGET_VERSION=\"$(version)\" \
+	-DDEFAULT_TARGET_MACHINE=\"$(target)\" \
+
+CFLAGS+= ${DRIVER_DEFINES}
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 5423dc7f276b..6182b69a4d5e 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -9,11 +9,11 @@ GCC_CPU=	arm
 .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
 .elif ${TARGET_ARCH} == "ia64"
+TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD
 GCC_CPU=	ia64
 .elif ${TARGET_ARCH} == "powerpc"
 GCC_CPU=	rs6000
 .elif ${TARGET_ARCH} == "sparc64"
 GCC_CPU=	sparc
 TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
-CFLAGS+=	-DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT}
 .endif
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index fa5860301c03..a681f673e677 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -11,9 +11,6 @@ LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
-CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
-
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index b4fe47f6b5d0..0df2e6ee527b 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -13,9 +13,6 @@ NOSHARED?=yes
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
-CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
-
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 6d8d08dc35fb..ec116518f12c 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -5,14 +5,14 @@
 .PATH: ${GCCDIR}
  
 PROG=	cc1
-SRCS=	main.c c-parse+%DIKED.c c-lang.c c-decl.c c-opts.c
+SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED?=yes
 
 CFLAGS+= -I.
 
-DPADD=	${LIBCC_INT} 
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
@@ -23,9 +23,8 @@ c-parse+%DIKED.c: c-parse.c
 	    ${.ALLSRC} > ${.TARGET}
 
 c-parse.y: c-parse.in
-	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
-	    -e "/^ifc$$/d" \
-	    -e "/^end ifc$$/d" \
+	sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \
+	    -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" \
 	    ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES=	c-parse+%DIKED.c c-parse.c c-parse.y
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 9d9e59867301..c0257438a74e 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -5,14 +5,14 @@
 .PATH: ${GCCDIR}/objc ${GCCDIR}
 
 PROG=	cc1obj
-SRCS=	objc-parse+DIKED.c objc-act.c objc-lang.c main.c c-decl.c
+SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.
 
-DPADD=	${LIBCC_INT} 
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
@@ -23,9 +23,8 @@ objc-parse+DIKED.c: objc-parse.c
 	    ${.ALLSRC} > ${.TARGET}
 
 objc-parse.y: c-parse.in
-	sed -e "/^ifc$$/,/^end ifc$$/d" \
-	    -e "/^ifobjc$$/d" \
-	    -e "/^end ifobjc$$/d" \
+	sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \
+	    -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" \
 	    ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES=	objc-parse+DIKED.c objc-parse.c objc-parse.y
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index ca6743c37374..c26703d6b599 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -5,11 +5,11 @@
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
 PROG=	cc1plus
-SRCS=	parse+%DIKED.c parse.h cfns.h
-SRCS+=	main.c cp-lang.c c-opts.c \
-	call.c class.c cvt.c decl.c decl2.c error.c except.c expr.c friend.c \
-	init.c lex.c mangle.c method.c pt.c ptree.c repo.c rtti.c search.c \
-	semantics.c spew.c tree.c typeck.c typeck2.c dump.c optimize.c 
+SRCS=	cfns.h
+SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
+	decl.c decl2.c error.c except.c expr.c dump.c friend.c  init.c lex.c \
+	mangle.c method.c name-lookup.c parser.c pt.c ptree.c repo.c rtti.c \
+	search.c semantics.c tree.c typeck.c typeck2.c optimize.c 
 
 BINDIR=	/usr/libexec
 NOMAN=	1
@@ -17,25 +17,15 @@ NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
-DPADD=	${LIBCC_INT} 
+PADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C++ parser
-
-parse+%DIKED.c y.tab.h: parse.c
-	sed -e "s/malloc/xmalloc/g" \
-	    -e "s/realloc/xrealloc/g" \
-	    ${.ALLSRC:M*c} > ${.TARGET}
-
-parse.h: y.tab.h
-	cp -pf y.tab.h ${.TARGET}
-	grep '^#define[   ]*YYEMPTY' ${.TARGET:S/h$/c/} >>${.TARGET}
-
 cfns.h: cfns.gperf
-	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \
+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
 	    ${.ALLSRC} > ${.TARGET}
 
-CLEANFILES=	parse+%DIKED.c parse.c parse.h y.tab.h cfns.h
+CLEANFILES= cfns.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 9e3757590c3c..c98244db1e36 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -2,38 +2,65 @@
 
 .include "../Makefile.inc"
 
-.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} ${GCCDIR}/../libiberty
+.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
 LIB=		cc_int
 INTERNALLIB=	YES
 
-#	dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \
-#	alias.c bitmap.c dwarf2out.c dyn-string.c \
-SRCS=	c-common.c c-dump.c c-format.c c-opts.c \
-	c-pragma.c c-semantics.c \
-	caller-save.c calls.c combine.c convert.c cse.c \
-	dbxout.c dwarfout.c dwarf2out.c dwarf2asm.c emit-rtl.c explow.c expmed.c expr.c \
-	final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \
-	gtype-desc.c haifa-sched.c \
-	integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \
-	print-rtl.c print-tree.c \
-	ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \
-	real.c recog.c reg-stack.c regclass.c \
-	reload.c reload1.c reorg.c rtl.c rtlanal.c \
-	sbitmap.c sdbout.c stmt.c stor-layout.c \
-	toplev.c tracer.c tree.c unroll.c varasm.c xcoffout.c \
-	alias.c bitmap.c dyn-string.c \
-	genrtl.c profile.c regmove.c varray.c \
-	attribs.c cselib.c debug.c rtl-error.c tree-dump.c tree-inline.c
+# Files from libiberty.
+SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
+        dyn-string.c errors.c fibheap.c getpwd.c getruntime.c hashtab.c \
+	hex.c lbasename.c make-temp-file.c md5.c obstack.c partition.c \
+	pexecute.c physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c \
+	xstrdup.c xstrerror.c xexit.c
 
+# Language-independent files.
+SRCS+=	alias.c bb-reorder.c bitmap.c builtins.c caller-save.c calls.c \
+	cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c \
+	cfgloopanal.c cfgloopmanip.c loop-init.c loop-unswitch.c loop-unroll.c \
+	cfgrtl.c combine.c conflict.c convert.c coverage.c cse.c cselib.c \
+	dbxout.c debug.c df.c diagnostic.c dojump.c doloop.c dominance.c \
+	dwarf2asm.c dwarf2out.c emit-rtl.c except.c explow.c \
+	expmed.c expr.c final.c flow.c fold-const.c function.c gcse.c \
+	genrtl.c ggc-common.c global.c graph.c gtype-desc.c \
+	haifa-sched.c hooks.c ifcvt.c  \
+	integrate.c intl.c jump.c  langhooks.c lcm.c lists.c local-alloc.c \
+	loop.c optabs.c options.c opts.c params.c postreload.c predict.c \
+	print-rtl.c print-tree.c value-prof.c \
+	profile.c ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \
+	real.c recog.c reg-stack.c regclass.c regmove.c regrename.c \
+	reload.c reload1.c reorg.c resource.c rtl.c rtlanal.c rtl-error.c \
+	sbitmap.c sched-deps.c sched-ebb.c sched-rgn.c sched-vis.c sdbout.c \
+	sibcall.c simplify-rtx.c sreal.c stmt.c stor-layout.c stringpool.c \
+	targhooks.c timevar.c toplev.c tracer.c tree.c tree-dump.c unroll.c \
+	varasm.c varray.c version.c vmsdbgout.c xcoffout.c alloc-pool.c \
+	et-forest.c cfghooks.c bt-load.c pretty-print.c ggc-page.c web.c
+
+# Miscellaneous files.
+SRCS+=	hashtable.c tree-inline.c tree-optimize.c cgraph.c cgraphunit.c
+
+# Host hooks.
+SRCS+=	host-default.c
+
+# C and ObjC files.
+SRCS+=	attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \
+	c-convert.c c-aux-info.c c-common.c c-opts.c c-format.c c-semantics.c \
+	c-incpath.c cppdefault.c c-ppoutput.c c-cppbuiltin.c prefix.c \
+	c-objc-common.c c-dump.c c-pch.c
+
+# Files shared by cc1plus, cc1 and cc1obj
+SRCS+=	c-pretty-print.c
+
+# Machine-dependent files.
 SRCS+=	${GCC_CPU}.c
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-c.c)
 SRCS+=	${GCC_CPU}-c.c
 .endif
 
-SRCS+=	bb-reorder.c conflict.c ggc-common.c \
-	ggc-page.c ifcvt.c lists.c predict.c regrename.c resource.c sibcall.c \
-	simplify-rtx.c ssa.c timevar.c ssa-dce.c ssa-ccp.c df.c fibheap.c
+# libcpp files.
+SRCS+=	cpplib.c cpplex.c cppmacro.c cppexp.c cppfiles.c cpptrad.c \
+	cpphash.c cpperror.c cppinit.c cppcharset.c \
+	line-map.c mkdeps.c cpppch.c
 
 # insn-* gunk -- headers are built in cc_tools, as they are used by the
 # "build-tools"
@@ -43,45 +70,20 @@ CLEANFILES+= insn-$F.c
 insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE}
 	${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c
 .endfor
+.for F in modes
+SRCS+=	insn-$F.c
+CLEANFILES+= insn-$F.c
+insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F
+	${.OBJDIR}/../cc_tools/gen$F > insn-$F.c
+.endfor
 
-#	shared between the drivers
-SRCS+=	multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c mbchar.c concat.c make-temp-file.c
-#	C_AND_OBJC_OBJS
-#SRCS+=	attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \
-#	c-convert.c c-aux-info.c c-common.c c-format.c c-semantics.c \
-#	c-objc-common.c
-
-#	XXX: shared by cc1, cc1obj & cpp0
-#	cc1plus seems to be able to tolerate these here,
-#	BUT only if the right .o's are specified in cc1plus/Makefile
-SRCS+=	c-typeck.c \
-	c-errors.c c-convert.c c-aux-info.c c-objc-common.c
-
-#	libbackend
-SRCS+=	builtins.c diagnostic.c doloop.c dominance.c et-forest.c \
-	except.c gcse.c params.c sched-deps.c sched-vis.c sched-rgn.c sched-ebb.c \
-	stringpool.c c-lex.c langhooks.c hashtable.c \
-	hooks.c \
-	cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c cfgrtl.c
-
-#	libcpp
-SRCS+=	cppdefault.c cpperror.c cppexp.c cppfiles.c cppinit.c cpphash.c \
-	cpplex.c cpplib.c cppmacro.c cppmain.c cpptrad.c mkdeps.c line-map.c
-
-#	stuff that makes libiberty now required (2.95) and shouldn't be...
-SRCS+=  splay-tree.c hashtab.c partition.c lbasename.c md5.c hex.c xmemdup.c physmem.c
 CFLAGS+=	-DHAVE_CONFIG_H
-
 CFLAGS+=	-DTARGET_NAME=\"${target}\" -DIN_GCC
-.if defined(TARGET_CPU_DEFAULT)
-CFLAGS+=	-DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT}
-.endif
 
-UNDERSCORES=	0
-SRCS+=	underscore.c
-CLEANFILES+=	underscore.c
-underscore.c: Makefile
-	echo '/*WARNING: This file is automatically generated!*/' >${.TARGET}
-	echo "int prepends_underscore = ${UNDERSCORES};"	  >>${.TARGET}
+# c-pch.o needs extra defines. Replicate the rule here rather than
+# pollute compiler command line for all other files.
+c-pch.o: c-pch.c
+	${CC} ${CFLAGS} -DHOST_MACHINE=\"${host}\" \
+		 -DTARGET_MACHINE=\"${target}\" -c ${.IMPSRC}
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index ca6efdd68176..27dfe6dfec54 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -16,10 +16,43 @@ CFLAGS+=	-I.
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}
+.PATH: ${GCCDIR} ${GCCDIR}/f
 
 CFLAGS+=	-DGENERATOR_FILE
 
+#
+#-----------------------------------------------------------------------
+# Build 'pocket' libiberty exclusively for build tools use.
+
+LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
+	dyn-string.c errors.c fibheap.c \
+	getpwd.c getruntime.c hashtab.c hex.c lbasename.c make-temp-file.c \
+	md5.c obstack.c partition.c pexecute.c physmem.c splay-tree.c xexit.c \
+	xmalloc.c xmemdup.c xstrdup.c xstrerror.c xexit.c
+LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
+
+SRCS+=	${LIBIBERTY_SRCS}
+
+LIBIBERTY=libiberty.a
+${LIBIBERTY}: ${LIBIBERTY_OBJS}
+	@rm -f ${.TARGET}
+	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
+	${RANLIB} ${.TARGET}
+CLEANFILES+=	${LIBIBERTY}
+
+#
+#-----------------------------------------------------------------------
+# options
+OPTION_FILES=${GCCDIR}/f/lang.opt ${GCCDIR}/c.opt ${GCCDIR}/common.opt
+
+.ORDER: options.h options.c
+options.h options.c: opts.sh ${OPTION_FILES}
+	/bin/sh ${GCCDIR}/opts.sh mv options.c options.h ${OPTION_FILES}
+	
+
+GENSRCS+=	options.c options.h
+CLEANFILES+=	options.c options.h
+
 #-----------------------------------------------------------------------
 # insn-* gunk
 
@@ -43,8 +76,8 @@ gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
 .for F in attr codes config emit extract flags opinit output peep recog
 build-tools: gen$F
 
-gen$F: gen$F.o rtl.o obstack.o print-rtl.o bitmap.o errors.o gensupport.o \
-	ggc-none.o hashtab.o read-rtl.o concat.o insn-conditions.o
+gen$F: gen$F.o rtl.o print-rtl.o bitmap.o gensupport.o  ggc-none.o \
+	read-rtl.o insn-conditions.o min-insn-modes.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$F.c
@@ -56,9 +89,9 @@ CLEANFILES+=	gen$F
 #
 build-tools: genattrtab
 
-genattrtab : genattrtab.o rtl.o obstack.o print-rtl.o bitmap.o errors.o \
-	gensupport.o ggc-none.o hashtab.o read-rtl.o concat.o \
-	insn-conditions.o genautomata.o varray.o getruntime.o
+genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \
+	read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \
+	${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
 
 GENSRCS+=	genattrtab.c
@@ -71,18 +104,17 @@ CLEANFILES+=	genattrtab
 .for F in constants conditions
 build-tools: gen$F
 
-gen$F: gen$F.o rtl.o obstack.o bitmap.o errors.o gensupport.o \
-       ggc-none.o hashtab.o read-rtl.o concat.o dummy-conditions.o
+gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$F.c
 CLEANFILES+=	gen$F
 .endfor
 
-.for F in check genrtl preds
+.for F in modes check genrtl preds
 build-tools: gen$F
 
-gen$F: gen$F.o
+gen$F: gen$F.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$F.c
@@ -96,11 +128,26 @@ genrtl.c genrtl.h: gengenrtl
 
 GENSRCS+=	genrtl.c genrtl.h
 
-SRCS+=	bitmap.c concat.c dummy-conditions.c errors.c genautomata.c \
+SRCS+=	bitmap.c concat.c dummy-conditions.c genautomata.c \
 	gensupport.c getruntime.c ggc-none.c hashtab.c \
 	obstack.c physmem.c print-rtl.c read-rtl.c rtl.c varray.c xmemdup.c
 
 #-----------------------------------------------------------------------
+# insn modes stuff.
+
+.ORDER: insn-modes.c insn-modes.h
+insn-modes.h: genmodes
+	./genmodes -h > insn-modes.h
+
+insn-modes.c: genmodes
+	./genmodes > insn-modes.c
+
+min-insn-modes.c: genmodes
+	./genmodes -m > min-insn-modes.c
+
+GENSRCS+= insn-modes.c min-insn-modes.c insn-modes.h
+
+#-----------------------------------------------------------------------
 # Common parser stuff.
 
 tree-check.h: gencheck
@@ -136,7 +183,7 @@ gengtype-yacc+%DIKED.c: gengtype-yacc.c
 	    -e "s/realloc/xrealloc/g" \
 	    ${.ALLSRC} > ${.TARGET}
 
-gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o xmemdup.o
+gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gengtype.c
@@ -156,13 +203,28 @@ gtype-time-stamp: gengtype ${GTFILES}
 GENSRCS+=	gtype-desc.c gtype-desc.h
 CLEANFILES+=	gt-*.h gtype-*.h
 
+#
+#-----------------------------------------------------------------------
+# Fortran build tools
+
+.if !defined(NO_FORTRAN)
+gen-time-stamp: fini
+build-tools: fini
+fini: fini.o ${LIBIBERTY}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+SRCS+=		fini.c
+CLEANFILES+=	fini
+.endif
+
 #-----------------------------------------------------------------------
 # Determine content of variables used by the target/host config files
 
 #
-# The list of headers to go into tconfig.h
+# The list of headers to go into tm.h
 #
-TARGET_INC=	ansidecl.h
+.if ${TARGET_ARCH} == "amd64"
+TARGET_INC=	i386/biarch64.h
+.endif
 TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/unix.h
@@ -189,13 +251,16 @@ TARGET_INC+=	${GCC_CPU}/x86-64.h
 TARGET_INC+=	${GCC_CPU}/freebsd64.h
 TARGET_INC+=	freebsd64-fix.h
 .endif
+.if ${TARGET_ARCH} == "powepc"
+TARGET_INC+=	altivec-defs.h
+.endif
 TARGET_INC+=	defaults.h
 
 #
 # Use TARGET_INC as a template and build a list of target specific
 # include files for gengtype to scan
 #
-GCONFIG_H=	${.OBJDIR}/tconfig.h ${.CURDIR}/auto-host.h
+GCONFIG_H=	${.CURDIR}/auto-host.h
 
 .for H in ${TARGET_INC}
 .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
@@ -210,29 +275,29 @@ GCONFIG_H+=	$D/$H
 #
 srcdir=		${GCCDIR}
 HASHTAB_H=	${GCCDIR}/hashtab.h
+SPLAY_TREE_H=	${GCCDIR}/splay-tree.h
 out_file=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.c
 GTFILES_SRCDIR=	${GCCDIR}
 
 #
 # Copied unchanged from gcc/Makefile.in
 #
-GTFILES = $(GCONFIG_H) $(srcdir)/location.h \
-  $(HASHTAB_H) \
-  $(srcdir)/bitmap.h $(srcdir)/function.h  $(srcdir)/rtl.h $(srcdir)/optabs.h \
-  $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h $(srcdir)/real.h \
-  $(srcdir)/varray.h $(srcdir)/ssa.h $(srcdir)/insn-addr.h $(srcdir)/cselib.h \
+GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
+  $(GCONFIG_H) $(HASHTAB_H) $(SPLAY_TREE_H) \
+  $(srcdir)/bitmap.h $(srcdir)/coverage.c $(srcdir)/function.h  $(srcdir)/rtl.h \
+  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h \
+  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h \
+  $(srcdir)/cselib.h $(srcdir)/basic-block.h  $(srcdir)/cgraph.h \
   $(srcdir)/c-common.h $(srcdir)/c-tree.h \
-  $(srcdir)/basic-block.h \
-  $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c \
-  $(srcdir)/dwarf2out.c $(srcdir)/emit-rtl.c \
-  $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
+  $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
+  $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
+  $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
   $(srcdir)/fold-const.c $(srcdir)/function.c \
   $(srcdir)/gcse.c $(srcdir)/integrate.c $(srcdir)/lists.c $(srcdir)/optabs.c \
   $(srcdir)/profile.c $(srcdir)/ra-build.c $(srcdir)/regclass.c \
-  $(srcdir)/reg-stack.c \
+  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c $(srcdir)/langhooks.c \
   $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \
-  $(srcdir)/tree.c $(srcdir)/varasm.c \
-  $(out_file)
+  $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c  $(out_file)
 
 #
 # Build a list of frontend directories to look into
@@ -271,9 +336,10 @@ GTFILES+=	${GTFILES_FILES}
 #-----------------------------------------------------------------------
 # the host/target compiler config.
 
-COMMONHDRS=	config.h hconfig.h multilib.h options.h specs.h tconfig.h \
-		tm_p.h configargs.h safe-ctype.h
-GENSRCS+=	${COMMONHDRS} gencheck.h gtyp-gen.h
+COMMONHDRS=	bconfig.h config.h configargs.h gencheck.h multilib.h \
+		specs.h safe-ctype.h tconfig.h tm.h tm_p.h gcov-iov.h \
+		gtyp-gen.h
+GENSRCS+=	${COMMONHDRS}
 
 MFILE?=	${.CURDIR}/Makefile
 ${COMMONHDRS}: ${MFILE}
@@ -282,10 +348,31 @@ configargs.h:
 	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
 	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
 	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
+	echo 'static const struct {'				>> ${.TARGET}
+	echo '	const char *name, *value;'			>> ${.TARGET}
+	echo '} configure_default_options[] = {'		>> ${.TARGET}
+	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
 
-hconfig.h:
-	echo '#include "auto-host.h"'			> ${.TARGET}
-	echo '#include <tconfig.h>'			>> ${.TARGET}
+tconfig.h:
+	echo '#ifndef GCC_TCONFIG_H'			> ${.TARGET}
+	echo '#define GCC_TCONFIG_H'			>> ${.TARGET}
+	echo '#ifdef IN_GCC'				>> ${.TARGET}
+	echo '# include "ansidecl.h"'			>> ${.TARGET}
+	echo '#endif'					>> ${.TARGET}
+	echo '#define USED_FOR_TARGET'			>> ${.TARGET}
+	echo '#endif /* GCC_TCONFIG_H */'		>> ${.TARGET}
+
+bconfig.h:
+	echo '#ifndef GCC_BCONFIG_H'			> ${.TARGET}
+	echo '#define GCC_BCONFIG_H'			>> ${.TARGET}
+	echo '#include "auto-host.h"'			>> ${.TARGET}
+.if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
+	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
+.endif
+	echo '#ifdef IN_GCC'				>> ${.TARGET}
+	echo '# include "ansidecl.h"'			>> ${.TARGET}
+	echo '#endif'					>> ${.TARGET}
+	echo '#endif /* GCC_BCONFIG_H */'		>> ${.TARGET}
 
 gencheck.h:
 	echo '#include "cp/cp-tree.def"'		> ${.TARGET}
@@ -301,56 +388,39 @@ multilib.h:
 	echo 'static const char *const multilib_exclusions_raw[] = { \
 	    NULL };'					>> ${.TARGET}
 
-options.h:
-	echo '#include "cp/lang-options.h"'		> ${.TARGET}
-	echo '#include "f/lang-options.h"'		>> ${.TARGET}
-	echo '#include "objc/lang-options.h"'		>> ${.TARGET}
-
 specs.h:
 	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
 	echo '#include "f/lang-specs.h"'		>> ${.TARGET}
 	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
 
-config.h:
-	echo '#include <hconfig.h>'			> ${.TARGET}
-	echo '#ifndef GENERATOR_FILE'			>> ${.TARGET}
-	echo '#include "insn-constants.h"'		>> ${.TARGET}
-	echo '#include "insn-flags.h"'			>> ${.TARGET}
-	echo '#endif'					>> ${.TARGET}
+config.h: bconfig.h
+	echo '#include <bconfig.h>'			> ${.TARGET}
 
-tconfig.h:
-	echo 'struct rtx_def;'				> ${.TARGET}
-	echo 'typedef struct rtx_def *rtx;'		>> ${.TARGET}
-	echo 'struct rtvec_def;'			>> ${.TARGET}
-	echo 'typedef struct rtvec_def *rtvec;'		>> ${.TARGET}
-	echo 'union tree_node;'				>> ${.TARGET}
-	echo 'typedef union tree_node *tree;'		>> ${.TARGET}
-	echo '#ifndef GTY'				>> ${.TARGET}
-	echo '# define GTY(x)'				>> ${.TARGET}
-	echo '#endif'					>> ${.TARGET}
-	echo ''						>> ${.TARGET}
-.if ${TARGET_ARCH} == "amd64"
-	echo '#include "i386/biarch64.h"'		>> ${.TARGET}
-.endif
-.if ${TARGET_ARCH} == "ia64"
-	echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET}
+tm.h:
+	echo '#ifndef GCC_TM_H'				> ${.TARGET}
+	echo '#define GCC_TM_H'				>> ${.TARGET}
+.if defined(TARGET_CPU_DEFAULT)
+	echo "#define TARGET_CPU_DEFAULT (${TARGET_CPU_DEFAULT})" >> ${.TARGET}
 .endif
+	echo '#ifdef IN_GCC'				>> ${.TARGET}
 .for H in ${TARGET_INC}
 	echo '#include "$H"'				>> ${.TARGET}
 .endfor
-	echo '#ifndef POSIX'				>> ${.TARGET}
-	echo '# define POSIX'				>> ${.TARGET}
+	echo '#if !defined GENERATOR_FILE && !defined USED_FOR_TARGET' >> ${.TARGET}
+	echo '# include "insn-constants.h"'		>> ${.TARGET}
+	echo '# include "insn-flags.h"'			>> ${.TARGET}
+	echo '#endif'					>> ${.TARGET}
 	echo '#endif'					>> ${.TARGET}
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
-	echo '#define EXTRA_CC_MODES 1'			>> ${.TARGET}
 .endif
+	echo '#endif /* GCC_TM_H */'			>> ${.TARGET}
 
 tm_p.h:
 	echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"'	>> ${.TARGET}
 	echo '#include "tm-preds.h"'				>> ${.TARGET}
 
-safe-ctype.h: Makefile
+safe-ctype.h:
 	echo '#include <ctype.h>'				> ${.TARGET}
 .for Z in TOUPPER TOLOWER ISDIGIT ISXDIGIT ISUPPER ISLOWER ISALPHA ISALNUM \
     ISSPACE ISPUNCT ISGRAPH ISBLANK ISPRINT ISCNTRL
@@ -391,8 +461,9 @@ gtyp-gen.h:
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
-	echo "#define	xexit exit"				>> ${.TARGET}
 
+gcov-iov.h:
+	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET}
 
 #-----------------------------------------------------------------------
 # General things.
@@ -400,7 +471,8 @@ gtyp-gen.h:
 SRCS+=		${GENSRCS}
 CLEANFILES+=	${GENSRCS}
 
-all: ${SRCS}
+all:		${SRCS}
+build-tools:	${SRCS}
 
 .include <bsd.prog.mk>
 
@@ -415,19 +487,42 @@ CLEANFILES+=	${OBJS}
 
 .if !exists(${DEPENDFILE})
 # Fudge pre-dependfile dependencies of objects in much the same way as
-# bsd.prog.mk would do if we defined PROG.  There are complications to
-# avoid circular dependencies.  First, only make most objects depend on
-# 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}: ${SRCS:M*.h:Ngtype-desc.h:Ngenrtl.h:Ntree-check.h:Ntm-preds.h:Ninsn-*.h}
+# bsd.prog.mk would do if we defined PROG.
 
-${OBJS:Ngencheck.o:Ngengenrtl.o:Ngenpreds.o}: tree-check.h tm-preds.h genrtl.h
+${OBJS}: ${COMMONHDRS}
 
-${OBJS:Ngengtype*.o:Nxmemdup.o:Ngengenrtl.o:Ngencheck.o:Ngenpreds.o}: gtype-desc.h
+dummy-conditions.o:
+gencheck.o:
+genmodes.o:
 
-genextract.o: insn-config.h
+genpreds.o: insn-modes.h
+genconstants.o: insn-modes.h genrtl.h
+gengtype.o: insn-modes.h genrtl.h gtyp-gen.h
+rtl.o: insn-modes.h gtype-desc.h genrtl.h
+bitmap.o: insn-modes.h gtype-desc.h genrtl.h
+ggc-none.o: gtype-desc.h
+gensupport.o: insn-modes.h genrtl.h
+varray.o: gtype-desc.h
+genautomata.o: insn-modes.h genrtl.h
+genconditions.o: insn-modes.h genrtl.h
+gencodes.o: insn-modes.h genrtl.h
+genconfig.o: insn-modes.h genrtl.h
+print-rtl.o: insn-modes.h genrtl.h tm-preds.h tree-check.h
+read-rtl.o: insn-modes.h genrtl.h 
+genattr.o: insn-modes.h genrtl.h
+genemit.o: insn-modes.h genrtl.h
+genflags.o: insn-modes.h genrtl.h
+genopinit.o: insn-modes.h genrtl.h
+genoutput.o: insn-modes.h genrtl.h
+genpeep.o: insn-modes.h genrtl.h
+genrecog.o: insn-modes.h genrtl.h
+genextract.o: genrtl.h insn-config.h
+genattrtab.o: insn-modes.h gtype-desc.h genrtl.h
+genrtl.o: insn-modes.h genrtl.h gtype-desc.h
 
-insn-conditions.o: insn-constants.h
+insn-conditions.o: insn-constants.h tm-preds.h
+insn-modes.o: insn-modes.h
+min-insn-modes.o: insn-modes.h
+gtype-desc.o: insn-modes.h insn-config.h insn-codes.h tree-check.h
 
 .endif
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 86493965b1d6..5470788543ab 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -2,382 +2,387 @@
 
 #ifndef __FreeBSD_version
 #include <sys/param.h>
+#include <sys/endian.h>
 #endif
 
-/* auto-host.h.  Generated automatically by configure.  */
-/* config.in.  Generated automatically from configure.in by autoheader.  */
+/* auto-host.h.  Generated by configure.  */
+/* config.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
+/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
+#define BYTEORDER _BYTE_ORDER
 
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
+/* Define as the number of bits in a byte, if \`limits.h' doesn't. */
+/* #undef CHAR_BIT */
 
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
+/* Define 0/1 to force the choice for exception handling model. */
+/* #undef CONFIG_SJLJ_EXCEPTIONS */
 
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-#define GETGROUPS_T gid_t
+/* Define to enable the use of a default assembler. */
+/* #undef DEFAULT_ASSEMBLER */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
+/* Define to enable the use of a default linker. */
+/* #undef DEFAULT_LINKER */
 
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
+/* Define if you want to use __cxa_atexit, rather than atexit, to register C++
+   destructors for local statics and global objects. This is essential for
+   fully standards-compliant handling of destructors, but requires
+   __cxa_atexit in libc. */
+#define DEFAULT_USE_CXA_ATEXIT 1
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+/* #undef ENABLE_NLS */
 
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#define HAVE_STRINGIZE 1
+#ifdef WANT_COMPILER_INVARIANTS
+/* #warning WANT_COMPILER_INVARIANTS turned on */
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
+/* Define if you want more run-time sanity checks. This one gets a grab bag of
+   miscellaneous but relatively cheap checks. */
+#define ENABLE_CHECKING 1
 
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
+/* Define if you want fold checked that it never destructs its argument. This
+   is quite expensive. */
+#define ENABLE_FOLD_CHECKING 1
 
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
+/* Define if you want the garbage collector to operate in maximally paranoid
+   mode, validating the entire heap and collecting garbage at every
+   opportunity. This is extremely expensive. */
+#define ENABLE_GC_ALWAYS_COLLECT 1
 
-/* Define if your C compiler doesn't accept -c and -o together.  */
-/* #undef NO_MINUS_C_MINUS_O */
+/* Define if you want the garbage collector to do object poisoning and other
+   memory allocation checks. This is quite expensive. */
+#define ENABLE_GC_CHECKING 1
 
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
+/* Define if you want all operations on RTL (the basic data structure of the
+   optimizer and back end) to be checked for dynamic type safety at runtime.
+   This is quite expensive. */
+#define ENABLE_RTL_CHECKING 1
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
+/* Define if you want RTL flag accesses to be checked against the RTL codes
+   that are supported for each access macro. This is relatively cheap. */
+#define ENABLE_RTL_FLAG_CHECKING 1
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+/* Define if you want all operations on trees (the basic data structure of the
+   front ends) to be checked for dynamic type safety at runtime. This is
+   moderately expensive. */
+#define ENABLE_TREE_CHECKING 1
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
+/* Define if you want to run subprograms and generated programs through
+   valgrind (a memory checker). This is extremely expensive. */
+/* #undef ENABLE_VALGRIND_CHECKING */
 
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
+#endif /* WANT_COMPILER_INVARIANTS */
 
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
+/* Define to 1 if installation paths should be looked up in Windows32
+   Registry. Ignored on non windows32 hosts. */
+/* #undef ENABLE_WIN32_REGISTRY */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
+/* Define to enable detailed memory allocation stats gathering. */
+/* #undef GATHER_STATISTICS */
 
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
+/* Define to the type of elements in the array set by `getgroups'. Usually
+   this is either `int' or `gid_t'. */
+#define GETGROUPS_T gid_t
 
-/* Define if your assembler supports specifying the maximum number
-   of bytes to skip when using the GAS .p2align command.  */
-#define HAVE_GAS_MAX_SKIP_P2ALIGN 1
+/* Define to 1 if you have the `alphasort' function. */
+#define HAVE_ALPHASORT 1
 
-/* Define if your assembler supports .balign and .p2align.  */
-#define HAVE_GAS_BALIGN_AND_P2ALIGN 1
+/* Define if your assembler supports dwarf2 .file/.loc directives, and
+   preserves file table indices exactly as given. */
+#define HAVE_AS_DWARF2_DEBUG_LINE 1
 
-/* Define if your assembler uses the old HImode fild and fist notation.  */
-#define HAVE_GAS_FILDS_FISTS 1
+/* Define if your assembler supports explicit relocations. */
+/* #undef HAVE_AS_EXPLICIT_RELOCS */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef ssize_t */
+/* Define if your assembler supports the --gdwarf2 option. */
+#define HAVE_AS_GDWARF2_DEBUG_FLAG 1
 
-/* Define if cpp should also search $prefix/include.  */
-/* #undef PREFIX_INCLUDE_DIR */
+/* Define true if the assembler supports '.long foo@GOTOFF'. */
+#define HAVE_AS_GOTOFF_IN_DATA 1
 
-/* Define if you have the __argz_count function.  */
-/* #undef HAVE___ARGZ_COUNT */
+/* Define if your assembler supports the --gstabs option. */
+#define HAVE_AS_GSTABS_DEBUG_FLAG 1
 
-/* Define if you have the __argz_next function.  */
-/* #undef HAVE___ARGZ_NEXT */
+/* Define if your assembler supports the Sun syntax for cmov. */
+/* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */
 
-/* Define if you have the __argz_stringify function.  */
-/* #undef HAVE___ARGZ_STRINGIFY */
+/* Define if your assembler supports .sleb128 and .uleb128. */
+#define HAVE_AS_LEB128 1
 
-/* Define if you have the alphasort function.  */
-#define HAVE_ALPHASORT 1
+/* Define if your assembler supports ltoffx and ldxmov relocations. */
+/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
 
-/* Define if you have the atoll function.  */
-#if __FreeBSD_version >= 500027
-/* FreeBSD didn't always have atoll(3). */
-#define HAVE_ATOLL 1
-#endif
+/* Define if your assembler supports mfcr field. */
+/* #undef HAVE_AS_MFCRF */
 
-/* Define if you have the atoq function.  */
-/* #undef HAVE_ATOQ */
+/* Define if your assembler supports the -no-mul-bug-abort option. */
+/* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */
 
-/* Define if you have the clock function.  */
-#define HAVE_CLOCK 1
+/* Define if your assembler supports offsetable %lo(). */
+/* #undef HAVE_AS_OFFSETABLE_LO10 */
 
-/* Define if you have the dcgettext function.  */
-/* #undef HAVE_DCGETTEXT */
+/* Define if your assembler supports .register. */
+/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
 
-/* Define if you have the dup2 function.  */
-#define HAVE_DUP2 1
+/* Define if your assembler supports -relax option. */
+/* #undef HAVE_AS_RELAX_OPTION */
 
-/* Define if you have the feof_unlocked function.  */
-#define HAVE_FEOF_UNLOCKED 1
+/* Define if your assembler and linker support unaligned PC relative relocs.
+   */
+/* #undef HAVE_AS_SPARC_UA_PCREL */
 
-/* Define if you have the fgets_unlocked function.  */
-/* #undef HAVE_FGETS_UNLOCKED */
+/* Define if your assembler and linker support unaligned PC relative relocs
+   against hidden symbols. */
+/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
 
-/* Define if you have the fprintf_unlocked function.  */
-/* #undef HAVE_FPRINTF_UNLOCKED */
+/* Define if your assembler supports thread-local storage. */
+#define HAVE_AS_TLS 1
 
-/* Define if you have the fputc_unlocked function.  */
-/* #undef HAVE_FPUTC_UNLOCKED */
+/* Define to 1 if you have the `atoll' function. */
+#if __FreeBSD_version >= 500027
+#define HAVE_ATOLL 1
+#endif
 
-/* Define if you have the fputs_unlocked function.  */
-/* #undef HAVE_FPUTS_UNLOCKED */
+/* Define to 1 if you have the `atoq' function. */
+/* #undef HAVE_ATOQ */
 
-/* Define if you have the fwrite_unlocked function.  */
-/* #undef HAVE_FWRITE_UNLOCKED */
+/* Define to 1 if you have the `clock' function. */
+#define HAVE_CLOCK 1
 
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
+/* Define if <time.h> defines clock_t. */
+#define HAVE_CLOCK_T 1
 
-/* Define if you have the getegid function.  */
-#define HAVE_GETEGID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ABORT 1
 
-/* Define if you have the geteuid function.  */
-#define HAVE_GETEUID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ATOF 1
 
-/* Define if you have the getgid function.  */
-#define HAVE_GETGID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ATOL 1
 
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_BASENAME 0
 
-/* Define if you have the getrlimit function.  */
-#define HAVE_GETRLIMIT 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_CALLOC 1
 
-/* Define if you have the getrusage function.  */
-#define HAVE_GETRUSAGE 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_CLOCK 1
 
-/* Define if you have the getuid function.  */
-#define HAVE_GETUID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ERRNO 1
 
-/* Define if you have the kill function.  */
-#define HAVE_KILL 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FPRINTF_UNLOCKED 0
 
-/* Define if you have the lstat function.  */
-#define HAVE_LSTAT 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FPUTS_UNLOCKED 0
 
-/* Define if you have the mempcpy function.  */
-/* #undef HAVE_MEMPCPY */
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FREE 1
 
-/* Define if you have the munmap function.  */
-#define HAVE_MUNMAP 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FWRITE_UNLOCKED 0
 
-/* Define if you have the nl_langinfo function.  */
-#define HAVE_NL_LANGINFO 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETCWD 1
 
-/* Define if you have the putc_unlocked function.  */
-#define HAVE_PUTC_UNLOCKED 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETENV 1
 
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETOPT 1
 
-/* Define if you have the scandir function.  */
-#define HAVE_SCANDIR 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETRLIMIT 1
 
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETRUSAGE 1
 
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETWD 1
 
-/* Define if you have the setrlimit function.  */
-#define HAVE_SETRLIMIT 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_LDGETNAME 0
 
-/* Define if you have the stpcpy function.  */
-#define HAVE_STPCPY 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_MALLOC 1
 
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_PUTC_UNLOCKED 1
 
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_REALLOC 1
 
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_SBRK 1
 
-/* Define if you have the strsignal function.  */
-#define HAVE_STRSIGNAL 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_SETRLIMIT 1
 
-/* Define if you have the strtoul function.  */
-#define HAVE_STRTOUL 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_SNPRINTF 1
 
-/* Define if you have the sysconf function.  */
-#define HAVE_SYSCONF 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_STRSIGNAL 1
 
-/* Define if you have the times function.  */
-#define HAVE_TIMES 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_STRSTR 1
 
-/* Define if you have the tsearch function.  */
-#define HAVE_TSEARCH 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_TIMES 1
 
-/* Define if you have the <argz.h> header file.  */
-/* #undef HAVE_ARGZ_H */
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_VASPRINTF 1
 
-/* Define if you have the <direct.h> header file.  */
+/* Define to 1 if you have the <direct.h> header file. */
 /* #undef HAVE_DIRECT_H */
 
-/* Define if you have the <fcntl.h> header file.  */
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have the <langinfo.h> header file.  */
-#define HAVE_LANGINFO_H 1
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
 
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
+/* Define to 1 if you have the `fprintf_unlocked' function. */
+/* #undef HAVE_FPRINTF_UNLOCKED */
 
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
+/* Define to 1 if you have the `fputc_unlocked' function. */
+/* #undef HAVE_FPUTC_UNLOCKED */
 
-/* Define if you have the <malloc.h> header file.  */
-/* #undef HAVE_MALLOC_H */
+/* Define to 1 if you have the `fputs_unlocked' function. */
+/* #undef HAVE_FPUTS_UNLOCKED */
 
-/* Define if you have the <nl_types.h> header file.  */
-#define HAVE_NL_TYPES_H 1
+/* Define to 1 if you have the `fwrite_unlocked' function. */
+/* #undef HAVE_FWRITE_UNLOCKED */
 
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
+/* Define if your assembler supports .balign and .p2align. */
+#define HAVE_GAS_BALIGN_AND_P2ALIGN 1
 
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
+/* Define if your assembler uses the new HImode fild and fist notation. */
+#define HAVE_GAS_FILDS_FISTS 1
 
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
+/* Define if your assembler and linker support .hidden. */
+#define HAVE_GAS_HIDDEN 1
 
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
+/* Define if your assembler supports specifying the maximum number of bytes to
+   skip when using the GAS .p2align command. */
+#define HAVE_GAS_MAX_SKIP_P2ALIGN 1
 
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
+/* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.
+   */
+#define HAVE_GAS_SHF_MERGE 1
 
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
+/* Define if your assembler supports .subsection and .subsection -1 starts
+   emitting at the beginning of your section. */
+#define HAVE_GAS_SUBSECTION_ORDERING 1
 
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
+/* Define if your assembler supports .weak. */
+#define HAVE_GAS_WEAK 1
 
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
+/* Define to 1 if you have the `getrlimit' function. */
+#define HAVE_GETRLIMIT 1
 
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
+/* Define to 1 if you have the `getrusage' function. */
+#define HAVE_GETRUSAGE 1
 
-/* Define if you have the <sys/times.h> header file.  */
-#define HAVE_SYS_TIMES_H 1
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
 
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
+/* Define if you have the iconv() function. */
+/* #undef HAVE_ICONV */
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the <iconv.h> header file. */
+/* #undef HAVE_ICONV_H */
 
-/* Define to enable the use of a default linker. */
-/* #undef DEFAULT_LINKER */
+/* Define .init_array/.fini_array sections are available and working. */
+/* #undef HAVE_INITFINI_ARRAY */
 
-/* Define to enable the use of a default assembler. */
-/* #undef DEFAULT_ASSEMBLER */
+/* Define if you have a working <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
 
-/* Define if your compiler understands volatile. */
-#define HAVE_VOLATILE 1
+/* Define to 1 if you have the `kill' function. */
+#define HAVE_KILL 1
 
-/* Define if your compiler supports the `long double' type. */
-#define HAVE_LONG_DOUBLE 1
+/* Define to 1 if you have the <langinfo.h> header file. */
+#define HAVE_LANGINFO_H 1
 
-/* Define if your compiler supports the `long long' type. */
-#define HAVE_LONG_LONG 1
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#define HAVE_LC_MESSAGES 1
 
-/* Define if your compiler supports the `__int64' type. */
-/* #undef HAVE___INT64 */
+/* Define to 1 if you have the <ldfcn.h> header file. */
+/* #undef HAVE_LDFCN_H */
 
-/* Define if the `_Bool' type is built-in. */
-#define HAVE__BOOL 1
+/* Define if your linker supports --as-needed and --no-as-needed options. */
+/* #undef HAVE_LD_AS_NEEDED */
 
-/* The number of bytes in type short */
-#define SIZEOF_SHORT 2
+/* Define if your linker supports --eh-frame-hdr option. */
+#define HAVE_LD_EH_FRAME_HDR 1
 
-/* The number of bytes in type int */
-#define SIZEOF_INT 4
+/* Define if your linker supports -pie option. */
+/* #undef HAVE_LD_PIE */
 
-/* The number of bytes in type long */
-/* #define SIZEOF_LONG 4 */
-#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
-#define SIZEOF_LONG SIZEOF_INT
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
-#define SIZEOF_LONG SIZEOF_LONG_LONG
-#else
-#error "I don't know what arch this is."
-#endif
+/* Define if your linker links a mix of read-only and read-write sections into
+   a read-write section. */
+#define HAVE_LD_RO_RW_SECTION_MIXING 1
 
-/* The number of bytes in type long long */
-#define SIZEOF_LONG_LONG 8
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
 
-/* The number of bytes in type __int64 */
-/* #undef SIZEOF___INT64 */
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
 
-/* Define if the host execution character set is EBCDIC. */
-/* #undef HOST_EBCDIC */
+/* Define if your compiler supports the \`long long' type. */
+#define HAVE_LONG_LONG 1
 
-#ifdef WANT_COMPILER_INVARIANTS
-//#warning WANT_COMPILER_INVARIANTS turned on
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
 
-/* Define if you want more run-time sanity checks.  This one gets a grab
-   bag of miscellaneous but relatively cheap checks. */
-#define ENABLE_CHECKING 1
+/* Define to 1 if you have the `mbstowcs' function. */
+#define HAVE_MBSTOWCS 1
 
-/* Define if you want all operations on trees (the basic data
-   structure of the front ends) to be checked for dynamic type safety
-   at runtime.  This is moderately expensive. */
-#define ENABLE_TREE_CHECKING 1
+/* Define if valgrind's memcheck.h header is installed. */
+/* #undef HAVE_MEMCHECK_H */
 
-/* Define if you want all operations on RTL (the basic data structure
-   of the optimizer and back end) to be checked for dynamic type safety
-   at runtime.  This is quite expensive. */
-#define ENABLE_RTL_CHECKING 1
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
 
-/* Define if you want RTL flag accesses to be checked against the RTL
-   codes that are supported for each access macro.  This is relatively
-   cheap. */
-#define ENABLE_RTL_FLAG_CHECKING 1
+/* Define to 1 if you have the `mincore' function. */
+#define HAVE_MINCORE 1
 
-/* Define if you want the garbage collector to do object poisoning and
-   other memory allocation checks.  This is quite expensive. */
-#define ENABLE_GC_CHECKING 1
+/* Define to 1 if you have the `mmap' function. */
+#define HAVE_MMAP 1
 
-/* Define if you want the garbage collector to operate in maximally
-   paranoid mode, validating the entire heap and collecting garbage at
-   every opportunity.  This is extremely expensive. */
-#define ENABLE_GC_ALWAYS_COLLECT 1
+/* Define if mmap with MAP_ANON(YMOUS) works. */
+#define HAVE_MMAP_ANON 1
 
-/* Define if you want to run subprograms and generated programs
-   through valgrind (a memory checker).  This is extremely expensive. */
-/* #undef ENABLE_VALGRIND_CHECKING */
+/* Define if mmap of /dev/zero works. */
+#define HAVE_MMAP_DEV_ZERO 1
 
-#endif	/* WANT_COMPILER_INVARIANTS */
+/* Define if read-only mmap of a plain file works. */
+#define HAVE_MMAP_FILE 1
 
-/* Define if you want to use __cxa_atexit, rather than atexit, to
-   register C++ destructors for local statics and global objects.
-   This is essential for fully standards-compliant handling of
-   destructors, but requires __cxa_atexit in libc. */
-#define DEFAULT_USE_CXA_ATEXIT 1
+/* Define to 1 if you have the `nl_langinfo' function. */
+#define HAVE_NL_LANGINFO 1
 
-/* Define if you want the C and C++ compilers to support multibyte
-   character sets for source code. */
-/* #undef MULTIBYTE_CHARS */
+/* Define if printf supports "%p". */
+#define HAVE_PRINTF_PTR 1
 
-/* Always define this when using the GNU C Library */
-/* #undef _GNU_SOURCE */
+/* Define to 1 if you have the `putc_unlocked' function. */
+#define HAVE_PUTC_UNLOCKED 1
+
+/* Define to 1 if you have the `scandir' function. */
+#define HAVE_SCANDIR 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
 
 /* Define if you have a working <stdbool.h> header file. */
 #if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \
@@ -385,255 +390,202 @@
 #define HAVE_STDBOOL_H 1
 #endif
 
-/* Define if you can safely include both <string.h> and <strings.h>. */
-#define STRING_WITH_STRINGS 1
-
-/* Define as the number of bits in a byte, if `limits.h' doesn't. */
-/* #undef CHAR_BIT */
-
-/* Define if the host machine stores words of multi-word integers in
-   big-endian order. */
-/* #undef HOST_WORDS_BIG_ENDIAN */
-
-/* Define to the floating point format of the host machine, if not IEEE. */
-/* #undef HOST_FLOAT_FORMAT */
-
-/* Define to 1 if the host machine stores floating point numbers in
-   memory with the word containing the sign bit at the lowest address,
-   or to 0 if it does it the other way around.
-
-   This macro should not be defined if the ordering is the same as for
-   multi-word integers. */
-/* #undef HOST_FLOAT_WORDS_BIG_ENDIAN */
-
-/* Define if you have a working <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define if printf supports %p. */
-#define HAVE_PRINTF_PTR 1
-
-/* Define if mmap can get us zeroed pages from /dev/zero. */
-#define HAVE_MMAP_DEV_ZERO 1
-
-/* Define if mmap can get us zeroed pages using MAP_ANON(YMOUS). */
-#define HAVE_MMAP_ANON 1
-
-/* Define if read-only mmap of a plain file works. */
-#define HAVE_MMAP_FILE 1
-
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
 
-/* Define as const if the declaration of iconv() needs const. */
-/* #undef ICONV_CONST */
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETENV 1
-
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ATOL 1
-
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_SBRK 1
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ABORT 1
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ATOF 1
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETCWD 1
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETWD 1
+/* Define if <sys/times.h> defines struct tms. */
+#define HAVE_STRUCT_TMS 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_STRSIGNAL 1
+/* Define to 1 if you have the `sysconf' function. */
+#define HAVE_SYSCONF 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_PUTC_UNLOCKED 1
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FPUTS_UNLOCKED 0
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FWRITE_UNLOCKED 0
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FPRINTF_UNLOCKED 0
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_STRSTR 1
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ERRNO 1
+/* Define to 1 if you have the <sys/times.h> header file. */
+#define HAVE_SYS_TIMES_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_VASPRINTF 1
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_MALLOC 1
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_REALLOC 1
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_CALLOC 1
+/* Define to 1 if you have the `times' function. */
+#define HAVE_TIMES 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FREE 1
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_BASENAME 1
+/* Define if <sys/types.h> defines \`uchar'. */
+/* #undef HAVE_UCHAR */
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETOPT 1
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_CLOCK 1
+/* Define if valgrind's valgrind/memcheck.h header is installed. */
+/* #undef HAVE_VALGRIND_MEMCHECK_H */
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETRLIMIT 1
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_SETRLIMIT 1
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETRUSAGE 1
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
 
-/* Define to `long' if <sys/resource.h> doesn't define. */
-/* #undef rlim_t */
+/* Define to 1 if you have the `wcswidth' function. */
+#define HAVE_WCSWIDTH 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_TIMES 1
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
 
-/* Define if <sys/times.h> defines struct tms. */
-#define HAVE_STRUCT_TMS 1
+/* Define this macro if mbstowcs does not crash when its first argument is
+   NULL. */
+#define HAVE_WORKING_MBSTOWCS 1
 
-/* Define if <time.h> defines clock_t. */
-#define HAVE_CLOCK_T 1
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
 
-/* Define .init_array/.fini_array sections are available and working. */
-/* #undef HAVE_INITFINI_ARRAY */
+/* Define if the \`_Bool' type is built-in. */
+#define HAVE__BOOL 1
 
-/* Define if host mkdir takes a single argument. */
-/* #undef MKDIR_TAKES_ONE_ARG */
+/* Define if your compiler supports the \`__int64' type. */
+/* #undef HAVE___INT64 */
 
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+/* Define if the host machine stores words of multi-word integers in
+   big-endian order. */
+#if _QUAD_HIGHWORD == 0
+#define HOST_WORDS_BIG_ENDIAN 1 
+#endif
 
 /* Define as const if the declaration of iconv() needs const. */
 /* #undef ICONV_CONST */
 
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-/* #undef ENABLE_NLS */
-
-/* Define if you have the <libintl.h> header file. */
-/* #undef HAVE_LIBINTL_H */
+/* Define if host mkdir takes a single argument. */
+/* #undef MKDIR_TAKES_ONE_ARG */
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
+/* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
+#define NEED_64BIT_HOST_WIDE_INT 1
 
-/* Define to use the libintl included with this package instead of any
-   version in the system libraries. */
-/* #undef USE_INCLUDED_LIBINTL */
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
 
-/* Define to 1 if installation paths should be looked up in Windows32
-   Registry. Ignored on non windows32 hosts. */
-/* #undef ENABLE_WIN32_REGISTRY */
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
 
-/* Define to be the last portion of registry key on windows hosts. */
-/* #undef WIN32_REGISTRY_KEY */
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
 
-/* Define if your assembler supports .subsection and .subsection -1 starts
-   emitting at the beginning of your section. */
-#define HAVE_GAS_SUBSECTION_ORDERING 1
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
 
-/* Define if your assembler supports .weak. */
-#define HAVE_GAS_WEAK 1
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
 
-/* Define if your assembler supports .hidden. */
-#define HAVE_GAS_HIDDEN 1
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
 
-/* Define if your assembler supports .uleb128. */
-#define HAVE_AS_LEB128 1
-
-/* Define if your assembler mis-optimizes .eh_frame data. */
-/* #undef USE_AS_TRADITIONAL_FORMAT */
+/* Define to PREFIX/include if cpp should also search that directory. */
+/* #undef PREFIX_INCLUDE_DIR */
 
-/* Define if your assembler supports marking sections with SHF_MERGE flag. */
-#define HAVE_GAS_SHF_MERGE 1
+/* The number of bytes in type int */
+#define SIZEOF_INT 4
 
-/* Define if your assembler supports thread-local storage. */
-#define HAVE_AS_TLS 1
+#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
+/* The number of bytes in type long */
+# define SIZEOF_LONG SIZEOF_INT
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
+# define SIZEOF_LONG SIZEOF_LONG_LONG
+#else
+# error "I don't know what arch this is."
+#endif
 
-/* Define if your assembler supports explicit relocations. */
-/* #undef HAVE_AS_EXPLICIT_RELOCS */
+/* The number of bytes in type long long */
+#define SIZEOF_LONG_LONG 8
 
-/* Define if your assembler supports .register. */
-/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
+/* The number of bytes in type short */
+#define SIZEOF_SHORT 2
 
-/* Define if your assembler supports -relax option. */
-/* #undef HAVE_AS_RELAX_OPTION */
+/* The number of bytes in type void * */
+#define SIZEOF_VOID_P SIZEOF_LONG
 
-/* Define if your assembler and linker support unaligned PC relative relocs. */
-/* #undef HAVE_AS_SPARC_UA_PCREL */
+/* The number of bytes in type __int64 */
+/* #undef SIZEOF___INT64 */
 
-/* Define if your assembler and linker support unaligned PC relative relocs against hidden symbols. */
-/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
 
-/* Define if your assembler supports offsetable %lo(). */
-/* #undef HAVE_AS_OFFSETABLE_LO10 */
+/* Define if you can safely include both <string.h> and <strings.h>. */
+#define STRING_WITH_STRINGS 1
 
-/* Define true if the assembler supports '.long foo@GOTOFF'. */
-#define HAVE_AS_GOTOFF_IN_DATA 1
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
 
-/* Define if your assembler supports ltoffx and ldxmov relocations. */
-/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
+/* Define if your assembler mis-optimizes .eh_frame data. */
+/* #undef USE_AS_TRADITIONAL_FORMAT */
 
-/* Define if your assembler supports dwarf2 .file/.loc directives,
-   and preserves file table indices exactly as given. */
-#define HAVE_AS_DWARF2_DEBUG_LINE 1
+/* Define if gcc should use -lunwind. */
+/* #undef USE_LIBUNWIND_EXCEPTIONS */
 
-/* Define if your assembler supports the --gdwarf2 option. */
-#define HAVE_AS_GDWARF2_DEBUG_FLAG 1
+/* Define to be the last portion of registry key on windows hosts. */
+/* #undef WIN32_REGISTRY_KEY */
 
-/* Define if your assembler supports the --gstabs option. */
-#define HAVE_AS_GSTABS_DEBUG_FLAG 1
+/* whether byteorder is bigendian */
+/* #undef WORDS_BIGENDIAN */
 
-/* Define if your linker links a mix of read-only
-   and read-write sections into a read-write section. */
-#define HAVE_LD_RO_RW_SECTION_MIXING 1
+/* Always define this when using the GNU C Library */
+/* #undef _GNU_SOURCE */
 
-/* Define if your linker supports --eh-frame-hdr option. */
-#define HAVE_LD_EH_FRAME_HDR 1
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
 
-/* Define if your MIPS libgloss linker scripts consistently include STARTUP directives. */
-/* #undef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES */
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
 
-/* Define 0/1 to force the choice for exception handling model. */
-/* #undef CONFIG_SJLJ_EXCEPTIONS */
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
 
-/* Define if gcc should use -lunwind. */
-/* #undef USE_LIBUNWIND_EXCEPTIONS */
+/* Define to \`long' if <sys/resource.h> doesn't define. */
+/* #undef rlim_t */
 
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
 
-/* Bison unconditionally undefines `const' if neither `__STDC__' nor
-   __cplusplus are defined.  That's a problem since we use `const' in
-   the GCC headers, and the resulting bison code is therefore type
-   unsafe.  Thus, we must match the bison behavior here.  */
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
 
-#ifndef __STDC__
-#ifndef __cplusplus
-/* #undef const */
-#define const
-#endif
-#endif
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index 266a70cec874..2997e25ed5c6 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -14,8 +14,8 @@
 #undef LOCAL_INCLUDE_DIR		/* We don't wish to support one. */
 
 /* Look for the include files in the system-defined places.  */
-#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/3.3"
-#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.3/backward"
+#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/3.4"
+#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.4/backward"
 #define GCC_INCLUDE_DIR			PREFIX"/include"
 #ifdef CROSS_COMPILE
 #define CROSS_INCLUDE_DIR		PREFIX"/include"
@@ -31,20 +31,19 @@
    programs: /usr/libexec/<OBJFORMAT>/:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
    libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX
 */
-#undef	TOOLDIR_BASE_PREFIX		/* Old??  This is not documented. */
 #undef	STANDARD_BINDIR_PREFIX		/* We don't need one for now. */
 #define	STANDARD_EXEC_PREFIX		PREFIX"/libexec/"
+#define	STANDARD_LIBEXEC_PREFIX		PREFIX"/libexec/"
+#define TOOLDIR_BASE_PREFIX		PREFIX
 #undef	MD_EXEC_PREFIX			/* We don't want one. */
 #define	FBSD_DATA_PREFIX		PREFIX"/libdata/gcc/"
 
 /* Under FreeBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */
 
-#define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
-#ifdef CROSS_COMPILE
-#define CROSS_STARTFILE_PREFIX		PREFIX"/lib/"
-#endif
 #undef  MD_STARTFILE_PREFIX		/* We don't need one for now. */
+#define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
+#define STARTFILE_PREFIX_SPEC		PREFIX"/lib/"
 
 /* For the native system compiler, we actually build libgcc in a profiled
    version.  So we should use it with -pg.  */
@@ -57,14 +56,6 @@
 /* FreeBSD is 4.4BSD derived */
 #define bsd4_4
 
-/* Dike out [stupid, IMHO] libiberty functions.  */
-#define	xmalloc_set_program_name(dummy)
-#define	xmalloc		malloc
-#define	xcalloc		calloc
-#define	xrealloc	realloc
-#define	xstrdup		strdup
-#define	xstrerror	strerror
-
 /* And now they want to replace ctype.h.... grr... [stupid, IMHO] */
 #define xxxISDIGIT	isdigit
 #define xxxISGRAPH	isgraph
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 4132e23a4fcb..7ddcee5295c5 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -2,13 +2,10 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}			${GCCDIR}/../libiberty
+.PATH: ${GCCDIR}
 
 PROG=	collect2
-SRCS=	collect2.c cp-demangle.c cplus-dem.c tlink.c
+SRCS=	collect2.c tlink.c version.c
 NOMAN=
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index 74cdf82517e5..af2054117102 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -23,7 +23,7 @@ gccint.info: gccint.texi include/gcc-common.texi contribute.texi \
     passes.texi c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi \
     fragments.texi configfiles.texi collect2.texi headerdirs.texi \
     include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
-    contrib.texi languages.texi sourcebuild.texi gty.texi
+    contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi
 
 cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi
 
diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile
index 436bf5962d6c..5f2d86fd419d 100644
--- a/gnu/usr.bin/cc/f771/Makefile
+++ b/gnu/usr.bin/cc/f771/Makefile
@@ -14,22 +14,16 @@ NOMAN=
 
 CFLAGS+= -I${GCCDIR}/f -I.
 
-DPADD=	${LIBCC_INT} 
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
-build-tools: fini
-fini: fini.o
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-CLEANFILES=	fini fini.o
-
 #-----------------------------------------------------------------------
 # str-* gunk
 
 .for i in 1t 2t fo io nq op ot
 .ORDER: str-$i.h str-$i.j
-str-$i.j str-$i.h: str-$i.fin fini
-	./fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h
+str-$i.j str-$i.h: str-$i.fin
+	${.OBJDIR}/../cc_tools/fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h
 
 FINIHDRS+=	str-$i.j str-$i.h
 .endfor
diff --git a/gnu/usr.bin/cc/gcov/Makefile b/gnu/usr.bin/cc/gcov/Makefile
index d4be20d1203e..adb2ac1cfbc2 100644
--- a/gnu/usr.bin/cc/gcov/Makefile
+++ b/gnu/usr.bin/cc/gcov/Makefile
@@ -2,7 +2,7 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR} ${GCCDIR}/doc		${GCCDIR}/../libiberty
+.PATH: ${GCCDIR} ${GCCDIR}/doc
 
 PROG=	gcov
 SRCS=	gcov.c version.c
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index 2157960bf92c..b0b4b302b02f 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -8,6 +8,10 @@
 INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h
+.elif ${TARGET_ARCH} == "arm"
+INCS=	mmintrin.h
+.elif ${TARGET_ARCH} == "powerpc"
+INCS=	ppc-asm.h altivec.h spe.h
 .endif
 
 NOOBJ=