Update bmake glue to build GCC 4.2.

Also:
        Switch FreeBSD to use libgcc_s.so.1.

        Use dl_iterate_phdr to locate shared objects' exception frame
        info instead of depending on older register_frame_info machinery.
        This allows us to avoid depending on libgcc_s.so.1 in binaries
        that do not use exception handling directly. As an additional
        benefit it breaks circular libc <=> libgcc_s.so.1 dependency too.

        Build newly added libgomp.so.1 library, the runtime support
        bits for OpenMP.

        Build LGPLed libssp library. Our libc provides our own
        BSD-licensed SSP callbacks implementation, so this library
        is only built to benefit applications that have hadcoded
        knowledge of libssp.so and libssp_nonshared.a. When linked
        in from command line, these libraries override libc
        implementation.

30 files changed, 2672 insertions, 827 deletions

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 7dfd3c3..d08b723 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -5,7 +5,7 @@
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_tools cc_int cc cc1 include protoize doc
+SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include doc
 
 .if ${MK_CPP} != "no"
 SUBDIR+= cpp
@@ -13,19 +13,12 @@ SUBDIR+= cpp
 
 .if ${MK_CXX} != "no"
 SUBDIR+= cc1plus c++ c++filt
-#.if ${MK_COLLECT2} != "no"
-#SUBDIR+= collect2
-#.endif
 .endif
 
 .if ${MK_OBJC} != "no"
 SUBDIR+= cc1obj
 .endif
 
-.if ${MK_FORTRAN} != "no"
-SUBDIR+= f77 f771 f77doc
-.endif
-
 .if ${MK_GCOV} != "no"
 SUBDIR+= gcov
 .endif
diff --git a/gnu/usr.bin/cc/Makefile.fe b/gnu/usr.bin/cc/Makefile.fe
index bfa8cb2..d9c5fe5 100644
--- a/gnu/usr.bin/cc/Makefile.fe
+++ b/gnu/usr.bin/cc/Makefile.fe
@@ -2,14 +2,26 @@
 
 #	Front-end-only bits
 
-GCC_VERSION!=	sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'
+.include "Makefile.ver"
 
 #
 # 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=\"$(GCC_VERSION)\" \
-	-DDEFAULT_TARGET_MACHINE=\"$(GCC_TARGET)\" \
+DRIVER_DEFINES = -DGCC_DRIVER \
+	-DDEFAULT_TARGET_VERSION=\"$(BASEVER)\" \
+	-DDEFAULT_TARGET_MACHINE=\"$(GCC_TARGET)\"  \
+	-DENABLE_SHARED_LIBGCC
 
 CFLAGS+= ${DRIVER_DEFINES}
+
+.PATH: ../cc_tools ${GCCDIR} ${GCCDIR}/doc ${GCCDIR}/config/${GCC_CPU}
+
+SRCS=	gcc.c opts-common.c options.c intl.c prefix.c version.c
+
+.if exists(${GCCDIR}/config/${GCC_CPU}/driver-${GCC_CPU}.c)
+SRCS+=  driver-${GCC_CPU}.c
+.endif
+
+DPADD=	${LIBCPP} ${LIBIBERTY}
+LDADD=	${LIBCPP} ${LIBIBERTY}
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 27ebd21..2281f74 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -7,15 +7,12 @@
 __CC_MAKEFILE_INC__= ${MFILE}
 
 GCCDIR=	${.CURDIR}/../../../../contrib/gcc
+GCCLIB=	${.CURDIR}/../../../../contrib/gcclibs
 
 .include "Makefile.tgt"
 
 # Machine description.
-.if ${TARGET_ARCH} == "arm"
-MD_FILE=	../cc_tools/arm-diked.md
-.else
 MD_FILE=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md
-.endif
 GCC_TARGET=	${TARGET_ARCH}-undermydesk-freebsd
 
 CFLAGS+=	-DIN_GCC -DHAVE_CONFIG_H
@@ -44,10 +41,32 @@ CFLAGS+=	-I${.CURDIR}/../cc_tools
 # correctly.
 CFLAGS+=	-I${GCCDIR} -I${GCCDIR}/config
 
+CFLAGS+=	-I${GCCLIB}/include
+CFLAGS+=	-I${GCCLIB}/libcpp/include
+CFLAGS+=	-I${GCCLIB}/libdecnumber
+
 .if exists(${.OBJDIR}/../cc_int)
-LIBCC_INT=	${.OBJDIR}/../cc_int/libcc_int.a
+LIBBACKEND=	${.OBJDIR}/../cc_int/libbackend.a
+.else
+LIBBACKEND=	${.CURDIR}/../cc_int/libbackend.a
+.endif
+
+.if exists(${.OBJDIR}/../libiberty)
+LIBIBERTY=	${.OBJDIR}/../libiberty/libiberty.a
+.else
+LIBIBERTY=	${.CURDIR}/../libiberty/libiberty.a
+.endif
+
+.if exists(${.OBJDIR}/../libcpp)
+LIBCPP=		${.OBJDIR}/../libcpp/libcpp.a
+.else
+LIBCPP=		${.CURDIR}/../libcpp/libcpp.a
+.endif
+
+.if exists(${.OBJDIR}/../libdecnumber)
+LIBDECNUMBER=	${.OBJDIR}/../libdecnumber/libdecnumber.a
 .else
-LIBCC_INT=	${.CURDIR}/../cc_int/libcc_int.a
+LIBDECNUMBER=	${.CURDIR}/../libdecnumber/libdecnumber.a
 .endif
 
 .endif # !__CC_MAKEFILE_INC__
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 6600491..d044a47 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -2,14 +2,8 @@
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 
-.if ${TARGET_ARCH} == "alpha"
-GCC_CPU=	alpha
-.elif ${TARGET_ARCH} == "arm"
+.if ${TARGET_ARCH} == "arm"
 GCC_CPU=	arm
-# TARGET_CPU_DEFAULT= TARGET_CPU_xscale
-.if defined(TARGET_BIG_ENDIAN)
-CFLAGS+=	-DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
-.endif
 .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
 .elif ${TARGET_ARCH} == "ia64"
diff --git a/gnu/usr.bin/cc/Makefile.ver b/gnu/usr.bin/cc/Makefile.ver
new file mode 100644
index 0000000..c3b8c4a
--- /dev/null
+++ b/gnu/usr.bin/cc/Makefile.ver
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+BASEVER!=	cat ${GCCDIR}/BASE-VER
+DATESTAMP!=	cat ${GCCDIR}/DATESTAMP
+DEVPHASE!=	cat ${GCCDIR}/DEV-PHASE
+
+version.o:	version.c
+	${CC} ${CFLAGS} -DBASEVER=\"${BASEVER}\" \
+		-DDATESTAMP=\"\ ${DATESTAMP}\" \
+		-DDEVPHASE=\"\ ${DEVPHASE}\" -c ${.IMPSRC}
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index bf7aad0..d661d0d 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -3,15 +3,15 @@
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-.PATH: ${GCCDIR}/cp ${GCCDIR}
+.PATH: ${GCCDIR}/cp
 
 PROG=	c++
-SRCS=	gcc.c g++spec.c
+SRCS+=	g++spec.c
 LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NO_MAN=
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
+DPADD=	${LIBCPP} ${LIBIBERTY}
+LDADD=	${LIBCPP} ${LIBIBERTY}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index 4112772..03ad7c2 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -3,7 +3,7 @@
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-.PATH: ${GCCDIR}
+.PATH: ${GCCLIB}/libiberty
 
 PROG=	c++filt
 SRCS=	cp-demangle.c
@@ -11,7 +11,7 @@ NO_MAN=
 
 CFLAGS+= -DSTANDALONE_DEMANGLER -DVERSION=\"$(GCC_VERSION)\"
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
+DPADD=	${LIBIBERTY}
+LDADD=	${LIBIBERTY}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 446b6eb..03ac2d19 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -3,17 +3,13 @@
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-.PATH: ${GCCDIR} ${GCCDIR}/doc
-
 PROG=	cc
 MAN=	gcc.1
-SRCS=	gcc.c gccspec.c
+SRCS+=  gccspec.c
+
 NO_SHARED?=yes
 
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index b05ad1e..c65acd2 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -3,31 +3,24 @@
 .include "../Makefile.inc"
 
 .PATH: ${GCCDIR}
- 
+
 PROG=	cc1
-SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
+SRCS=	main.c c-parser.c c-lang.c
 BINDIR=	/usr/libexec
 NO_MAN=
 NO_SHARED?=yes
 
-CFLAGS+= -I.
-
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
-
-#-----------------------------------------------------------------------
-# C parser
-c-parse+%DIKED.c: c-parse.c
-	sed -e "s/malloc/xmalloc/g" \
-	    -e "s/realloc/xrealloc/g" \
-	    ${.ALLSRC} > ${.TARGET}
+OBJS+=  ${PROG}-checksum.o
+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
 
-c-parse.y: c-parse.in
-	sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \
-	    -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" \
-	    ${.ALLSRC} > ${.TARGET}
+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
+${PROG}-dummy:	${DOBJS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+CLEANFILES+=	${PROG}-dummy
 
-CLEANFILES=	c-parse+%DIKED.c c-parse.c c-parse.y
-CLEANFILES+=	y.tab.h # we don't use it, but the system YACC rules are naive
+${PROG}-checksum.c:	${PROG}-dummy
+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
+CLEANFILES+=	${PROG}-checksum.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 075e757..8baf9d6 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -5,31 +5,24 @@
 .PATH: ${GCCDIR}/objc ${GCCDIR}
 
 PROG=	cc1obj
-SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
+SRCS=	main.c c-parser.c objc-act.c objc-lang.c c-decl.c
 BINDIR=	/usr/libexec
 NO_MAN=
 NO_SHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
+OBJS+=  ${PROG}-checksum.o
+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
 
-#-----------------------------------------------------------------------
-# objc parser
-objc-parse+DIKED.c: objc-parse.c
-	sed -e "s/malloc/xmalloc/g" \
-	    -e "s/realloc/xrealloc/g" \
-	    ${.ALLSRC} > ${.TARGET}
+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
+${PROG}-dummy:	${DOBJS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+CLEANFILES+=	${PROG}-dummy
 
-objc-parse.y: c-parse.in
-	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
-CLEANFILES+=	y.tab.h # we don't use it, but the system YACC rules are naive
-
-#-----------------------------------------------------------------------
+${PROG}-checksum.c:	${PROG}-dummy
+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
+CLEANFILES+=	${PROG}-checksum.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 4ba5d66..964d20f 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -9,7 +9,8 @@ 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 
+	search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
+	cp-objcp-common.c cp-gimplify.c tree-mudflap.c
 
 BINDIR=	/usr/libexec
 NO_MAN=
@@ -17,15 +18,24 @@ NO_SHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
+OBJS+=	${PROG}-checksum.o
+DPADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
+LDADD=	${LIBBACKEND} ${LIBCPP} ${LIBDECNUMBER} ${LIBIBERTY}
 
 #-----------------------------------------------------------------------
 # C++ parser
 cfns.h: cfns.gperf
 	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
 	    ${.ALLSRC} > ${.TARGET}
-
 CLEANFILES= cfns.h
 
+DOBJS+=	${SRCS:N*.h:R:S/$/.o/g}
+${PROG}-dummy:	${DOBJS}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${DOBJS} ${LDADD}
+CLEANFILES+=	${PROG}-dummy
+
+${PROG}-checksum.c:	${PROG}-dummy
+	../cc_tools/genchecksum ${PROG}-dummy > ${.TARGET}
+CLEANFILES+=	${PROG}-checksum.c
+
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index d06cebb..7082c3e 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,93 +1,101 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+.include "../Makefile.ver"
 
-.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
+.PATH: ../cc_tools ${GCCDIR} ${GCCDIR}/config/${GCC_CPU}
 
-LIB=		cc_int
+LIB=	backend
 INTERNALLIB=
 
-# Files from libiberty.
-SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
-	dyn-string.c fibheap.c getpwd.c getruntime.c hashtab.c hex.c \
-	lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \
-	physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.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
+EXTRA_OBJS=
+GGC=		ggc-page.o
+host_hook_obj=	host-default.o
+
+#
+# Most lists copied verbatim from GCC Makefiles.
+#
+OBJS-common = \
+ double-int.o tree-chrec.o tree-scalar-evolution.o tree-data-ref.o	   \
+ tree-cfg.o tree-dfa.o tree-eh.o tree-ssa.o tree-optimize.o tree-gimple.o  \
+ gimplify.o tree-pretty-print.o tree-into-ssa.o				   \
+ tree-outof-ssa.o tree-ssa-ccp.o tree-vn.o tree-ssa-uncprop.o		   \
+ tree-ssa-dce.o  tree-ssa-copy.o tree-nrv.o tree-ssa-copyrename.o	   \
+ tree-ssa-pre.o tree-ssa-live.o tree-ssa-operands.o tree-ssa-alias.o       \
+ tree-ssa-phiopt.o tree-ssa-forwprop.o tree-nested.o tree-ssa-dse.o	   \
+ tree-ssa-dom.o domwalk.o tree-tailcall.o gimple-low.o tree-iterator.o	   \
+ omp-low.o tree-phinodes.o tree-ssanames.o tree-sra.o tree-complex.o	   \
+ tree-vect-generic.o tree-ssa-loop.o tree-ssa-loop-niter.o		   \
+ tree-ssa-loop-manip.o tree-ssa-threadupdate.o tree-ssa-threadedge.o	   \
+ tree-vectorizer.o tree-vect-analyze.o tree-vect-transform.o		   \
+ tree-vect-patterns.o tree-ssa-loop-prefetch.o				   \
+ tree-ssa-loop-ivcanon.o tree-ssa-propagate.o tree-ssa-address.o	   \
+ tree-ssa-math-opts.o							   \
+ tree-ssa-loop-ivopts.o tree-if-conv.o tree-ssa-loop-unswitch.o		   \
+ alias.o bb-reorder.o bitmap.o builtins.o caller-save.o calls.o	  	   \
+ cfg.o cfganal.o cfgbuild.o cfgcleanup.o cfglayout.o cfgloop.o		   \
+ cfgloopanal.o cfgloopmanip.o loop-init.o loop-unswitch.o loop-unroll.o	   \
+ cfgrtl.o combine.o conflict.o convert.o coverage.o cse.o cselib.o 	   \
+ dbxout.o ddg.o tree-ssa-loop-ch.o loop-invariant.o tree-ssa-loop-im.o	   \
+ debug.o df-core.o df-problems.o df-scan.o dfp.o diagnostic.o dojump.o     \
+ dominance.o loop-doloop.o	   					   \
+ dwarf2asm.o dwarf2out.o emit-rtl.o except.o explow.o loop-iv.o		   \
+ expmed.o expr.o final.o flow.o fold-const.o function.o gcse.o		   \
+ genrtl.o ggc-common.o global.o graph.o gtype-desc.o			   \
+ haifa-sched.o hooks.o ifcvt.o insn-attrtab.o insn-emit.o insn-modes.o	   \
+ insn-extract.o insn-opinit.o insn-output.o insn-peep.o insn-recog.o	   \
+ integrate.o intl.o jump.o  langhooks.o lcm.o lists.o local-alloc.o  	   \
+ mode-switching.o modulo-sched.o optabs.o options.o opts.o opts-common.o \
+ params.o postreload.o postreload-gcse.o predict.o			   \
+ insn-preds.o insn-automata.o pointer-set.o 			   	   \
+ print-rtl.o print-tree.o profile.o value-prof.o var-tracking.o		   \
+ real.o recog.o reg-stack.o regclass.o regmove.o regrename.o		   \
+ reload.o reload1.o reorg.o resource.o rtl.o rtlanal.o rtl-error.o	   \
+ sbitmap.o sched-deps.o sched-ebb.o sched-rgn.o sched-vis.o sdbout.o	   \
+ see.o simplify-rtx.o sreal.o stmt.o stor-layout.o stringpool.o		   \
+ struct-equiv.o targhooks.o timevar.o toplev.o tracer.o tree.o tree-dump.o \
+ varasm.o varray.o vec.o version.o vmsdbgout.o xcoffout.o alloc-pool.o	   \
+ et-forest.o cfghooks.o bt-load.o pretty-print.o $(GGC) web.o passes.o     \
+ tree-profile.o rtlhooks.o cfgexpand.o lambda-mat.o    			   \
+ lambda-trans.o	lambda-code.o tree-loop-linear.o tree-ssa-sink.o 	   \
+ tree-vrp.o tree-stdarg.o tree-cfgcleanup.o tree-ssa-reassoc.o		   \
+ tree-ssa-structalias.o tree-object-size.o 				   \
+ rtl-factoring.o
+
+OBJS-archive=	$(EXTRA_OBJS) $(host_hook_obj) tree-inline.o		   \
+  cgraph.o cgraphunit.o tree-nomudflap.o ipa.o ipa-inline.o		   \
+  ipa-utils.o ipa-reference.o ipa-pure-const.o ipa-type-escape.o	   \
+  ipa-prop.o ipa-cp.o
+
+OBJS-md=  ${GCC_CPU}.o
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-c.c)
-SRCS+=	${GCC_CPU}-c.c
+OBJS-md+= ${GCC_CPU}-c.o
 .endif
 
-# 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
+# Target specific, C specific object file
+C_TARGET_OBJS=
 
-# insn-* gunk -- headers are built in cc_tools, as they are used by the
-# "build-tools"
-.for F in attrtab emit extract opinit output peep recog
-SRCS+=	insn-$F.c
-CLEANFILES+= insn-$F.c
-insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE}
-	${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c \
-	    ${.MAKEFLAGS:M-s:S;-s;2>/dev/null;}
-.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
+# Language-specific object files for C and Objective C.
+C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
+  c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \
+  c-incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
+  c-objc-common.o c-dump.o c-pch.o c-parser.o $(C_TARGET_OBJS) \
+  c-gimplify.o tree-mudflap.o c-pretty-print.o c-omp.o
 
-CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-DTARGET_NAME=\"${GCC_TARGET}\"
+# Language-specific object files for C.
+C_OBJS = c-lang.o stub-objc.o $(C_AND_OBJC_OBJS)
 
-.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
-CFLAGS += -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
-.endif
+# Put objC stub objects in library. objc frontend will override it
+# Put dummy checksum object in library too. It will be overridden
+# by each indidual front-end binary as needed.
+OBJS-dummy=  stub-objc.o dummy-checksum.o
+
+OBJS-all=  ${OBJS-common} ${OBJS-archive} ${OBJS-md} ${C_AND_OBJC_OBJS} \
+	   ${OBJS-dummy}
+
+SRCS+= ${OBJS-all:R:S/$/.c/g}
 
-# 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=\"${GCC_TARGET}\" -c ${.IMPSRC}
+toplev.o:	toplev.c
+	${CC} ${CFLAGS} -DTARGET_NAME=\"${GCC_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 92964d3..38ac590 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -2,209 +2,18 @@
 
 .include <bsd.own.mk>
 
-#
-# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
-# is such a !@#!*#% nightmare because of how it reprograms the dependencies,
-# suffix rules, SRCS, etc.  It's easiest to cheat by using bsd.prog.mk and
-# SRCS to get dependencies.
-#
-
-#
-# ../Makefile.inc will put an absolute path to our objdir in CFLAGS.
-# Prevent mkdep from using it, so that we don't have to give rules for
-# aliases of generated headers.
-#
 CFLAGS+=	-I.
 
 .include "../Makefile.inc"
 
-.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 fibheap.c getpwd.c getruntime.c hashtab.c hex.c \
-	lbasename.c make-temp-file.c md5.c obstack.c partition.c pex-unix.c \
-	physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.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
-
-.for F in attr codes config flags constants
-insn-$F.h: gen$F ${MD_FILE}
-	./gen$F ${MD_FILE} > insn-$F.h
-GENSRCS+=	insn-$F.h
-.endfor
-
-.for F in conditions
-insn-$F.c: gen$F ${MD_FILE}
-	./gen$F ${MD_FILE} > insn-$F.c
-GENSRCS+=	insn-$F.c
-.endfor
-
-GENSRCS+=	gen-time-stamp
-gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
-		genextract gengtype genopinit genoutput genpeep genrecog
-	touch ${.TARGET}
-
-.for F in attr codes config emit extract flags opinit output peep recog
-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 errors.o ${LIBIBERTY}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-GENSRCS+=	gen$F.c
-CLEANFILES+=	gen$F
-.endfor
-
-#
-# genattrtab needs more complex build rule
-#
-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 \
-	errors.o ${LIBIBERTY}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
+CFLAGS+=	-g
+CFLAGS+=	-DGENERATOR_FILE -DHAVE_CONFIG_H
 
-GENSRCS+=	genattrtab.c
-CLEANFILES+=	genattrtab
+# Override LIBIBERTY set by Makefile.inc, We use our own for
+# build tools.
+LIBIBERTY=	libiberty.a
 
-#
-# genconstants and genconditions cannot depend on insn-conditions.o
-# they should be liked with dummy-conditions.o stubs instead
-#
-.for F in constants conditions
-gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o errors.o ${LIBIBERTY}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-GENSRCS+=	gen$F.c
-CLEANFILES+=	gen$F
-.endfor
-
-.for F in modes check genrtl preds
-gen$F: gen$F.o errors.o ${LIBIBERTY}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-GENSRCS+=	gen$F.c
-CLEANFILES+=	gen$F
-.endfor
-
-.ORDER: genrtl.c genrtl.h
-genrtl.c genrtl.h: gengenrtl
-	./gengenrtl > genrtl.c
-	./gengenrtl -h > genrtl.h
-
-GENSRCS+=	genrtl.c genrtl.h
-
-SRCS+=	bitmap.c dummy-conditions.c errors.c genautomata.c gensupport.c \
-	ggc-none.c print-rtl.c read-rtl.c rtl.c varray.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
-	./gencheck > ${.TARGET}
-GENSRCS+=	tree-check.h
-
-#-----------------------------------------------------------------------
-# Predicates stuff.
-
-tm-preds.h: genpreds
-	./genpreds > ${.TARGET}
-GENSRCS+=	tm-preds.h
-
-#-----------------------------------------------------------------------
-# Gengtype
-
-gengtype-lex.c : gengtype-lex.l
-	${LEX} -t  ${.ALLSRC} | \
-	sed 's/^\(char msg\[\];\)/yyconst \1/' > ${.TARGET}
-
-.ORDER: gengtype-yacc.c gengtype-yacc.h
-gengtype-yacc.c gengtype-yacc.h: gengtype-yacc.y
-	${YACC} -d -o gengtype-yacc.c ${.ALLSRC}
-
-GENSRCS+=	gengtype-yacc+%DIKED.c gengtype-yacc.h gengtype-lex.c
-CLEANFILES+=	gengtype-yacc.c
-
-gengtype-yacc+%DIKED.c: gengtype-yacc.c
-	cat    ${.ALLSRC} > ${.TARGET}
-	sed -e "s/xmalloc/malloc/g" \
-	    -e "s/xrealloc/realloc/g" \
-	    -e "s/malloc/xmalloc/g" \
-	    -e "s/realloc/xrealloc/g" \
-	    ${.ALLSRC} > ${.TARGET}
-
-gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-GENSRCS+=	gengtype.c
-CLEANFILES+=	gengtype
-
-gengtype-lex.o: gengtype-yacc.h
-
-.ORDER: gtype-desc.c gtype-desc.h
-gtype-desc.c gtype-desc.h: gtype-time-stamp
-	@true
-
-GENSRCS+=	gtype-time-stamp
-gtype-time-stamp: gengtype ${GTFILES}
-	./gengtype
-	touch ${.TARGET}
-
-GENSRCS+=	gtype-desc.c gtype-desc.h
-CLEANFILES+=	gt-*.h gtype-*.h
-
-#
-#-----------------------------------------------------------------------
-# Fortran build tools
-
-.if ${MK_FORTRAN} != "no"
-gen-time-stamp: fini
-fini: fini.o ${LIBIBERTY}
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-SRCS+=		fini.c
-CLEANFILES+=	fini
-.endif
+.PATH:	${GCCDIR} ${GCCLIB}/libiberty
 
 #-----------------------------------------------------------------------
 # Determine content of variables used by the target/host config files
@@ -212,8 +21,9 @@ CLEANFILES+=	fini
 #
 # The list of headers to go into tm.h
 #
+TARGET_INC+=	options.h
 .if ${TARGET_ARCH} == "amd64"
-TARGET_INC=	i386/biarch64.h
+TARGET_INC+=	i386/biarch64.h
 .endif
 .if ${TARGET_ARCH} != "arm"
 TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
@@ -222,92 +32,90 @@ TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
 TARGET_INC+=	${GCC_CPU}/unix.h
 TARGET_INC+=	${GCC_CPU}/att.h
 .endif
-.if ${TARGET_ARCH} != "alpha"
 TARGET_INC+=	dbxelf.h
 TARGET_INC+=	elfos.h
-.endif
 TARGET_INC+=	freebsd-native.h
 TARGET_INC+=	freebsd-spec.h
 TARGET_INC+=	freebsd.h
-.if ${TARGET_ARCH} == "alpha"
-TARGET_INC+=	${GCC_CPU}/elf.h
-.endif
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h)
 TARGET_INC+=	${GCC_CPU}/sysv4.h
 .endif
 .endif
-.if ${TARGET_ARCH} == "arm"
-TARGET_INC+=	${GCC_CPU}/elf.h
-TARGET_INC+=	${GCC_CPU}/aout.h
-TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
-. if defined(TARGET_BIG_ENDIAN)
-CFLAGS+= -DTARGET_ENDIAN_DEFAULT=ARM_FLAG_BIG_END
-. endif
-.endif
-.if ${TARGET_ARCH} == "arm"
-TARGET_INC+=	freebsd-diked.h
-.else
-TARGET_INC+=	${GCC_CPU}/freebsd.h
-.endif
 .if ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/x86-64.h
+TARGET_INC+=	${GCC_CPU}/freebsd.h
 TARGET_INC+=	${GCC_CPU}/freebsd64.h
 TARGET_INC+=	freebsd64-fix.h
-.endif
-.if ${TARGET_ARCH} == "powepc"
-TARGET_INC+=	altivec-defs.h
+.elif ${TARGET_ARCH} == "arm"
+TARGET_INC+=	${GCC_CPU}/elf.h
+TARGET_INC+=	${GCC_CPU}/aout.h
+TARGET_INC+=	${GCC_CPU}/freebsd.h
+TARGET_INC+=	${GCC_CPU}/arm.h
+.else
+TARGET_INC+=	${GCC_CPU}/freebsd.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=	${.CURDIR}/auto-host.h
-
 .for H in ${TARGET_INC}
 .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
 .if exists($D/$H)
-GCONFIG_H+=	$D/$H
+TARGET_INC_FILES+=     $D/$H
 .endif
 .endfor
 .endfor
 
 #
-# Define some variables to make blocks copied from Makefile.in happy
+# gtyp includes.
 #
 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}
+CPPLIB_H=	${GCCLIB}/libcpp/include/line-map.h \
+		${GCCLIB}/libcpp/include/cpplib.h
+SYMTAB_H=	${GCCLIB}/libcpp/include/symtab.h
+CPP_ID_DATA_H=	${CPPLIB_H} ${GCCLIB}/libcpp/include/cpp-id-data.h
+HASHTAB_H=	${GCCLIB}/include/hashtab.h
+SPLAY_TREE_H=	${GCCLIB}/include/splay-tree.h
+out_file=	${srcdir}/config/${GCC_CPU}/${GCC_CPU}.c
+tm_file_list=	${TARGET_INC_FILES}
+host_xm_file_list= ${.CURDIR}/auto-host.h ${GCCLIB}/include/ansidecl.h
+GTFILES_SRCDIR=	${srcdir}
 
-#
 # Copied unchanged from gcc/Makefile.in
-#
-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 \
+GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h \
+  $(CPP_ID_DATA_H) $(host_xm_file_list) \
+  $(tm_file_list) $(HASHTAB_H) $(SPLAY_TREE_H) $(srcdir)/bitmap.h \
+  $(srcdir)/coverage.c $(srcdir)/rtl.h \
+  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/function.h $(srcdir)/libfuncs.h $(SYMTAB_H) \
+  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h $(srcdir)/hwint.h \
+  $(srcdir)/ipa-reference.h $(srcdir)/output.h \
   $(srcdir)/cselib.h $(srcdir)/basic-block.h  $(srcdir)/cgraph.h \
-  $(srcdir)/c-common.h $(srcdir)/c-tree.h \
+  $(srcdir)/c-common.h $(srcdir)/c-tree.h $(srcdir)/reload.h \
   $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
+  $(srcdir)/ipa-prop.c $(srcdir)/ipa-cp.c $(srcdir)/ipa-inline.c \
   $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
-  $(srcdir)/dojump.c \
+  $(srcdir)/dojump.c $(srcdir)/tree-profile.c \
   $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
-  $(srcdir)/fold-const.c $(srcdir)/function.c \
+  $(srcdir)/function.c $(srcdir)/except.h \
   $(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)/cfglayout.c $(srcdir)/langhooks.c \
-  $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \
+  $(srcdir)/profile.c $(srcdir)/regclass.c \
+  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c \
+  $(srcdir)/sdbout.c $(srcdir)/stor-layout.c \
   $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c \
-  $(out_file)
-
-#
-# Build a list of frontend directories to look into
-#
+  $(srcdir)/tree-mudflap.c $(srcdir)/tree-flow.h \
+  $(srcdir)/c-objc-common.c $(srcdir)/c-common.c $(srcdir)/c-parser.c \
+  $(srcdir)/tree-ssanames.c $(srcdir)/tree-eh.c $(srcdir)/tree-ssa-address.c \
+  $(srcdir)/tree-phinodes.c $(srcdir)/tree-cfg.c \
+  $(srcdir)/tree-dfa.c $(srcdir)/tree-ssa-propagate.c \
+  $(srcdir)/tree-iterator.c $(srcdir)/gimplify.c \
+  $(srcdir)/tree-chrec.h $(srcdir)/tree-vect-generic.c \
+  $(srcdir)/tree-ssa-operands.h $(srcdir)/tree-ssa-operands.c \
+  $(srcdir)/tree-profile.c $(srcdir)/tree-nested.c \
+  $(srcdir)/ipa-reference.c $(srcdir)/tree-ssa-structalias.h \
+  $(srcdir)/tree-ssa-structalias.c \
+  $(srcdir)/c-pragma.h $(srcdir)/omp-low.c \
+  $(srcdir)/targhooks.c $(srcdir)/cgraphunit.c $(out_file) \
+
+# The list of frontend directories to look into
 GTFILES_LANG_DIR_NAMES=
 
 .if ${MK_CXX} != "no"
@@ -318,13 +126,7 @@ GTFILES_LANG_DIR_NAMES+=	cp
 GTFILES_LANG_DIR_NAMES+=	objc
 .endif
 
-.if ${MK_FORTRAN} != "no"
-GTFILES_LANG_DIR_NAMES+=	f
-.endif
-
-#
-# Build a list of language specific files for gengtype
-#
+# The list of language specific files for gengtype
 .for L in ${GTFILES_LANG_DIR_NAMES} c
 .if exists(${GCCDIR}/$L-config-lang.in)
 # Source the language config file
@@ -339,167 +141,371 @@ GTFILES_LANGS+= $L
 .endfor
 GTFILES+=	${GTFILES_FILES}
 
-#-----------------------------------------------------------------------
-# the host/target compiler config.
+#
+# Tree definition files.
+#
+TREE_DEF_FILES=
 
-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}
+.if ${MK_CXX} != "no"
+TREE_DEF_FILES+=	cp/cp-tree.def
+.endif
 
-MFILE?=	${.CURDIR}/Makefile
-${COMMONHDRS}: ${MFILE}
+.if ${MK_OBJC} != "no"
+TREE_DEF_FILES+=	objc/objc-tree.def
+.endif
 
-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}
+#
+# Option files.
+#
+OPT_FILES=	c.opt common.opt
 
-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}
+.if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt)
+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.opt
+.endif
 
-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}
+.if exists(${.CURDIR}/${GCC_CPU}-freebsd.opt)
+OPT_FILES+=	${.CURDIR}/${GCC_CPU}-freebsd.opt
 .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}
-	echo '#include "objc/objc-tree.def"'		>> ${.TARGET}
+.if ${TARGET_ARCH} == "powerpc"
+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/sysv4.opt
+.endif
 
-multilib.h:
-	echo 'static const char *const multilib_raw[] = { \
-	    "aout maout;", "elf !maout;", NULL };'	> ${.TARGET}
-	echo 'static const char *const multilib_matches_raw[] = { \
-	    "maout maout;", "melf melf;", NULL };'	>> ${.TARGET}
-	echo 'static const char *multilib_extra = "";'	>> ${.TARGET}
-	echo 'static const char *multilib_options = "";'>> ${.TARGET}
-	echo 'static const char *const multilib_exclusions_raw[] = { \
-	    NULL };'					>> ${.TARGET}
+.if ${TARGET_ARCH} == "sparc64"
+OPT_FILES+=	${GCCDIR}/config/${GCC_CPU}/long-double-switch.opt
+.endif
 
-specs.h:
-	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
-	echo '#include "f/lang-specs.h"'		>> ${.TARGET}
-	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
+.if exists(${.CURDIR}/freebsd.opt)
+OPT_FILES+=	${.CURDIR}/freebsd.opt
+.endif
 
-config.h: bconfig.h
-	echo '#include <bconfig.h>'			> ${.TARGET}
+#-----------------------------------------------------------------------
+# Build rules for header files and generator tools
 
-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}
+# Host config
+config.h:
+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
+	HEADERS="auto-host.h ansidecl.h" \
+	DEFINES="" \
+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
+
+GENSRCS+=	config.h
+CLEANFILES+=	cs-config.h
+
+# Build config
+bconfig.h:
+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
+	HEADERS="auto-host.h ansidecl.h" \
+	DEFINES="" \
+	/bin/sh ${GCCDIR}/mkconfig.sh ${.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}
-.for H in ${TARGET_INC}
-	echo '#include "$H"'				>> ${.TARGET}
-.endfor
-	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}
+
+GENSRCS+=	bconfig.h
+CLEANFILES+=	cs-bconfig.h
+
+# tconfig.h
+tconfig.h:
+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
+	HEADERS="auto-host.h ansidecl.h" \
+	DEFINES="USED_FOR_TARGET" \
+	/bin/sh ${GCCDIR}/mkconfig.sh ${.TARGET}
+
+GENSRCS+=	tconfig.h
+CLEANFILES+=	cs-tconfig.h
+# Options
+optionlist: ${OPT_FILES}
+	awk -f ${GCCDIR}/opt-gather.awk ${.ALLSRC} > ${.TARGET}
+
+options.h:	optionlist
+	awk -f ${GCCDIR}/opt-functions.awk \
+	    -f ${GCCDIR}/opth-gen.awk \
+		< ${.ALLSRC} > ${.TARGET}
+
+options.c:	optionlist
+	awk -f ${GCCDIR}/opt-functions.awk \
+	    -f ${GCCDIR}/optc-gen.awk \
+		-v header_name="config.h system.h coretypes.h tm.h" \
+		< ${.ALLSRC} > ${.TARGET}
+GENONLY+=	optionlist options.h options.c
+
+# Target machine config
+tm.h:
+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
+	HEADERS="${TARGET_INC}" \
+	DEFINES="" \
+	/bin/sh ${GCCDIR}/mkconfig.sh ${.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 '#endif /* GCC_TM_H */'			>> ${.TARGET}
 
+GENSRCS+=	tm.h
+CLEANFILES+=	cs-tm.h
+
+# Target machine protos/preds.
 tm_p.h:
-	echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"'	>> ${.TARGET}
-	echo '#include "tm-preds.h"'				>> ${.TARGET}
-
-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
-	echo '#define ${Z}	${Z:L}'				>> ${.TARGET}
+	TARGET_CPU_DEFAULT="${TARGET_CPU_DEFAULT}" \
+	HEADERS="${GCC_CPU}/${GCC_CPU}-protos.h tm-preds.h" \
+	DEFINES="" \
+	/bin/sh ${GCCDIR}/mkconfig.sh tm_p.h
+
+GENSRCS+=	tm_p.h
+CLEANFILES+=	cs-tm_p.h
+
+# gencheck
+gencheck.h:
+.for F in ${TREE_DEF_FILES}
+	echo "#include \"$F\""					>> ${.TARGET}
 .endfor
-	echo "#define ISIDST(x)		\
-		((x) == '_' || isalpha(x))"			>> ${.TARGET}
-	echo "#define ISIDNUM(x)	\
-		(isdigit(x) || ISIDST(x))"			>> ${.TARGET}
-	echo "#define IS_VSPACE(x)	\
-		((x) == '\n' || (x) == '\r')"			>> ${.TARGET}
-	echo "#define IS_NVSPACE(x)	\
-		(!IS_VSPACE(x) && (isspace(x) || (x) == '\0'))"	>> ${.TARGET}
-	echo "#define IS_SPACE_OR_NUL(x)	\
-		(isspace(x) || (x) == '\0')"			>> ${.TARGET}
-
-gtyp-gen.h:
+
+GENSRCS+=	gencheck.h
+
+
+# Source header for gtyp generator.
+gtyp-gen.h:	${GTFILES}
 	echo "/* This file is machine generated.  Do not edit.  */" > ${.TARGET}
-	echo "static const char *srcdir = "			>> ${.TARGET}
+	echo "static const char * const srcdir = "		>> ${.TARGET}
 	echo "\"$(GTFILES_SRCDIR)\";"				>> ${.TARGET}
-	echo "static const char *lang_files[] = {"		>> ${.TARGET}
+	echo "static const char * const lang_files[] = {"	>> ${.TARGET}
 .for F in ${GTFILES_FILES}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
-	echo "static const char *langs_for_lang_files[] = {"	>> ${.TARGET}
+	echo "static const char * const langs_for_lang_files[] = {">> ${.TARGET}
 .for F in ${GTFILES_LANGS}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
-	echo "static const char *all_files[] = {"		>> ${.TARGET}
+	echo "static const char * const all_files[] = {"	>> ${.TARGET}
 .for F in ${GTFILES}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
-	echo "static const char *lang_dir_names[] = { \"c\", "	>> ${.TARGET}
-.for F in ${GTFILES_LANG_DIR_NAMES}
+	echo "static const char * const lang_dir_names[] = {"	>> ${.TARGET}
+.for F in c ${GTFILES_LANG_DIR_NAMES}
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
 
+GENSRCS+=	gtyp-gen.h
+
+# Version header for gcov
 gcov-iov.h:
-	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET}
-
-.if ${TARGET_ARCH} == "arm"
-freebsd-diked.h: ${GCCDIR}/../../gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff
-	cp ${GCCDIR}/config/arm/freebsd.h freebsd.h
-	patch freebsd.h ${.ALLSRC}
-	mv freebsd.h ${.TARGET}
-COMMONHDRS+=	freebsd-diked.h
-CLEANFILES+=    freebsd.h.orig
-
-# Make sure freebsd-diked.h is built when tm.h is built for csu's sake
-tm.h:	freebsd-diked.h
-
-${MD_FILE}: ${MFILE}
-	cp ${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.md .
-	ln -sf ${GCCDIR}/config/${GCC_CPU}/fpa.md .
-	ln -sf ${GCCDIR}/config/${GCC_CPU}/cirrus.md .
-	ln -sf ${GCCDIR}/config/${GCC_CPU}/iwmmxt.md .
-	patch ${GCC_CPU}.md ${.CURDIR}/arm.md.diff
-	mv ${GCC_CPU}.md ${.TARGET}
-CLEANFILES+=	arm-diked.md ${GCC_CPU}.md.orig fpa.md cirrus.md iwmmxt.md
-.endif
+	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x34303270)" >> ${.TARGET}
+
+GENSRCS+=	gcov-iov.h
+
+# Multilib config file
+multilib.h:
+	echo 'static const char *const multilib_raw[] = { \
+	    ". ;", NULL };'					> ${.TARGET}
+	echo 'static const char *const multilib_matches_raw[] = { \
+	    NULL };'						>> ${.TARGET}
+	echo 'static const char *multilib_extra = "";'		>> ${.TARGET}
+	echo 'static const char *multilib_options = "";'	>> ${.TARGET}
+	echo 'static const char *const multilib_exclusions_raw[] = { \
+	    NULL };'						>> ${.TARGET}
+
+GENSRCS+=	multilib.h
+
+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}
+
+GENSRCS+=	configargs.h
+
+# Language spec files
+specs.h:
+	echo '#include "cp/lang-specs.h"'			> ${.TARGET}
+	echo '#include "objc/lang-specs.h"'			>> ${.TARGET}
+
+GENSRCS+=	specs.h
+
+gstdint.h:
+	echo '#include "sys/types.h"'				> ${.TARGET}
+	echo '#include "sys/stdint.h"'				>> ${.TARGET}
+
+GENSRCS+=	gstdint.h
+
+# Linked headers
+gthr-default.h: ${GCCDIR}/gthr-posix.h
+	ln -sf ${.ALLSRC} ${.TARGET}
+
+GENSRCS+=	gthr-default.h
+
+unwind.h: ${GCCDIR}/unwind-generic.h
+	ln -sf ${.ALLSRC} ${.TARGET}
+
+GENSRCS+=	unwind.h
+
+#
+# gtype gunk
+#
+gengtype-lex.c:	gengtype-lex.l
+	flex -ogengtype-lex.c ${.ALLSRC}
+
+gengtype-yacc.h: gengtype-yacc.y
+	yacc -d -o gengtype-yacc.c ${.ALLSRC}
+
+gengtype-yacc.c: gengtype-yacc.h
+
+gengtype-yacc+%DIKED.c: gengtype-yacc.c
+	cat    ${.ALLSRC} > ${.TARGET}
+	sed -e "s/xmalloc/malloc/g" \
+	    -e "s/xrealloc/realloc/g" \
+	    -e "s/malloc/xmalloc/g" \
+	    -e "s/realloc/xrealloc/g" \
+	    ${.ALLSRC} > ${.TARGET}
+
+GENSRCS+= gengtype-lex.c gengtype-yacc.h gengtype-yacc+%DIKED.c
+CLEANFILES+= gengtype-yacc.c
+
+gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o errors.o \
+	  ${LIBIBERTY}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+
+gtype-desc.h:	gengtype
+	./gengtype
+	touch ${.TARGET}
+
+gtype-desc.c:	gtype-desc.h
+
+GENONLY+=	gtype-desc.c gtype-desc.h
+CLEANFILES+=	gt-*.h gtype-*.h
+
+#
+# Generator tools.
+#
+.for F in check checksum genrtl modes
+gen$F:	gen$F.o errors.o ${LIBIBERTY}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+.endfor
+
+.for F in attr attrtab automata codes conditions config constants emit \
+	extract flags  opinit output peep preds recog
+gen$F:	gen$F.o rtl.o read-rtl.o ggc-none.o vec.o min-insn-modes.o \
+	gensupport.o print-rtl.o errors.o ${LIBIBERTY}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
+.endfor
+
+gencondmd:	gencondmd.o
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+
+#
+# Generated .md files.
+#
+insn-conditions.md:	gencondmd
+	./gencondmd > ${.TARGET}
+GENSRCS+=	insn-conditions.md
+
+#
+# Generated header files.
+#
+
+.for F in constants
+insn-$F.h:	gen$F ${MD_FILE}
+	./gen$F ${MD_FILE} > ${.TARGET}
+GENSRCS+=	insn-$F.h
+.endfor
+
+.for F in attr codes config flags
+insn-$F.h:	gen$F ${MD_FILE} insn-conditions.md
+	./gen$F ${MD_FILE} insn-conditions.md > ${.TARGET}
+GENSRCS+=	insn-$F.h
+.endfor
+
+# Header files with irregular names.
+genrtl.h:	gengenrtl
+	./gengenrtl -h > ${.TARGET}
+GENSRCS+=	genrtl.h
+
+tm-preds.h:	genpreds
+	./genpreds -h ${MD_FILE} > ${.TARGET}
+GENSRCS+=	tm-preds.h
+
+tm-constrs.h:	genpreds
+	./genpreds -c ${MD_FILE} > ${.TARGET}
+GENSRCS+=	tm-constrs.h
+
+tree-check.h:	gencheck
+	./gencheck > ${.TARGET}
+GENSRCS+=	tree-check.h
+
+insn-modes.h:	genmodes
+	./genmodes -h > ${.TARGET}
+GENSRCS+=	insn-modes.h
+
+#
+# Generated source files.
+#
+.for F in attrtab automata emit extract opinit output peep preds recog
+insn-$F.c:	gen$F ${MD_FILE} insn-conditions.md
+	./gen$F ${MD_FILE} insn-conditions.md > ${.TARGET}
+GENONLY+=	insn-$F.c
+.endfor
+
+.for F in conditions
+insn-$F.c:	gen$F ${MD_FILE}
+	./gen$F ${MD_FILE} > ${.TARGET}
+GENSRCS+=	insn-$F.c
+.endfor
+
+# Source files with irregular names.
+insn-modes.c:	genmodes
+	./genmodes > ${.TARGET}
+GENONLY+=	insn-modes.c
+
+min-insn-modes.c:	genmodes
+	./genmodes -m > ${.TARGET}
+GENSRCS+=	min-insn-modes.c
+
+genrtl.c:	gengenrtl
+	./gengenrtl > ${.TARGET}
+GENONLY+=	genrtl.c
+
+gencondmd.c:	genconditions ${MD_FILE}
+	./genconditions ${MD_FILE} > ${.TARGET}
+GENSRCS+=	gencondmd.c
+
 #-----------------------------------------------------------------------
-# General things.
+# Build tools.
 
-SRCS+=		${GENSRCS}
-CLEANFILES+=	${GENSRCS}
+GNTOOLS+=	genattr genattrtab genautomata gencodes gencheck genchecksum \
+		genconditions gencondmd genconfig genconstants genemit \
+		genextract genflags gengenrtl gengtype genmodes genopinit \
+		genoutput genpeep genpreds genrecog
 
-all:		${SRCS}
+all: ${GNTOOLS} ${GENSRCS} ${GENONLY}
+beforedepend: ${GENONLY}
+
+#
+#-----------------------------------------------------------------------
+# 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 fibheap.c fopen_unlocked.c getpwd.c getruntime.c \
+	hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \
+	partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \
+	xmalloc.c xmemdup.c xstrdup.c xstrerror.c
+LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
+
+.for _src in ${LIBIBERTY_SRCS}
+${_src:R:S/$/.o/}: ${_src}
+	${CC} -c -I ${.CURDIR}/../libiberty ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
+.endfor
+
+${LIBIBERTY}: ${LIBIBERTY_OBJS}
+	@rm -f ${.TARGET}
+	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
+	${RANLIB} ${.TARGET}
+CLEANFILES+=	${LIBIBERTY} ${LIBIBERTY_OBJS}
 
-.include <bsd.prog.mk>
 
 #-----------------------------------------------------------------------
 # Fixups.
@@ -507,47 +513,24 @@ all:		${SRCS}
 # Set OBJS the same as bsd.prog.mk would do if we defined PROG.  We can't
 # define PROG because we have multiple programs.
 #
+SRCS=		errors.c genattr.c genattrtab.c \
+		genautomata.c gencheck.c genchecksum.c gencodes.c \
+		genconditions.c genconfig.c genconstants.c genemit.c \
+		genextract.c genflags.c gengenrtl.c gengtype.c genmodes.c \
+		genopinit.c genoutput.c genpeep.c genpreds.c genrecog.c \
+		gensupport.c ggc-none.c print-rtl.c read-rtl.c rtl.c \
+		vec.c
+
+SRCS+=		${GENSRCS}
 OBJS+=		${SRCS:N*.h:R:S/$/.o/g}
-CLEANFILES+=	${OBJS}
+GENOBJS+=	${GENSRCS:N*.h:R:S/$/.o/g}
+CLEANFILES+=	${GENSRCS} ${GENONLY} ${GENOBJS} ${GNTOOLS}
 
+#-----------------------------------------------------------------------
+# Manual dependencies.
 .if !exists(${DEPENDFILE})
-# Fudge pre-dependfile dependencies of objects in much the same way as
-# bsd.prog.mk would do if we defined PROG.
-
-${OBJS}: ${COMMONHDRS}
-
-dummy-conditions.o:
-gencheck.o:
-genmodes.o:
-
-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 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
-
+.include  "Makefile.dep"
 .endif
+
+.include <bsd.prog.mk>
+# DO NOT DELETE
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile.dep b/gnu/usr.bin/cc/cc_tools/Makefile.dep
new file mode 100644
index 0000000..5d132af
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_tools/Makefile.dep
@@ -0,0 +1,153 @@
+# $FreeBSD$
+
+errors.o: bconfig.h auto-host.h
+
+genattr.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genattrtab.o: bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+  insn-modes.h \
+  gtype-desc.h
+
+genautomata.o: bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+gencheck.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  gencheck.h
+
+genchecksum.o: bconfig.h \
+  auto-host.h
+
+gencodes.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genconditions.o: bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genconfig.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genconstants.o: bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genemit.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genextract.o: bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+  insn-modes.h \
+  insn-config.h
+
+genflags.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+gengenrtl.o: bconfig.h auto-host.h
+
+gengtype.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  gtyp-gen.h
+
+genmddeps.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genmodes.o: bconfig.h auto-host.h
+
+genopinit.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genoutput.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genpeep.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genpreds.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+genrecog.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+gensupport.o: bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+ggc-none.o: bconfig.h auto-host.h \
+  gtype-desc.h
+
+print-rtl.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+read-rtl.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+rtl.o: bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h \
+  gtype-desc.h
+
+insn-modes.o: insn-modes.c config.h auto-host.h \
+  tm.h options.h \
+  insn-modes.h
+
+min-insn-modes.o: min-insn-modes.c bconfig.h auto-host.h \
+  insn-modes.h
+
+gengtype-lex.o: gengtype-lex.c \
+  bconfig.h auto-host.h \
+  gengtype-yacc.h
+
+gengtype-yacc+%DIKED.o: gengtype-yacc+%DIKED.c \
+  bconfig.h \
+  auto-host.h \
+  tm.h options.h \
+
+insn-conditions.o: insn-conditions.c bconfig.h auto-host.h \
+  insn-constants.h \
+  tm.h options.h \
+  insn-modes.h \
+  tm_p.h \
+  tm-preds.h \
+  options.h
+
+gencondmd.o: gencondmd.c \
+  tm.h options.h tm_p.h \
+  tm-preds.h tm-constrs.h tree-check.h \
+  insn-constants.h
+
+gencondmd.o: gencondmd.c bconfig.h auto-host.h \
+  tm.h options.h \
+  insn-constants.h \
+  insn-modes.h \
+  tm_p.h \
+  tm-preds.h \
+  tree-check.h \
+  tm-constrs.h
+
+vec.o: vec.c bconfig.h auto-host.h \
+  insn-modes.h \
+  tree-check.h \
+  gtype-desc.h
diff --git a/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff b/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff
deleted file mode 100644
index 687b24f..0000000
--- a/gnu/usr.bin/cc/cc_tools/arm-freebsd.h.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-$FreeBSD$
-Index: freebsd.h
-===================================================================
-RCS file: /cognet/ncvs/src/contrib/gcc/config/arm/freebsd.h,v
-retrieving revision 1.1.1.3
-diff -u -p -r1.1.1.3 freebsd.h
---- freebsd.h	28 Jul 2004 03:11:35 -0000	1.1.1.3
-+++ freebsd.h	21 Jul 2006 00:50:25 -0000
-@@ -22,7 +22,10 @@
- 
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
--  { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }
-+  { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }, \
-+  { "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \
-+  { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }
-+	
- 
- #undef  SUBTARGET_CPP_SPEC
- #define SUBTARGET_CPP_SPEC FBSD_CPP_SPEC
-@@ -39,7 +42,8 @@
-       %{rdynamic:-export-dynamic}					\
-       %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }}	\
-     %{static:-Bstatic}}							\
--  %{symbolic:-Bsymbolic}"
-+  %{symbolic:-Bsymbolic}						\
-+  %{mbig-endian:-EB} %{mlittle-endian:-EL}"
- 
- 
- /************************[  Target stuff  ]***********************************/
-@@ -67,3 +71,80 @@
- 
- #undef  TARGET_VERSION
- #define TARGET_VERSION fprintf (stderr, " (FreeBSD/StrongARM ELF)");
-+
-+#ifndef TARGET_ENDIAN_DEFAULT
-+#define TARGET_ENDIAN_DEFAULT	0
-+#endif
-+
-+#undef	TARGET_DEFAULT
-+#define	TARGET_DEFAULT                  \
-+  (ARM_FLAG_APCS_32                     \
-+   | ARM_FLAG_SOFT_FLOAT                \
-+   | ARM_FLAG_APCS_FRAME                \
-+   | ARM_FLAG_ATPCS                     \
-+   | ARM_FLAG_VFP                       \
-+   | ARM_FLAG_MMU_TRAPS			\
-+   | TARGET_ENDIAN_DEFAULT)
-+
-+#undef	TYPE_OPERAND_FMT
-+#define	TYPE_OPERAND_FMT "%%%s"
-+        
-+#undef	SUBTARGET_EXTRA_ASM_SPEC
-+#define	SUBTARGET_EXTRA_ASM_SPEC        \
-+  "-matpcs %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
-+      
-+  /* Default floating point model is soft-VFP.
-+   *    FIXME: -mhard-float currently implies FPA.  */
-+#undef	SUBTARGET_ASM_FLOAT_SPEC
-+#define	SUBTARGET_ASM_FLOAT_SPEC        \
-+  "%{mhard-float:-mfpu=fpa} \
-+  %{msoft-float:-mfpu=softvfp} \
-+  %{!mhard-float: \
-+	  %{!msoft-float:-mfpu=softvfp}}"
-+
-+
-+/* FreeBSD does its profiling differently to the Acorn compiler. We      
-+   don't need a word following the mcount call; and to skip it
-+   requires either an assembly stub or use of fomit-frame-pointer when  
-+   compiling the profiling functions.  Since we break Acorn CC
-+   compatibility below a little more won't hurt.  */
-+   
-+#undef ARM_FUNCTION_PROFILER                                  
-+#define ARM_FUNCTION_PROFILER(STREAM,LABELNO)		\
-+{							\
-+  asm_fprintf (STREAM, "\tmov\t%Rip, %Rlr\n");		\
-+  asm_fprintf (STREAM, "\tbl\t_mcount%s\n",		\
-+	       NEED_PLT_RELOC ? "(PLT)" : "");		\
-+}
-+
-+/* Emit code to set up a trampoline and synchronize the caches.  */
-+#undef INITIALIZE_TRAMPOLINE
-+#define INITIALIZE_TRAMPOLINE(TRAMP, FNADDR, CXT)			\
-+do									\
-+  {									\
-+    emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 8)),	\
-+		    (CXT));						\
-+    emit_move_insn (gen_rtx (MEM, SImode, plus_constant ((TRAMP), 12)),	\
-+		    (FNADDR));						\
-+    emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__clear_cache"),	\
-+		       0, VOIDmode, 2, TRAMP, Pmode,			\
-+		       plus_constant (TRAMP, TRAMPOLINE_SIZE), Pmode);	\
-+  }									\
-+while (0)
-+
-+/* Clear the instruction cache from `BEG' to `END'.  This makes a
-+   call to the ARM_SYNC_ICACHE architecture specific syscall.  */
-+#define CLEAR_INSN_CACHE(BEG, END)					\
-+do									\
-+  {									\
-+    extern int sysarch(int number, void *args);				\
-+    struct								\
-+      {									\
-+	unsigned int addr;						\
-+	int          len;						\
-+      } s;								\
-+    s.addr = (unsigned int)(BEG);					\
-+    s.len = (END) - (BEG);						\
-+    (void) sysarch (0, &s);						\
-+  }									\
-+while (0)
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index dabfa93..47dc49e 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -1,591 +1,1413 @@
-/* $FreeBSD$ */
-
-#ifndef __FreeBSD_version
-#include <sys/param.h>
-#include <sys/endian.h>
-#endif
-
 /* auto-host.h.  Generated by configure.  */
 /* config.in.  Generated from configure.ac by autoheader.  */
-
-/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
-#define BYTEORDER _BYTE_ORDER
+/* $FreeBSD$ */
 
 /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
+#ifndef USED_FOR_TARGET
 /* #undef CHAR_BIT */
+#endif
+
 
 /* Define 0/1 to force the choice for exception handling model. */
+#ifndef USED_FOR_TARGET
 /* #undef CONFIG_SJLJ_EXCEPTIONS */
+#endif
+
 
 /* Define to enable the use of a default assembler. */
+#ifndef USED_FOR_TARGET
 /* #undef DEFAULT_ASSEMBLER */
+#endif
+
 
 /* Define to enable the use of a default linker. */
+#ifndef USED_FOR_TARGET
 /* #undef DEFAULT_LINKER */
+#endif
+
 
 /* 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. */
+#ifndef USED_FOR_TARGET
 #define DEFAULT_USE_CXA_ATEXIT 1
+#endif
 
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-/* #undef ENABLE_NLS */
 
-#ifdef WANT_COMPILER_INVARIANTS
-/* #warning WANT_COMPILER_INVARIANTS turned on */
+/* Define if you want assertions enabled. This is a cheap check. */
+#ifndef USED_FOR_TARGET
+#define ENABLE_ASSERT_CHECKING 1
+#endif
+
 
 /* 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
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_CHECKING */
+#endif
+
+
+/* Define to 1 to enable decimal float extension to C. */
+#ifndef USED_FOR_TARGET
+#define ENABLE_DECIMAL_FLOAT 0
+#endif
+
 
 /* Define if you want fold checked that it never destructs its argument. This
    is quite expensive. */
-#define ENABLE_FOLD_CHECKING 1
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_FOLD_CHECKING */
+#endif
+
 
 /* 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
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_GC_ALWAYS_COLLECT */
+#endif
+
 
 /* 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
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_GC_CHECKING */
+#endif
+
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_NLS */
+#endif
+
 
 /* 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
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_RTL_CHECKING */
+#endif
+
 
 /* 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
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_RTL_FLAG_CHECKING */
+#endif
+
+
+/* Define if you want runtime assertions enabled. This is a cheap check. */
+#define ENABLE_RUNTIME_CHECKING 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
+   moderately expensive. The tree browser debugging routines will also be
+   enabled by this option. */
+#ifndef USED_FOR_TARGET
+/* #undef ENABLE_TREE_CHECKING */
+#endif
+
 
 /* Define if you want to run subprograms and generated programs through
    valgrind (a memory checker). This is extremely expensive. */
+#ifndef USED_FOR_TARGET
 /* #undef ENABLE_VALGRIND_CHECKING */
+#endif
 
-#endif /* WANT_COMPILER_INVARIANTS */
 
-/* Define to 1 if installation paths should be looked up in Windows32
-   Registry. Ignored on non windows32 hosts. */
+/* Define to 1 if installation paths should be looked up in the Windows
+   Registry. Ignored on non-Windows hosts. */
+#ifndef USED_FOR_TARGET
 /* #undef ENABLE_WIN32_REGISTRY */
+#endif
+
+
+/* Define to the name of a file containing a list of extra machine modes for
+   this architecture. */
+#ifndef USED_FOR_TARGET
+/* #undef EXTRA_MODES_FILE */
+#endif
+
 
 /* Define to enable detailed memory allocation stats gathering. */
+#ifndef USED_FOR_TARGET
 /* #undef GATHER_STATISTICS */
+#endif
+
 
 /* Define to the type of elements in the array set by `getgroups'. Usually
    this is either `int' or `gid_t'. */
+#ifndef USED_FOR_TARGET
 #define GETGROUPS_T gid_t
+#endif
+
+
+/* Define if the zone collector is in use */
+#ifndef USED_FOR_TARGET
+/* #undef GGC_ZONE */
+#endif
+
+
+/* mcontext_t fields start with __ */
+#ifndef USED_FOR_TARGET
+/* #undef HAS_MCONTEXT_T_UNDERSCORES */
+#endif
+
 
 /* Define to 1 if you have the `alphasort' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_ALPHASORT 1
+#endif
+
 
 /* Define if your assembler supports dwarf2 .file/.loc directives, and
    preserves file table indices exactly as given. */
+#ifndef USED_FOR_TARGET
 #define HAVE_AS_DWARF2_DEBUG_LINE 1
+#endif
+
 
 /* Define if your assembler supports explicit relocations. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_AS_EXPLICIT_RELOCS */
+#endif
+
+
+/* Define if your assembler supports fprnd. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_AS_FPRND */
+#endif
+
 
 /* Define if your assembler supports the --gdwarf2 option. */
+#ifndef USED_FOR_TARGET
 #define HAVE_AS_GDWARF2_DEBUG_FLAG 1
+#endif
+
 
 /* Define true if the assembler supports '.long foo@GOTOFF'. */
+#ifndef USED_FOR_TARGET
 #define HAVE_AS_GOTOFF_IN_DATA 1
+#endif
+
 
 /* Define if your assembler supports the --gstabs option. */
+#ifndef USED_FOR_TARGET
 #define HAVE_AS_GSTABS_DEBUG_FLAG 1
+#endif
+
 
 /* Define if your assembler supports the Sun syntax for cmov. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */
+#endif
+
+
+/* Define if your assembler supports the ffreep mnemonic. */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_IX86_FFREEP 1
+#endif
+
+
+/* Define if your assembler supports the lituse_jsrdirect relocation. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_AS_JSRDIRECT_RELOCS */
+#endif
+
 
 /* Define if your assembler supports .sleb128 and .uleb128. */
+#ifndef USED_FOR_TARGET
 #define HAVE_AS_LEB128 1
+#endif
+
 
 /* Define if your assembler supports ltoffx and ldxmov relocations. */
-/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_LTOFFX_LDXMOV_RELOCS 1
+#endif
+
 
 /* Define if your assembler supports mfcr field. */
-/* #undef HAVE_AS_MFCRF */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_MFCRF 1
+#endif
+
 
 /* Define if your assembler supports the -no-mul-bug-abort option. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */
+#endif
+
 
 /* Define if your assembler supports offsetable %lo(). */
-/* #undef HAVE_AS_OFFSETABLE_LO10 */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_OFFSETABLE_LO10 1
+#endif
+
+
+/* Define if your assembler supports popcntb field. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_AS_POPCNTB */
+#endif
+
 
 /* Define if your assembler supports .register. */
-/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_REGISTER_PSEUDO_OP 1
+#endif
+
+
+/* Define if your assembler supports R_PPC_REL16 relocs. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_AS_REL16 */
+#endif
+
 
 /* Define if your assembler supports -relax option. */
-/* #undef HAVE_AS_RELAX_OPTION */
+#ifndef USED_FOR_TARGET
+# ifdef __sparc64__
+#  define HAVE_AS_RELAX_OPTION 1
+# endif
+#endif
+
 
 /* Define if your assembler and linker support unaligned PC relative relocs.
    */
-/* #undef HAVE_AS_SPARC_UA_PCREL */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_SPARC_UA_PCREL 1
+#endif
+
 
 /* Define if your assembler and linker support unaligned PC relative relocs
    against hidden symbols. */
-/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
+#ifndef USED_FOR_TARGET
+#define HAVE_AS_SPARC_UA_PCREL_HIDDEN 1
+#endif
+
 
 /* Define if your assembler supports thread-local storage. */
+#ifndef USED_FOR_TARGET
 #define HAVE_AS_TLS 1
+#endif
+
 
 /* Define to 1 if you have the `atoll' function. */
-#if __FreeBSD_version >= 500027
+#ifndef USED_FOR_TARGET
 #define HAVE_ATOLL 1
 #endif
 
+
 /* Define to 1 if you have the `atoq' function. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_ATOQ */
+#endif
+
+
+/* Define to 1 if you have the `clearerr_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_CLEARERR_UNLOCKED 1
+#endif
+
 
 /* Define to 1 if you have the `clock' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_CLOCK 1
+#endif
+
 
 /* Define if <time.h> defines clock_t. */
+#ifndef USED_FOR_TARGET
 #define HAVE_CLOCK_T 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define 0/1 if your assembler and linker support COMDAT groups. */
+#ifndef USED_FOR_TARGET
+#define HAVE_COMDAT_GROUP 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'abort', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_ABORT 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'asprintf', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_ASPRINTF 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_ATOF 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_ATOL 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'basename', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_BASENAME 0
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'calloc', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_CALLOC 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'clearerr_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_CLEARERR_UNLOCKED 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'clock', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_CLOCK 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'errno', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_ERRNO 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'feof_unlocked', otherwise define
+   to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FEOF_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'ferror_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FERROR_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'fflush_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FFLUSH_UNLOCKED 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'fgetc_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FGETC_UNLOCKED 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'fgets_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FGETS_UNLOCKED 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'fileno_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FILENO_UNLOCKED 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'fprintf_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_FPRINTF_UNLOCKED 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'fputc_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FPUTC_UNLOCKED 0
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'fputs_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_FPUTS_UNLOCKED 0
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'fread_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_FREAD_UNLOCKED 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'free', otherwise define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_FREE 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'fwrite_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_FWRITE_UNLOCKED 0
+#endif
+
+
+/* Define to 1 if we found a declaration for 'getchar_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_GETCHAR_UNLOCKED 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'getcwd', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_GETCWD 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'getc_unlocked', otherwise define
+   to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_GETC_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'getenv', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_GETENV 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'getopt', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_GETOPT 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'getpagesize', otherwise define
+   to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_GETPAGESIZE 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'getrlimit', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_GETRLIMIT 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'getrusage', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_GETRUSAGE 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'getwd', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_GETWD 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'ldgetname', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_LDGETNAME 0
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'malloc', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_MALLOC 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'putchar_unlocked', otherwise
+   define to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_PUTCHAR_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'putc_unlocked', otherwise define
+   to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_PUTC_UNLOCKED 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'realloc', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_REALLOC 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'sbrk', otherwise define to 0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_SBRK 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'setrlimit', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_SETRLIMIT 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'sigaltstack', otherwise define
+   to 0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_SIGALTSTACK 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'snprintf', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_SNPRINTF 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'strsignal', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_STRSIGNAL 1
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'strstr', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_STRSTR 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'strverscmp', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_STRVERSCMP 0
+#endif
+
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+/* Define to 1 if we found a declaration for 'times', otherwise define to 0.
+   */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_TIMES 1
+#endif
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
+
+/* Define to 1 if we found a declaration for 'vasprintf', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
 #define HAVE_DECL_VASPRINTF 1
+#endif
+
+
+/* Define to 1 if we found a declaration for 'vsnprintf', otherwise define to
+   0. */
+#ifndef USED_FOR_TARGET
+#define HAVE_DECL_VSNPRINTF 1
+#endif
+
 
 /* Define to 1 if you have the <direct.h> header file. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_DIRECT_H */
+#endif
 
-/* Define to 1 if you have the `dup2' function. */
-#define HAVE_DUP2 1
 
 /* Define to 1 if you have the <fcntl.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_FCNTL_H 1
+#endif
+
+
+/* Define to 1 if you have the `feof_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_FEOF_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if you have the `ferror_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_FERROR_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if you have the `fflush_unlocked' function. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_FFLUSH_UNLOCKED */
+#endif
+
+
+/* Define to 1 if you have the `fgetc_unlocked' function. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_FGETC_UNLOCKED */
+#endif
+
+
+/* Define to 1 if you have the `fgets_unlocked' function. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_FGETS_UNLOCKED */
+#endif
+
+
+/* Define to 1 if you have the `fileno_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_FILENO_UNLOCKED 1
+#endif
+
 
 /* Define to 1 if you have the `fork' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_FORK 1
+#endif
+
 
 /* Define to 1 if you have the `fprintf_unlocked' function. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_FPRINTF_UNLOCKED */
+#endif
+
 
 /* Define to 1 if you have the `fputc_unlocked' function. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_FPUTC_UNLOCKED */
+#endif
+
 
 /* Define to 1 if you have the `fputs_unlocked' function. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_FPUTS_UNLOCKED */
+#endif
+
+
+/* Define to 1 if you have the `fread_unlocked' function. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_FREAD_UNLOCKED */
+#endif
+
 
 /* Define to 1 if you have the `fwrite_unlocked' function. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_FWRITE_UNLOCKED */
+#endif
+
 
 /* Define if your assembler supports .balign and .p2align. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GAS_BALIGN_AND_P2ALIGN 1
+#endif
+
 
 /* Define if your assembler uses the new HImode fild and fist notation. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GAS_FILDS_FISTS 1
+#endif
+
 
 /* Define if your assembler and linker support .hidden. */
 #define HAVE_GAS_HIDDEN 1
 
 /* Define if your assembler supports specifying the maximum number of bytes to
    skip when using the GAS .p2align command. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GAS_MAX_SKIP_P2ALIGN 1
+#endif
+
+
+/* Define if your assembler supports .nsubspa comdat option. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_GAS_NSUBSPA_COMDAT */
+#endif
+
+
+/* Define if your assembler and linker support 32-bit section relative relocs
+   via '.secrel32 label'. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_GAS_PE_SECREL32_RELOC */
+#endif
+
 
 /* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.
    */
+#ifndef USED_FOR_TARGET
 #define HAVE_GAS_SHF_MERGE 1
+#endif
+
 
 /* Define if your assembler supports .subsection and .subsection -1 starts
    emitting at the beginning of your section. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GAS_SUBSECTION_ORDERING 1
+#endif
+
 
 /* Define if your assembler supports .weak. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GAS_WEAK 1
+#endif
+
+
+/* Define if your assembler supports .weakref. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_GAS_WEAKREF */
+#endif
+
+
+/* Define to 1 if you have the `getchar_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_GETCHAR_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if you have the `getc_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_GETC_UNLOCKED 1
+#endif
+
+
+/* Define to 1 if system unwind library has _Unwind_GetIPInfo. */
+#define HAVE_GETIPINFO 1
 
 /* Define to 1 if you have the `getrlimit' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GETRLIMIT 1
+#endif
+
 
 /* Define to 1 if you have the `getrusage' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GETRUSAGE 1
+#endif
+
 
 /* Define to 1 if you have the `gettimeofday' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_GETTIMEOFDAY 1
+#endif
+
 
 /* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+#ifndef USED_FOR_TARGET
+#define HAVE_ICONV 1
+#endif
+
 
 /* Define to 1 if you have the <iconv.h> header file. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_ICONV_H */
+#endif
+
 
 /* Define .init_array/.fini_array sections are available and working. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_INITFINI_ARRAY */
+#endif
+
 
 /* Define if you have a working <inttypes.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_INTTYPES_H 1
+#endif
+
 
 /* Define to 1 if you have the `kill' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_KILL 1
+#endif
+
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#ifndef USED_FOR_TARGET
+#define HAVE_LANGINFO_CODESET 1
+#endif
+
 
 /* Define to 1 if you have the <langinfo.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_LANGINFO_H 1
+#endif
+
 
 /* Define if your <locale.h> file defines LC_MESSAGES. */
+#ifndef USED_FOR_TARGET
 #define HAVE_LC_MESSAGES 1
+#endif
+
 
 /* Define to 1 if you have the <ldfcn.h> header file. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_LDFCN_H */
+#endif
+
 
 /* Define if your linker supports --as-needed and --no-as-needed options. */
-/* #undef HAVE_LD_AS_NEEDED */
+#ifndef USED_FOR_TARGET
+#define HAVE_LD_AS_NEEDED 1
+#endif
+
+
+/* Define if your linker supports --demangle option. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_LD_DEMANGLE */
+#endif
+
 
 /* Define if your linker supports --eh-frame-hdr option. */
 #define HAVE_LD_EH_FRAME_HDR 1
 
+/* Define if your PowerPC64 linker only needs function descriptor syms. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_LD_NO_DOT_SYMS */
+#endif
+
+
 /* Define if your linker supports -pie option. */
-/* #undef HAVE_LD_PIE */
+#ifndef USED_FOR_TARGET
+#define HAVE_LD_PIE 1
+#endif
+
 
 /* Define if your linker links a mix of read-only and read-write sections into
    a read-write section. */
+#ifndef USED_FOR_TARGET
 #define HAVE_LD_RO_RW_SECTION_MIXING 1
+#endif
+
+
+/* Define if your linker supports -Bstatic/-Bdynamic option. */
+#ifndef USED_FOR_TARGET
+#define HAVE_LD_STATIC_DYNAMIC 1
+#endif
+
+
+/* Define if your linker supports --sysroot. */
+#ifndef USED_FOR_TARGET
+/* #undef HAVE_LD_SYSROOT */
+#endif
+
 
 /* Define to 1 if you have the <limits.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_LIMITS_H 1
+#endif
+
 
 /* Define to 1 if you have the <locale.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_LOCALE_H 1
+#endif
+
 
-/* Define if your compiler supports the \`long long' type. */
+/* Define to 1 if the system has the type `long long'. */
+#ifndef USED_FOR_TARGET
 #define HAVE_LONG_LONG 1
+#endif
+
 
 /* Define to 1 if you have the <malloc.h> header file. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_MALLOC_H */
+#endif
+
 
 /* Define to 1 if you have the `mbstowcs' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MBSTOWCS 1
+#endif
+
 
 /* Define if valgrind's memcheck.h header is installed. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_MEMCHECK_H */
+#endif
+
 
 /* Define to 1 if you have the <memory.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MEMORY_H 1
+#endif
+
 
 /* Define to 1 if you have the `mincore' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MINCORE 1
+#endif
+
 
 /* Define to 1 if you have the `mmap' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MMAP 1
+#endif
+
 
 /* Define if mmap with MAP_ANON(YMOUS) works. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MMAP_ANON 1
+#endif
+
 
 /* Define if mmap of /dev/zero works. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MMAP_DEV_ZERO 1
+#endif
+
 
 /* Define if read-only mmap of a plain file works. */
+#ifndef USED_FOR_TARGET
 #define HAVE_MMAP_FILE 1
+#endif
+
 
 /* Define to 1 if you have the `nl_langinfo' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_NL_LANGINFO 1
+#endif
+
+
+/* Define to 1 if you have the `putchar_unlocked' function. */
+#ifndef USED_FOR_TARGET
+#define HAVE_PUTCHAR_UNLOCKED 1
+#endif
 
-/* Define if printf supports "%p". */
-#define HAVE_PRINTF_PTR 1
 
 /* Define to 1 if you have the `putc_unlocked' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_PUTC_UNLOCKED 1
+#endif
+
 
 /* Define to 1 if you have the `scandir' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SCANDIR 1
+#endif
+
 
 /* Define to 1 if you have the `setlocale' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SETLOCALE 1
+#endif
+
 
 /* Define to 1 if you have the `setrlimit' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SETRLIMIT 1
-
-/* Define if you have a working <stdbool.h> header file. */
-#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \
-    __FreeBSD_version >= 500014
-#define HAVE_STDBOOL_H 1
 #endif
 
+
 /* Define to 1 if you have the <stddef.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STDDEF_H 1
+#endif
+
 
 /* Define to 1 if you have the <stdint.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STDINT_H 1
+#endif
+
 
 /* Define to 1 if you have the <stdlib.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STDLIB_H 1
+#endif
+
 
 /* Define to 1 if you have the <strings.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STRINGS_H 1
+#endif
+
 
 /* Define to 1 if you have the <string.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STRING_H 1
+#endif
+
 
 /* Define to 1 if you have the `strsignal' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STRSIGNAL 1
+#endif
+
 
 /* Define if <sys/times.h> defines struct tms. */
+#ifndef USED_FOR_TARGET
 #define HAVE_STRUCT_TMS 1
+#endif
+
 
 /* Define to 1 if you have the `sysconf' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYSCONF 1
+#endif
+
 
 /* Define to 1 if you have the <sys/file.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_FILE_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_MMAN_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/param.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_PARAM_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/resource.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_RESOURCE_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_STAT_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/times.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_TIMES_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/time.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_TIME_H 1
+#endif
+
 
 /* Define to 1 if you have the <sys/types.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_TYPES_H 1
+#endif
+
 
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#ifndef USED_FOR_TARGET
 #define HAVE_SYS_WAIT_H 1
+#endif
+
 
 /* Define to 1 if you have the `times' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_TIMES 1
+#endif
+
 
 /* Define to 1 if you have the <time.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_TIME_H 1
+#endif
 
-/* Define if <sys/types.h> defines \`uchar'. */
-/* #undef HAVE_UCHAR */
 
 /* Define to 1 if you have the <unistd.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_UNISTD_H 1
+#endif
+
 
 /* Define if valgrind's valgrind/memcheck.h header is installed. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_VALGRIND_MEMCHECK_H */
+#endif
+
 
 /* Define to 1 if you have the `vfork' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_VFORK 1
+#endif
+
 
 /* Define to 1 if you have the <vfork.h> header file. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE_VFORK_H */
+#endif
+
 
 /* Define to 1 if you have the <wchar.h> header file. */
+#ifndef USED_FOR_TARGET
 #define HAVE_WCHAR_H 1
+#endif
+
 
 /* Define to 1 if you have the `wcswidth' function. */
+#ifndef USED_FOR_TARGET
 #define HAVE_WCSWIDTH 1
+#endif
+
 
 /* Define to 1 if `fork' works. */
+#ifndef USED_FOR_TARGET
 #define HAVE_WORKING_FORK 1
+#endif
+
 
 /* Define this macro if mbstowcs does not crash when its first argument is
    NULL. */
+#ifndef USED_FOR_TARGET
 #define HAVE_WORKING_MBSTOWCS 1
+#endif
+
 
 /* Define to 1 if `vfork' works. */
+#ifndef USED_FOR_TARGET
 #define HAVE_WORKING_VFORK 1
+#endif
 
-/* Define if the \`_Bool' type is built-in. */
-#define HAVE__BOOL 1
 
-/* Define if your compiler supports the \`__int64' type. */
+/* Define to 1 if the system has the type `__int64'. */
+#ifndef USED_FOR_TARGET
 /* #undef HAVE___INT64 */
-
-/* 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 */
+#ifndef USED_FOR_TARGET
+#define ICONV_CONST const
+#endif
+
 
 /* Define if host mkdir takes a single argument. */
+#ifndef USED_FOR_TARGET
 /* #undef MKDIR_TAKES_ONE_ARG */
+#endif
+
 
 /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
+#ifndef USED_FOR_TARGET
 #define NEED_64BIT_HOST_WIDE_INT 1
+#endif
+
 
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#ifndef USED_FOR_TARGET
 /* #undef NO_MINUS_C_MINUS_O */
+#endif
+
 
 /* Define to the address where bug reports for this package should be sent. */
+#ifndef USED_FOR_TARGET
 #define PACKAGE_BUGREPORT ""
+#endif
+
 
 /* Define to the full name of this package. */
+#ifndef USED_FOR_TARGET
 #define PACKAGE_NAME ""
+#endif
+
 
 /* Define to the full name and version of this package. */
+#ifndef USED_FOR_TARGET
 #define PACKAGE_STRING ""
+#endif
+
 
 /* Define to the one symbol short name of this package. */
+#ifndef USED_FOR_TARGET
 #define PACKAGE_TARNAME ""
+#endif
+
 
 /* Define to the version of this package. */
+#ifndef USED_FOR_TARGET
 #define PACKAGE_VERSION ""
+#endif
+
 
 /* Define to PREFIX/include if cpp should also search that directory. */
+#ifndef USED_FOR_TARGET
 /* #undef PREFIX_INCLUDE_DIR */
+#endif
+
 
-/* The number of bytes in type int */
+/* The size of a `int', as computed by sizeof. */
+#ifndef USED_FOR_TARGET
 #define SIZEOF_INT 4
+#endif
+
 
-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
-/* 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."
+/* The size of a `long', as computed by sizeof. */
+#ifndef USED_FOR_TARGET
+#define SIZEOF_LONG 4
 #endif
 
-/* The number of bytes in type long long */
+
+/* The size of a `long long', as computed by sizeof. */
+#ifndef USED_FOR_TARGET
 #define SIZEOF_LONG_LONG 8
+#endif
 
-/* The number of bytes in type short */
+
+/* The size of a `short', as computed by sizeof. */
+#ifndef USED_FOR_TARGET
 #define SIZEOF_SHORT 2
+#endif
 
-/* The number of bytes in type void * */
-#define SIZEOF_VOID_P SIZEOF_LONG
 
-/* The number of bytes in type __int64 */
+/* The size of a `void *', as computed by sizeof. */
+#ifndef USED_FOR_TARGET
+#define SIZEOF_VOID_P 4
+#endif
+
+
+/* The size of a `__int64', as computed by sizeof. */
+#ifndef USED_FOR_TARGET
 /* #undef SIZEOF___INT64 */
+#endif
+
 
 /* Define to 1 if you have the ANSI C header files. */
+#ifndef USED_FOR_TARGET
 #define STDC_HEADERS 1
+#endif
+
 
 /* Define if you can safely include both <string.h> and <strings.h>. */
+#ifndef USED_FOR_TARGET
 #define STRING_WITH_STRINGS 1
+#endif
+
+
+/* Define if TFmode long double should be the default */
+#ifndef USED_FOR_TARGET
+/* #undef TARGET_DEFAULT_LONG_DOUBLE_128 */
+#endif
+
+
+/* Define if your target C library provides stack protector support */
+#ifndef USED_FOR_TARGET
+#define TARGET_LIBC_PROVIDES_SSP 1
+#endif
+
 
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#ifndef USED_FOR_TARGET
 #define TIME_WITH_SYS_TIME 1
+#endif
+
 
 /* Define if your assembler mis-optimizes .eh_frame data. */
+#ifndef USED_FOR_TARGET
 /* #undef USE_AS_TRADITIONAL_FORMAT */
+#endif
+
+
+/* Define to 1 if the 'long long' (or '__int64') is wider than 'long' but
+   still efficiently supported by the host hardware. */
+#ifndef USED_FOR_TARGET
+/* #undef USE_LONG_LONG_FOR_WIDEST_FAST_INT */
+#endif
+
+
+/* Define if location_t is fileline integer cookie. */
+#ifndef USED_FOR_TARGET
+/* #undef USE_MAPPED_LOCATION */
+#endif
 
-/* Define if gcc should use -lunwind. */
-/* #undef USE_LIBUNWIND_EXCEPTIONS */
 
-/* Define to be the last portion of registry key on windows hosts. */
+/* Define to be the last component of the Windows registry key under which to
+   look for installation paths. The full key used will be
+   HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}.
+   The default is the GCC version number. */
+#ifndef USED_FOR_TARGET
 /* #undef WIN32_REGISTRY_KEY */
+#endif
+
 
-/* whether byteorder is bigendian */
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#ifndef USED_FOR_TARGET
 /* #undef WORDS_BIGENDIAN */
+#endif
+
 
 /* Always define this when using the GNU C Library */
+#ifndef USED_FOR_TARGET
 /* #undef _GNU_SOURCE */
+#endif
+
 
 /* Define to `int' if <sys/types.h> doesn't define. */
+#ifndef USED_FOR_TARGET
 /* #undef gid_t */
+#endif
+
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define to `int' if <sys/types.h> does not define. */
+#ifndef USED_FOR_TARGET
 /* #undef pid_t */
+#endif
+
 
 /* Define to \`long' if <sys/resource.h> doesn't define. */
+#ifndef USED_FOR_TARGET
 /* #undef rlim_t */
+#endif
+
 
 /* Define to `int' if <sys/types.h> does not define. */
+#ifndef USED_FOR_TARGET
 /* #undef ssize_t */
+#endif
+
 
 /* Define to `int' if <sys/types.h> doesn't define. */
+#ifndef USED_FOR_TARGET
 /* #undef uid_t */
+#endif
+
 
 /* Define as `fork' if `vfork' does not work. */
+#ifndef USED_FOR_TARGET
 /* #undef vfork */
+#endif
+
+/* Override SIZEOF_?? using proper values. */
+#include <size-host.h>
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index 095bd2c..f798709 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -8,15 +8,15 @@
 
 /* Fake out gcc/config/freebsd<version>.h.  */
 #define	FBSD_MAJOR	7
-#define	FBSD_CC_VER	700002		/* form like __FreeBSD_version */
+#define	FBSD_CC_VER	700003		/* form like __FreeBSD_version */
 
 #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
 #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */
 #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.4"
-#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.4/backward"
+#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/4.2"
+#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/4.2/backward"
 #define GCC_INCLUDE_DIR			PREFIX"/include"
 #ifdef CROSS_COMPILE
 #define CROSS_INCLUDE_DIR		PREFIX"/include"
@@ -28,9 +28,9 @@
    /usr/libexec directory.
 
    ``cc --print-search-dirs'' gives:
-   install: STANDARD_EXEC_PREFIX/(null)
-   programs: /usr/libexec/<OBJFORMAT>/:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
-   libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX
+   install: STANDARD_EXEC_PREFIX/
+   programs: STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
+   libraries: STANDARD_STARTFILE_PREFIX
 */
 #undef	STANDARD_BINDIR_PREFIX		/* We don't need one for now. */
 #define	STANDARD_EXEC_PREFIX		PREFIX"/libexec/"
@@ -46,20 +46,19 @@
 #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.  */
+#if 0
 #define LIBGCC_SPEC		"%{shared: -lgcc_pic} \
     %{!shared: %{!pg: -lgcc} %{pg: -lgcc_p}}"
+#endif
 #define LIBSTDCXX_PROFILE	"-lstdc++_p"
 #define MATH_LIBRARY_PROFILE	"-lm_p"
 #define FORTRAN_LIBRARY_PROFILE	"-lg2c_p"
 
+#define LIBGCC_SPEC		"-lgcc"
+/* For the native system compiler, we actually build libgcc in a profiled
+   version.  So we should use it with -pg.  */
+#define LIBGCC_STATIC_LIB_SPEC	  "%{pg: -lgcc_p;:-lgcc}"
+#define LIBGCC_EH_STATIC_LIB_SPEC "%{pg: -lgcc_eh_p;:-lgcc_eh}"
+
 /* FreeBSD is 4.4BSD derived */
 #define bsd4_4
-
-/* And now they want to replace ctype.h.... grr... [stupid, IMHO] */
-#define xxxISDIGIT	isdigit
-#define xxxISGRAPH	isgraph
-#define xxxISLOWER	islower
-#define xxxISSPACE	isspace
-#define xxxTOUPPER	toupper
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd.opt b/gnu/usr.bin/cc/cc_tools/freebsd.opt
new file mode 100644
index 0000000..f71a505
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_tools/freebsd.opt
@@ -0,0 +1,6 @@
+; $FreeBSD$
+
+fformat-extensions
+Common Report Var(flag_format_extensions) Init(0)
+Allow FreeBSD kernel-specific printf format specifiers.
+
diff --git a/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt b/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
new file mode 100644
index 0000000..ca71a8b
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_tools/i386-freebsd.opt
@@ -0,0 +1,13 @@
+; $FreeBSD$
+
+mno-align-long-strings
+Target RejectNegative Report Mask(NO_ALIGN_LONG_STRINGS)
+Do not align long strings specially
+
+malign-long-strings
+Target RejectNegative Report InverseMask(NO_ALIGN_LONG_STRINGS, ALIGN_LONG_STRINGS) Undocumented
+
+mprofiler-epilogue
+Target Report Mask(PROFILER_EPILOGUE)
+Function profiler epilogue
+
diff --git a/gnu/usr.bin/cc/cc_tools/size-host.h b/gnu/usr.bin/cc/cc_tools/size-host.h
new file mode 100644
index 0000000..8d5136f
--- /dev/null
+++ b/gnu/usr.bin/cc/cc_tools/size-host.h
@@ -0,0 +1,47 @@
+/* $FreeBSD$ */
+
+#ifdef	SIZEOF_INT
+# undef	SIZEOF_INT
+#endif
+
+#ifdef	SIZEOF_SHORT
+# undef	SIZEOF_SHORT
+#endif
+
+#ifdef	SIZEOF_LONG
+# undef	SIZEOF_LONG
+#endif
+
+#ifdef	SIZEOF_VOID_P
+# undef	SIZEOF_VOID_P
+#endif
+
+#ifdef	SIZEOF_LONG_LONG
+# undef	SIZEOF_LONG_LONG
+#endif
+
+#ifdef  HOST_WIDE_INT
+# undef	HOST_WIDE_INT
+#endif
+
+#define SIZEOF_INT		4
+#define SIZEOF_SHORT		2
+#define	SIZEOF_LONG_LONG	8
+
+#if __LP64__
+#define	SIZEOF_LONG		8
+#define	SIZEOF_VOID_P		8
+#define	HOST_WIDE_INT		long
+#else
+#define	SIZEOF_LONG		4
+#define	SIZEOF_VOID_P		4
+#define	HOST_WIDE_INT		long long
+#endif
+
+#ifdef WORDS_BIGENDIAN
+#undef WORDS_BIGENDIAN
+#endif
+
+#if defined(__sparc64__) || defined(__ARMEB__)
+#define WORDS_BIGENDIAN		1
+#endif
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index cbac743..4193bd4 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
+
 .include "../Makefile.inc"
 .include "../Makefile.fe"
 
-.PATH: ${GCCDIR} ${GCCDIR}/doc
-
 PROG=	cpp
-SRCS=	gcc.c cppspec.c
-
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
+SRCS+=	cppspec.c
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index af20541..4139769 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+.include "../Makefile.ver"
 
-.PATH: ${GCCDIR}/doc
+.PATH: ${GCCDIR}/doc ${GCCDIR}/doc/include
 
 INFO=	gcc cpp gccint cppinternals
 
@@ -12,21 +13,38 @@ INFOENTRY_cpp=  "* cpp: (cpp).			The GNU C pre-processor."
 INFOENTRY_gccint= "* gccint: (gccint).		The GNU compiler family internal documentation."
 INFOENTRY_cppinternals= "* cppinternals: (cppinternals).		The GNU compiler preprocessor internal documentation."
 
-gcc.info: gcc.texi include/gcc-common.texi frontends.texi standards.texi \
-    invoke.texi extend.texi md.texi objc.texi gcov.texi trouble.texi \
-    bugreport.texi service.texi contribute.texi compat.texi \
-    include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
-    contrib.texi cppenv.texi cppopts.texi
+gcc.info: gcc.texi gcc-common.texi gcc-vers.texi frontends.texi		\
+	 standards.texi invoke.texi extend.texi md.texi objc.texi	\
+	 gcov.texi trouble.texi bugreport.texi service.texi		\
+	 contribute.texi compat.texi funding.texi gnu.texi gpl.texi	\
+	 fdl.texi contrib.texi cppenv.texi cppopts.texi			\
+	 implement-c.texi
 
-gccint.info: gccint.texi include/gcc-common.texi contribute.texi \
-    makefile.texi configterms.texi portability.texi interface.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 libgcc.texi
+gccint.info: gccint.texi gcc-common.texi gcc-vers.texi			\
+	 contribute.texi makefile.texi configterms.texi options.texi	\
+	 portability.texi interface.texi passes.texi c-tree.texi	\
+	 rtl.texi md.texi tm.texi hostconfig.texi fragments.texi	\
+	 configfiles.texi collect2.texi headerdirs.texi funding.texi	\
+	 gnu.texi gpl.texi fdl.texi contrib.texi languages.texi		\
+	 sourcebuild.texi gty.texi libgcc.texi cfg.texi tree-ssa.texi	\
+	 loop.texi
 
-cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi
+cpp.info: cpp.texi fdl.texi cppenv.texi cppopts.texi gcc-common.texi \
+	gcc-vers.texi
+
+cppinternals.info:  cppinternals.texi gcc-common.texi gcc-vers.texi
 
 MAKEINFOFLAGS+= -I ${GCCDIR}/doc -I ${GCCDIR}/doc/include
 
+gcc-vers.texi:
+	(echo "@set version-GCC $(BASEVER)"; \
+	if [ "$(DEVPHASE)" = "experimental" ]; then \
+		echo "@set DEVELOPMENT"; \
+	else \
+		echo "@clear DEVELOPMENT"; \
+	fi; \
+	echo "@set srcdir $(GCCLIB)/libiberty" ) > ${.TARGET}
+
+CLEANFILES+=    gcc-vers.texi
+
 .include <bsd.info.mk>
diff --git a/gnu/usr.bin/cc/gcov/Makefile b/gnu/usr.bin/cc/gcov/Makefile
index adb2ac1..f48d177 100644
--- a/gnu/usr.bin/cc/gcov/Makefile
+++ b/gnu/usr.bin/cc/gcov/Makefile
@@ -1,13 +1,15 @@
 # $FreeBSD$
 
 .include "../Makefile.inc"
+.include "../Makefile.ver"
 
 .PATH: ${GCCDIR} ${GCCDIR}/doc
 
 PROG=	gcov
-SRCS=	gcov.c version.c
+SRCS=	gcov.c version.c errors.c
+MAN=	gcov.1
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
+DPADD=	${LIBIBERTY}
+LDADD=	${LIBIBERTY}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index 6318617..875cc1f 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -5,7 +5,7 @@
 .PATH: ${GCCDIR}/config/${GCC_CPU}
 
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
-INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h
+INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h mm_malloc.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"
@@ -14,7 +14,10 @@ INCS=	mmintrin.h
 INCS=	ppc-asm.h altivec.h spe.h
 .endif
 
-NO_OBJ=
+mm_malloc.h: pmm_malloc.h
+	@rm -rf ${.TARGET}
+	@cp ${.ALLSRC} ${.TARGET}
+CLEANFILES+=	mm_malloc.h
 
 .include <bsd.init.mk>
 .include <bsd.incs.mk>
diff --git a/gnu/usr.bin/cc/libcpp/Makefile b/gnu/usr.bin/cc/libcpp/Makefile
new file mode 100644
index 0000000..23bc26e
--- /dev/null
+++ b/gnu/usr.bin/cc/libcpp/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+# Use our headers in preference to ones from ../cc_tools.
+CFLAGS+=	-I${.CURDIR} -I.
+
+.include "../Makefile.inc"
+
+.PATH: ${GCCLIB}/libcpp
+
+LIB=	cpp
+SRCS=	localedir.h
+SRCS+=	charset.c directives.c errors.c expr.c files.c \
+	identifiers.c init.c lex.c line-map.c macro.c mkdeps.c \
+	pch.c symtab.c traditional.c
+INTERNALLIB=
+WARNS?=	1
+
+localedir.h:	Makefile
+	echo	'#define LOCALEDIR "/usr/share/locale"' > localedir.h
+SRCS+=		localedir.h
+CLEANFILES+=	localedir.h
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/libcpp/config.h b/gnu/usr.bin/cc/libcpp/config.h
new file mode 100644
index 0000000..5577f28
--- /dev/null
+++ b/gnu/usr.bin/cc/libcpp/config.h
@@ -0,0 +1,292 @@
+/* config.h.  Generated by configure.  */
+/* config.in.  Generated from configure.ac by autoheader.  */
+/* $FreeBSD$ */
+
+/* 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 to 1 if using `alloca.c'. */
+/* #undef C_ALLOCA */
+
+/* Define if you want more run-time sanity checks. */
+/* #undef ENABLE_CHECKING */
+
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+/* #undef ENABLE_NLS */
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+#define HAVE_ALLOCA 1
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `clearerr_unlocked' function. */
+#define HAVE_CLEARERR_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `abort', and to 0 if you don't.
+   */
+#define HAVE_DECL_ABORT 1
+
+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_ASPRINTF 1
+
+/* Define to 1 if you have the declaration of `basename', and to 0 if you
+   don't. */
+#define HAVE_DECL_BASENAME 0
+
+/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_CLEARERR_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `errno', and to 0 if you don't.
+   */
+#define HAVE_DECL_ERRNO 0
+
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_FEOF_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FERROR_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FFLUSH_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fgetc_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FGETC_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FGETS_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fileno_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FILENO_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `fprintf_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FPRINTF_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FPUTC_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FPUTS_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FREAD_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_FWRITE_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_GETCHAR_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_GETC_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
+   */
+#define HAVE_DECL_GETOPT 1
+
+/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
+   you don't. */
+#define HAVE_DECL_PUTCHAR_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
+   don't. */
+#define HAVE_DECL_PUTC_UNLOCKED 1
+
+/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_VASPRINTF 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `feof_unlocked' function. */
+#define HAVE_FEOF_UNLOCKED 1
+
+/* Define to 1 if you have the `ferror_unlocked' function. */
+#define HAVE_FERROR_UNLOCKED 1
+
+/* Define to 1 if you have the `fflush_unlocked' function. */
+/* #undef HAVE_FFLUSH_UNLOCKED */
+
+/* Define to 1 if you have the `fgetc_unlocked' function. */
+/* #undef HAVE_FGETC_UNLOCKED */
+
+/* Define to 1 if you have the `fgets_unlocked' function. */
+/* #undef HAVE_FGETS_UNLOCKED */
+
+/* Define to 1 if you have the `fileno_unlocked' function. */
+#define HAVE_FILENO_UNLOCKED 1
+
+/* Define to 1 if you have the `fprintf_unlocked' function. */
+/* #undef HAVE_FPRINTF_UNLOCKED */
+
+/* Define to 1 if you have the `fputc_unlocked' function. */
+/* #undef HAVE_FPUTC_UNLOCKED */
+
+/* Define to 1 if you have the `fputs_unlocked' function. */
+/* #undef HAVE_FPUTS_UNLOCKED */
+
+/* Define to 1 if you have the `fread_unlocked' function. */
+/* #undef HAVE_FREAD_UNLOCKED */
+
+/* Define to 1 if you have the `fwrite_unlocked' function. */
+/* #undef HAVE_FWRITE_UNLOCKED */
+
+/* Define to 1 if you have the `getchar_unlocked' function. */
+#define HAVE_GETCHAR_UNLOCKED 1
+
+/* Define to 1 if you have the `getc_unlocked' function. */
+#define HAVE_GETC_UNLOCKED 1
+
+/* Define if you have the iconv() function. */
+#if XXXKAN
+#define HAVE_ICONV 1
+#endif
+
+/* Define to 1 if you have the <iconv.h> header file. */
+/* #undef HAVE_ICONV_H */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#define HAVE_LANGINFO_CODESET 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if libc includes obstacks. */
+/* #undef HAVE_OBSTACK */
+
+/* Define to 1 if you have the `putchar_unlocked' function. */
+#define HAVE_PUTCHAR_UNLOCKED 1
+
+/* Define to 1 if you have the `putc_unlocked' function. */
+#define HAVE_PUTC_UNLOCKED 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if <sys/types.h> defines \`uchar'. */
+/* #undef HAVE_UCHAR */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the widest efficient host integer type at least as wide as the
+   target's size_t type. */
+#define HOST_WIDE_INT long
+
+#if XXXKAN
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST const
+#endif
+
+/* Define to the name of this package. */
+#define PACKAGE "cpplib"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "gcc-bugs@gcc.gnu.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "cpplib"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "cpplib  "
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "cpplib"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION " "
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 4
+
+/* 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 to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <string.h> and <strings.h>. */
+#define STRING_WITH_STRINGS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+typedef unsigned char uchar;
+
+#include <size-host.h>
diff --git a/gnu/usr.bin/cc/libdecnumber/Makefile b/gnu/usr.bin/cc/libdecnumber/Makefile
new file mode 100644
index 0000000..82df5a9
--- /dev/null
+++ b/gnu/usr.bin/cc/libdecnumber/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+# Use our headers in preference to ones from ../cc_tools.
+CFLAGS+=	-I${.CURDIR} -I.
+
+.include "../Makefile.inc"
+
+.PATH: ${GCCLIB}/libdecnumber
+
+LIB=	decnumber
+SRCS=	decNumber.c decContext.c decUtility.c \
+        decimal32.c decimal64.c decimal128.c
+
+INTERNALLIB=
+WARNS?=	1
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/libdecnumber/config.h b/gnu/usr.bin/cc/libdecnumber/config.h
new file mode 100644
index 0000000..53b586f
--- /dev/null
+++ b/gnu/usr.bin/cc/libdecnumber/config.h
@@ -0,0 +1,80 @@
+/* config.h.  Generated by configure.  */
+/* config.in.  Generated from configure.ac by autoheader.  */
+/* $FreeBSD$ */
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "gcc-bugs@gcc.gnu.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libdecnumber"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libdecnumber  "
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libdecnumber"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION " "
+
+/* The size of a `char', as computed by sizeof. */
+/* #undef SIZEOF_CHAR */
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* The size of a `long', as computed by sizeof. */
+#define SIZEOF_LONG 8
+
+/* The size of a `short', as computed by sizeof. */
+/* #undef SIZEOF_SHORT */
+
+/* The size of a `void *', as computed by sizeof. */
+/* #undef SIZEOF_VOID_P */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `long' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+#include <size-host.h>
diff --git a/gnu/usr.bin/cc/libiberty/Makefile b/gnu/usr.bin/cc/libiberty/Makefile
new file mode 100644
index 0000000..7446793
--- /dev/null
+++ b/gnu/usr.bin/cc/libiberty/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+#
+# Make sure we will pick up our config.h file first, not the one from
+# cc_tools.
+#
+CFLAGS+=	-I${.CURDIR}
+
+.include "../Makefile.inc"
+
+.PATH: ${GCCLIB}/libiberty
+
+LIB=	iberty
+SRCS=	argv.c choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
+	dyn-string.c fibheap.c fopen_unlocked.c getpwd.c getruntime.c \
+	hashtab.c hex.c lbasename.c make-temp-file.c md5.c obstack.c \
+	partition.c pex-unix.c physmem.c safe-ctype.c splay-tree.c xexit.c \
+	xmalloc.c xmemdup.c xstrdup.c xstrerror.c make-relative-prefix.c \
+	pexecute.c pex-common.c pex-one.c lrealpath.c strverscmp.c \
+	regex.c
+INTERNALLIB=
+WARNS?=	1
+
+CFLAGS+=	-UPREFIX
+
+.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/libiberty/config.h b/gnu/usr.bin/cc/libiberty/config.h
new file mode 100644
index 0000000..0fc8ed6
--- /dev/null
+++ b/gnu/usr.bin/cc/libiberty/config.h
@@ -0,0 +1,448 @@
+/* config.h.  Generated by configure.  */
+/* config.in.  Generated from configure.ac by autoheader.  */
+/* $FreeBSD$ */
+
+/* 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 to 1 if you have the <alloca.h> header file. */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
+/* Define to 1 if you have the `atexit' function. */
+#define HAVE_ATEXIT 1
+
+/* Define to 1 if you have the `basename' function. */
+#define HAVE_BASENAME 1
+
+/* Define to 1 if you have the `bcmp' function. */
+#define HAVE_BCMP 1
+
+/* Define to 1 if you have the `bcopy' function. */
+#define HAVE_BCOPY 1
+
+/* Define to 1 if you have the `bsearch' function. */
+#define HAVE_BSEARCH 1
+
+/* Define to 1 if you have the `bzero' function. */
+#define HAVE_BZERO 1
+
+/* Define to 1 if you have the `calloc' function. */
+#define HAVE_CALLOC 1
+
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+/* #undef HAVE_CANONICALIZE_FILE_NAME */
+
+/* Define to 1 if you have the `clock' function. */
+#define HAVE_CLOCK 1
+
+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_ASPRINTF 1
+
+/* Define to 1 if you have the declaration of `basename', and to 0 if you
+   don't. */
+#define HAVE_DECL_BASENAME 0
+
+/* Define to 1 if you have the declaration of `calloc', and to 0 if you don't.
+   */
+#define HAVE_DECL_CALLOC 1
+
+/* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */
+#define HAVE_DECL_FFS 1
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#define HAVE_DECL_GETENV 1
+
+/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
+   */
+#define HAVE_DECL_GETOPT 1
+
+/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
+   */
+#define HAVE_DECL_MALLOC 1
+
+/* Define to 1 if you have the declaration of `realloc', and to 0 if you
+   don't. */
+#define HAVE_DECL_REALLOC 1
+
+/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
+   */
+#define HAVE_DECL_SBRK 1
+
+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_SNPRINTF 1
+
+/* Define to 1 if you have the declaration of `strverscmp', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRVERSCMP 0
+
+/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_VASPRINTF 1
+
+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
+   don't. */
+#define HAVE_DECL_VSNPRINTF 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `ffs' function. */
+#define HAVE_FFS 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
+
+/* Define to 1 if you have the `getrusage' function. */
+#define HAVE_GETRUSAGE 1
+
+/* Define to 1 if you have the `getsysinfo' function. */
+/* #undef HAVE_GETSYSINFO */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `index' function. */
+#define HAVE_INDEX 1
+
+/* Define to 1 if you have the `insque' function. */
+#define HAVE_INSQUE 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */
+/* #undef HAVE_MACHINE_HAL_SYSINFO_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the `memchr' function. */
+#define HAVE_MEMCHR 1
+
+/* Define to 1 if you have the `memcmp' function. */
+#define HAVE_MEMCMP 1
+
+/* Define to 1 if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mempcpy' function. */
+/* #undef HAVE_MEMPCPY */
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `mkstemps' function. */
+#define HAVE_MKSTEMPS 1
+
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `on_exit' function. */
+/* #undef HAVE_ON_EXIT */
+
+/* Define to 1 if you have the `psignal' function. */
+#define HAVE_PSIGNAL 1
+
+/* Define to 1 if you have the `pstat_getdynamic' function. */
+/* #undef HAVE_PSTAT_GETDYNAMIC */
+
+/* Define to 1 if you have the `pstat_getstatic' function. */
+/* #undef HAVE_PSTAT_GETSTATIC */
+
+/* Define to 1 if you have the `putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the `random' function. */
+#define HAVE_RANDOM 1
+
+/* Define to 1 if you have the `realpath' function. */
+#define HAVE_REALPATH 1
+
+/* Define to 1 if you have the `rename' function. */
+#define HAVE_RENAME 1
+
+/* Define to 1 if you have the `rindex' function. */
+#define HAVE_RINDEX 1
+
+/* Define to 1 if you have the `sbrk' function. */
+#define HAVE_SBRK 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `sigsetmask' function. */
+#define HAVE_SIGSETMASK 1
+
+/* Define to 1 if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio_ext.h> header file. */
+/* #undef HAVE_STDIO_EXT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
+
+/* Define to 1 if you have the `stpncpy' function. */
+/* #undef HAVE_STPNCPY */
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the `strndup' function. */
+/* #undef HAVE_STRNDUP */
+
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the `strtod' function. */
+#define HAVE_STRTOD 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* Define to 1 if you have the `strverscmp' function. */
+/* #undef HAVE_STRVERSCMP */
+
+/* Define to 1 if you have the `sysconf' function. */
+#define HAVE_SYSCONF 1
+
+/* Define to 1 if you have the `sysctl' function. */
+#define HAVE_SYSCTL 1
+
+/* Define to 1 if you have the `sysmp' function. */
+/* #undef HAVE_SYSMP */
+
+/* Define if you have the sys_errlist variable. */
+#define HAVE_SYS_ERRLIST 1
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
+/* Define if you have the sys_nerr variable. */
+#define HAVE_SYS_NERR 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/pstat.h> header file. */
+/* #undef HAVE_SYS_PSTAT_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define if you have the sys_siglist variable. */
+#define HAVE_SYS_SIGLIST 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/sysinfo.h> header file. */
+/* #undef HAVE_SYS_SYSINFO_H */
+
+/* Define to 1 if you have the <sys/sysmp.h> header file. */
+/* #undef HAVE_SYS_SYSMP_H */
+
+/* Define to 1 if you have the <sys/systemcfg.h> header file. */
+/* #undef HAVE_SYS_SYSTEMCFG_H */
+
+/* Define to 1 if you have the <sys/table.h> header file. */
+/* #undef HAVE_SYS_TABLE_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 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 you have the `table' function. */
+/* #undef HAVE_TABLE */
+
+/* Define to 1 if you have the `times' function. */
+#define HAVE_TIMES 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the `tmpnam' function. */
+#define HAVE_TMPNAM 1
+
+/* Define if you have the \`uintptr_t' type. */
+#define HAVE_UINTPTR_T 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 if you have the `vfprintf' function. */
+#define HAVE_VFPRINTF 1
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `vsprintf' function. */
+#define HAVE_VSPRINTF 1
+
+/* Define to 1 if you have the `wait3' function. */
+#define HAVE_WAIT3 1
+
+/* Define to 1 if you have the `wait4' function. */
+#define HAVE_WAIT4 1
+
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* Define to 1 if you have the `_doprnt' function. */
+/* #undef HAVE__DOPRNT */
+
+/* Define if you have the _system_configuration variable. */
+/* #undef HAVE__SYSTEM_CONFIGURATION */
+
+/* Define to 1 if you have the `__fsetlocking' function. */
+/* #undef HAVE___FSETLOCKING */
+
+/* Define if canonicalize_file_name is not declared in system header files. */
+#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1
+
+/* Define if errno must be declared even when <errno.h> is included. */
+/* #undef NEED_DECLARATION_ERRNO */
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* The size of a `int', as computed by sizeof. */
+#define SIZEOF_INT 4
+
+/* 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 */
+#define STACK_DIRECTION -1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to an unsigned 64-bit type available in the compiler. */
+#define UNSIGNED_64BIT_TYPE uint64_t
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned long' if <sys/types.h> does not define. */
+/* #undef uintptr_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
+
+#include <size-host.h>