Bmake glue for GCC 3.4.2-prerelease.

24 files changed, 1345 insertions, 1210 deletions

diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index dc4139b..14be4c1 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -6,14 +6,14 @@ CCDIR=	${.CURDIR}/../../usr.bin/cc
 
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
-SRCS=		crtstuff.c tconfig.h
+SRCS=		crtstuff.c tconfig.h tm.h
 OBJS=		crtbegin.o crtend.o
 SOBJS=		crtbegin.So crtend.So
 CSTD?=		gnu89
 CFLAGS+=	-DIN_GCC -DHAVE_LD_EH_FRAME_HDR
 CFLAGS+=	-finhibit-size-directive -fno-inline-functions \
 		-fno-exceptions -fno-zero-initialized-in-bss \
-		-fno-omit-frame-pointer
+		-fno-omit-frame-pointer -fno-unit-at-a-time
 CFLAGS+=	-I${GCCDIR}/config -I${GCCDIR} -I. \
 		-I${CCDIR}/cc_tools
 CRTS_CFLAGS=	-DCRTSTUFFS_O -DSHARED ${PICFLAG}
@@ -38,7 +38,7 @@ BEGINSRC?=	crtstuff.c
 ENDSRC?=	crtstuff.c
 
 all: ${OBJS} ${SOBJS} ${TGTOBJS}
-${OBJS} ${SOBJS}: tconfig.h
+${OBJS} ${SOBJS}: tm.h
 
 CLEANFILES=	${OBJS} ${SOBJS} ${TGTOBJS}
 
@@ -58,8 +58,8 @@ crtend.So:	${ENDSRC}
 	${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \
 		-c -o ${.TARGET} ${.ALLSRC:N*.h}
 
-CLEANFILES+=	tconfig.h
-tconfig.h: ${CCDIR}/cc_tools/Makefile
+CLEANFILES+=	tm.h tconfig.h
+tm.h tconfig.h: ${CCDIR}/cc_tools/Makefile
 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
 
 realinstall:
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 380d999..dc71a21 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -59,7 +59,7 @@ U77SRCS=	gerror_.c perror_.c ierrno_.c itime_.c time_.c \
 		etime_.c dtime_.c isatty_.c ltime_.c fstat_.c stat_.c \
 		lstat_.c access_.c link_.c getlog_.c ttynam_.c getcwd_.c \
 		symlnk_.c vxttime_.c vxtidate_.c gmtime_.c fdate_.c \
-		secnds_.c bes.c dbes.c chdir_.c chmod_.c lnblnk_.c \
+		secnds_.c chdir_.c chmod_.c lnblnk_.c \
 		hostnm_.c rename_.c fgetc_.c fputc_.c umask_.c \
 		sys_clock_.c date_.c second_.c flush1_.c mclock_.c \
 		alarm_.c datetime_.c
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 5da4c09..f272e65 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -44,41 +44,43 @@ OBJS=		# added to below in various ways depending on TARGET_ARCH
 #
 # When upgrading GCC, get the following defintions straight from Makefile.in
 #
-
 # Library members defined in libgcc2.c.
-# Variable length limited to 255 charactes when passed to a shell script.
-LIB2FUNCS_1 = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 _clz \
-    _cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \
-    _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi
-
-LIB2FUNCS_2 = _floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf \
-    _clear_cache _trampoline __main _exit _absvsi2 _absvdi2 _addvsi3 \
-    _addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors
+LIB2FUNCS = _muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3 \
+	_cmpdi2 _ucmpdi2 _floatdidf _floatdisf _fixunsdfsi _fixunssfsi \
+	_fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi _fixxfdi _fixunsxfdi \
+	_floatdixf _fixunsxfsi _fixtfdi _fixunstfdi _floatditf _clear_cache \
+	_enable_execute_stack _trampoline __main _absvsi2 _absvdi2 _addvsi3 \
+	_addvdi3 _subvsi3 _subvdi3 _mulvsi3 _mulvdi3 _negvsi2 _negvdi2 _ctors \
+	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab \
+	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 
 
 # Defined in libgcc2.c, included only in the static library.
-LIB2FUNCS_ST = _eprintf _bb __gcc_bcmp
+LIB2FUNCS_ST = _eprintf __gcc_bcmp
 
 FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \
     _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \
     _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \
-    _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf
+    _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf
 
 DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
     _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \
     _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
-    _df_to_sf _thenan_df _df_to_usi _usi_to_df
+    _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df
+
+TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \
+    _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \
+    _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \
+    _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf
 
 # These might cause a divide overflow trap and so are compiled with
 # unwinder info.
 LIB2_DIVMOD_FUNCS = _divdi3 _moddi3 _udivdi3 _umoddi3 _udiv_w_sdiv _udivmoddi4
 
-MACHMODE_H = machmode.h machmode.def
-
 LIB2ADD = $(LIB2FUNCS_EXTRA)
 LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
 
-# Additional sources to handle exceptions; overridden on ia64.
-LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c unwind-c.c
+# Additional sources to handle exceptions; overridden by targets as needed.
+LIB2ADDEH = unwind-dw2.c unwind-dw2-fde.c unwind-sjlj.c gthr-gnat.c unwind-c.c
 
 #-----------------------------------------------------------------------
 #
@@ -93,8 +95,10 @@ LIB2FUNCS_EXTRA = qrnnd.asm
 
 .if ${TARGET_ARCH} == "arm"
 #	from config/arm/t-strongarm-elf
-LIB1ASMSRC = lib1funcs.asm
-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func
+CFLAGS+=	-Dinhibit_libc -fno-inline
+LIB1ASMSRC =	lib1funcs.asm
+LIB1ASMFUNCS =	_udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func
+OBJS+=	dp-bit.o fp-bit.o
 # We want fine grained libraries, so use the new code to build the
 # floating point emulation libraries.
 XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform
@@ -103,11 +107,11 @@ XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform
 .if ${TARGET_ARCH} == "ia64"
 #	from config/ia64/t-ia64
 LIB1ASMSRC    = lib1funcs.asm
-LIB1ASMFUNCS  = __divtf3 __divdf3 __divsf3 \
-	__divdi3 __moddi3 __udivdi3 __umoddi3 \
-	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
-	__nonlocal_goto __restore_stack_nonlocal __trampoline
-LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
+LIB1ASMFUNCS  = __divxf3 __divdf3 __divsf3 \
+        __divdi3 __moddi3 __udivdi3 __umoddi3 \
+        __divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
+        __nonlocal_goto __restore_stack_nonlocal __trampoline __compat
+LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c gthr-gnat.c
 .endif
 
 .if ${TARGET_ARCH} == "powerpc"
@@ -178,11 +182,11 @@ OBJS_S=		${SYMS:S/$/.So/}
 STATICOBJS=	${SYMS_ST:S/$/.o/}
 SRCS=		${LIB2ADD} ${LIB2ADDEH}
 
-COMMONHDRS=	tconfig.h
+COMMONHDRS=	tm.h tconfig.h
 SRCS+=		${COMMONHDRS}
 CLEANFILES+=	${COMMONHDRS}
 
-tconfig.h: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
+${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
 
 ${OBJS} beforedepend: ${COMMONHDRS}
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index d8052cd..213e904 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -23,12 +23,12 @@ INCSDIR=${INCLUDEDIR}/objc
 CFLAGS+= -fpic
 .endif
 
-CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS
+CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_GCC -DIN_TARGET_LIBS
 CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools
 CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} 
 CFLAGS+= -I${GCCDIR}/config -I${GCCDIR}
 
-GENHDRS=	runtime-info.h tconfig.h
+GENHDRS=	runtime-info.h tconfig.h tm.h
 CLEANFILES+=	${GENHDRS}
 SRCS+=		${GENHDRS}
 
@@ -38,7 +38,7 @@ runtime-info.h:
 	`${CC} --print-prog-name=cc1obj` -print-objc-runtime-info \
 	    < /dev/null > ${.TARGET}
 
-tconfig.h: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
+tconfig.h tm.h : ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
 	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 4b53209..fc45048 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -5,33 +5,32 @@ SRCDIR=	${.CURDIR}/../../../contrib/libstdc++
 SUPDIR=	${SRCDIR}/libsupc++
 
 .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
-       ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \
+       ${SRCDIR}/config/locale/generic ${SRCDIR}/include \
        ${SUPDIR} ${GCCDIR}
 
-#SUBDIR=	doc
-
 LIB=		stdc++
 SHLIB_MAJOR=	4
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
-CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR}
-CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated
-#LDFLAGS+=	-Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map
+CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
+CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
+		-Wno-deprecated
 
 LDADD=		-lm
 DPADD=		${LIBM}
 
-# libstdc++ sources (libstdc++/src/Makefile.in, do not reorder)
-SRCS+= bitset.cc codecvt.cc complex_io.cc concept-inst.cc ctype.cc \
-	ext-inst.cc fstream.cc fstream-inst.cc functexcept.cc \
-	globals.cc io-inst.cc ios.cc istream-inst.cc limits.cc \
-	locale.cc locale-inst.cc localename.cc misc-inst.cc \
-	ostream-inst.cc  sstream-inst.cc stdexcept.cc stl-inst.cc \
-	streambuf-inst.cc string-inst.cc strstream-fixed.cc \
-	valarray-inst.cc vterminate.cc wstring-inst.cc
+# libstdc++ sources
+SRCS+= 	allocator.cc codecvt.cc complex_io.cc ctype.cc debug.cc functexcept.cc \
+	globals_locale.cc globals_io.cc ios.cc ios_failure.cc ios_init.cc \
+	ios_locale.cc limits.cc list.cc locale.cc locale_init.cc \
+	locale_facets.cc localename.cc stdexcept.cc strstream.cc tree.cc \
+	allocator-inst.cc concept-inst.cc fstream-inst.cc ext-inst.cc \
+	io-inst.cc istream-inst.cc locale-inst.cc locale-misc-inst.cc \
+	misc-inst.cc ostream-inst.cc sstream-inst.cc streambuf-inst.cc \
+	string-inst.cc valarray-inst.cc wlocale-inst.cc wstring-inst.cc 
 
 # target sources
-SRCS+=  codecvt_members.cc collate_members.cc ctype_members.cc \
+SRCS+=  atomicity.cc codecvt_members.cc collate_members.cc ctype_members.cc \
 	messages_members.cc monetary_members.cc numeric_members.cc \
 	time_members.cc
 
@@ -39,64 +38,95 @@ SRCS+=  codecvt_members.cc collate_members.cc ctype_members.cc \
 SRCS+=  basic_file_stdio.cc c_locale.cc
 
 # C parts of math
-SRCS+=	nan.c signbit.c signbitf.c signbitl.c stubs.c
+SRCS+=	signbitf.c signbitl.c stubs.c
 
 # Embedded copy of libsupc++
-SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc \
-	eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc \
-	eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.cc eh_type.cc \
-	guard.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
-	pure.cc tinfo.cc tinfo2.cc vec.cc
+SRCS+=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc \
+	eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc \
+	eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \
+	eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \
+	new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \
+	vec.cc vterminate.cc
 
 # from libiberty:
-SRCS+=	cp-demangle.c dyn-string.c
+SRCS+=	cp-demangle.c
 
-strstream-fixed.cc:	${SRCDIR}/src/strstream.cc
-	sed -e 's,^#include <strstream>,#include <backward/strstream>,g' \
-	    < ${SRCDIR}/src/strstream.cc > strstream-fixed.cc
+# MD headers location
+.if ${MACHINE_ARCH} == "sparc64"
+MARCHDIR=	sparc
+.elif ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU} != 'i386'
+MARCHDIR=	i486
+.elif ${MACHINE_ARCH} == "amd64"
+MARCHDIR=	i486
+.else
+MARCHDIR=	${MACHINE_ARCH}
+.endif
+
+ATOMICITY_H=	atomicity.h
+.if exists(${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h)
+ATOMICITY_H=	${SRCDIR}/config/cpu/${MARCHDIR}/atomicity.h
+.else
+ATOMICITY_H=	${SRCDIR}/config/cpu/generic/atomicity.h
+.endif
 
-CLEANFILES+=	strstream-fixed.cc
+atomicity.cc:	${ATOMICITY_H}
+	ln -sf ${.ALLSRC} ${.TARGET}
 
 INCSGROUPS=	BITSHDRS BKWHDRS EXTHDRS BASEHDRS BASEXHDRS STDHDRS \
-		TARGETHDRS THRHDRS
-
-BITSHDRS=	basic_ios.h basic_ios.tcc basic_string.h basic_string.tcc \
-		boost_concept_check.h char_traits.h codecvt.h concept_check.h \
-		cpp_type_traits.h deque.tcc fpos.h fstream.tcc functexcept.h \
-		gslice.h gslice_array.h indirect_array.h \
-		ios_base.h istream.tcc list.tcc \
-		locale_classes.h locale_facets.h locale_facets.tcc \
-		localefwd.h mask_array.h ostream.tcc pthread_allocimpl.h \
+		TARGETHDRS THRHDRS DEBUGHDRS
+CXXINCLUDEDIR=	${INCLUDEDIR}/c++/3.4
+
+STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
+		std_fstream.h std_functional.h std_iomanip.h std_ios.h \
+		std_iosfwd.h std_iostream.h std_istream.h std_iterator.h \
+		std_limits.h std_list.h std_locale.h std_map.h std_memory.h \
+		std_numeric.h std_ostream.h std_queue.h std_set.h \
+		std_sstream.h std_stack.h std_stdexcept.h std_streambuf.h \
+		std_string.h std_utility.h std_valarray.h std_vector.h
+.for h in ${STDHDRS}
+STDHDRSNAME_$h=${h:R:S;^std_;;}
+.endfor
+STDHDRS:=	${STDHDRS:S;^;${SRCDIR}/include/std/;}
+STDHDRSDIR=	${CXXINCLUDEDIR}
+
+BITSHDRS=	allocator.h atomicity.h basic_ios.h basic_ios.tcc \
+		basic_string.h basic_string.tcc boost_concept_check.h \
+		char_traits.h codecvt.h concept_check.h concurrence.h \
+		cpp_type_traits.h deque.tcc fstream.tcc functexcept.h \
+		gslice.h gslice_array.h indirect_array.h ios_base.h \
+		istream.tcc list.tcc locale_classes.h locale_facets.h \
+		locale_facets.tcc localefwd.h mask_array.h ostream.tcc \
+		postypes.h stream_iterator.h streambuf_iterator.h \
 		slice_array.h sstream.tcc stl_algo.h stl_algobase.h \
-		stl_alloc.h stl_bvector.h stl_construct.h stl_deque.h \
-		stl_function.h stl_heap.h stl_iterator.h \
-		stl_iterator_base_funcs.h stl_iterator_base_types.h \
-		stl_list.h stl_map.h stl_multimap.h stl_multiset.h \
-		stl_numeric.h stl_pair.h stl_pthread_alloc.h stl_queue.h \
+		stl_bvector.h stl_construct.h stl_deque.h stl_function.h \
+		stl_heap.h stl_iterator.h stl_iterator_base_funcs.h \
+		stl_iterator_base_types.h stl_list.h stl_map.h stl_multimap.h \
+		stl_multiset.h stl_numeric.h stl_pair.h stl_queue.h \
 		stl_raw_storage_iter.h stl_relops.h stl_set.h stl_stack.h \
 		stl_tempbuf.h stl_threads.h stl_tree.h stl_uninitialized.h \
-		stl_vector.h stream_iterator.h streambuf.tcc \
-		streambuf_iterator.h stringfwd.h type_traits.h \
-		valarray_array.h valarray_array.tcc valarray_meta.h \
-		vector.tcc
+		stl_vector.h streambuf.tcc stringfwd.h type_traits.h \
+		valarray_array.h valarray_array.tcc valarray_before.h \
+		valarray_after.h vector.tcc
 BITSHDRS:=	${BITSHDRS:S;^;${SRCDIR}/include/bits/;}
-BITSHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
-
-BKWHDRS=	algo.h algobase.h alloc.h backward_warning.h bvector.h \
-		complex.h defalloc.h deque.h fstream.h function.h \
-		hash_map.h hash_set.h hashtable.h heap.h iomanip.h \
-		iostream.h istream.h iterator.h list.h map.h multimap.h \
-		multiset.h new.h ostream.h pair.h queue.h rope.h set.h \
-		slist.h stack.h stream.h streambuf.h strstream \
-		tempbuf.h tree.h vector.h
+BITSHDRSDIR=	${CXXINCLUDEDIR}/bits
+
+BKWHDRS=	complex.h iomanip.h istream.h ostream.h stream.h streambuf.h \
+		algo.h algobase.h alloc.h bvector.h defalloc.h deque.h \
+		function.h hash_map.h hash_set.h hashtable.h heap.h iostream.h \
+		iterator.h list.h map.h multimap.h new.h multiset.h pair.h \
+		queue.h rope.h set.h slist.h stack.h tempbuf.h tree.h \
+		vector.h fstream.h strstream backward_warning.h
 BKWHDRS:=	${BKWHDRS:S;^;${SRCDIR}/include/backward/;}
-BKWHDRSDIR=	${INCLUDEDIR}/c++/3.3/backward
-
-EXTHDRS=	algorithm enc_filebuf.h functional hash_map hash_set \
-		iterator memory numeric rb_tree rope ropeimpl.h slist \
-		stdio_filebuf.h stl_hash_fun.h stl_hashtable.h stl_rope.h
+BKWHDRSDIR=	${CXXINCLUDEDIR}/backward
+
+EXTHDRS=	algorithm bitmap_allocator.h debug_allocator.h demangle.h \
+		enc_filebuf.h stdio_filebuf.h stdio_sync_filebuf.h functional \
+		hash_map hash_set iterator malloc_allocator.h memory \
+		mt_allocator.h new_allocator.h numeric pod_char_traits.h \
+		pool_allocator.h rb_tree rope ropeimpl.h slist hash_fun.h \
+		hashtable.h
 EXTHDRS:=	${EXTHDRS:S;^;${SRCDIR}/include/ext/;}
-EXTHDRSDIR=	${INCLUDEDIR}/c++/3.3/ext
+EXTHDRSDIR=	${CXXINCLUDEDIR}/ext
 
 # This is the common subset of files that all three "C" header models use.
 BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
@@ -108,51 +138,40 @@ BASEHDRS=	std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h \
 BASEHDRSNAME_$h=${h:R:S;^std_;;}
 .endfor
 BASEHDRS:=	${BASEHDRS:S;^;${SRCDIR}/include/c_std/;}
-BASEHDRSDIR=	${INCLUDEDIR}/c++/3.3
+BASEHDRSDIR=	${CXXINCLUDEDIR}
 
 # Some of the different "C" header models need extra files.
 BASEXHDRS=	${SRCDIR}/include/c_std/cmath.tcc
-BASEXHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
-
-STDHDRS=	std_algorithm.h std_bitset.h std_complex.h std_deque.h \
-		std_fstream.h std_functional.h std_iomanip.h std_ios.h \
-		std_iosfwd.h std_iostream.h std_istream.h std_iterator.h \
-		std_limits.h std_list.h std_locale.h std_map.h std_memory.h \
-		std_numeric.h std_ostream.h std_queue.h std_set.h \
-		std_sstream.h std_stack.h std_stdexcept.h std_streambuf.h \
-		std_string.h std_utility.h std_valarray.h std_vector.h
-.for h in ${STDHDRS}
-STDHDRSNAME_$h=${h:R:S;^std_;;}
-.endfor
-STDHDRS:=	${STDHDRS:S;^;${SRCDIR}/include/std/;}
-STDHDRSDIR=	${INCLUDEDIR}/c++/3.3
-
-TARGETHDRS=	io/basic_file_stdio.h io/c_io_stdio.h \
+BASEXHDRSDIR=	${CXXINCLUDEDIR}/bits
+
+DEBUGHDRS=	bitset debug.h deque formatter.h hash_map hash_map.h \
+		hash_multimap.h hash_multiset.h hash_set hash_set.h list \
+		map map.h multimap.h multiset.h safe_base.h safe_iterator.h \
+		safe_iterator.tcc safe_sequence.h set set.h string vector
+DEBUGHDRS:=	${DEBUGHDRS:S;^;${SRCDIR}/include/debug/;}
+DEBUGHDRSDIR=	${CXXINCLUDEDIR}/debug
+
+TARGETHDRS=	allocator/new_allocator_base.h \
+		io/basic_file_stdio.h \
+		io/c_io_stdio.h \
 		locale/generic/c_locale.h \
 		locale/generic/c++locale_internal.h \
-		locale/generic/codecvt_specializations.h \
 		locale/generic/messages_members.h \
 		locale/generic/time_members.h \
+		locale/generic/codecvt_specializations.h \
 		os/bsd/freebsd/ctype_base.h \
 		os/bsd/freebsd/ctype_inline.h \
 		os/bsd/freebsd/ctype_noninline.h \
 		os/bsd/freebsd/os_defines.h
 TARGETHDRS:=	${TARGETHDRS:S;^;${SRCDIR}/config/;}
-TARGETHDRS+=	${.CURDIR}/c++config.h
+TARGETHDRS+=	c++config.h
 TARGETHDRSNAME_basic_file_stdio.h= basic_file.h
 TARGETHDRSNAME_c_io_stdio.h= c++io.h
 TARGETHDRSNAME_c_locale.h= c++locale.h
-TARGETHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
-
-MARCHHDRS=	atomicity.h
-.if ${MACHINE_ARCH} == "sparc64"
-MARCHDIR=	sparc
-.elif ${MACHINE_ARCH} == "i386" && ${MACHINE_CPU} != 'i386'
-MARCHDIR=	i486
-.else
-MARCHDIR=	${MACHINE_ARCH}
-.endif
+TARGETHDRSNAME_new_allocator_base.h= c++allocator.h
+TARGETHDRSDIR=	${CXXINCLUDEDIR}/bits
 
+MARCHHDRS=	atomic_word.h
 .for h in ${MARCHHDRS}
 .if exists(${SRCDIR}/config/cpu/${MARCHDIR}/${h})
 TARGETHDRS+=	${SRCDIR}/config/cpu/${MARCHDIR}/${h}
@@ -162,31 +181,45 @@ TARGETHDRS+=	${SRCDIR}/config/cpu/generic/${h}
 .endfor
 
 THRHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
-THRHDRSDIR=	${INCLUDEDIR}/c++/3.3/bits
+THRHDRSDIR=	${CXXINCLUDEDIR}/bits
+uppercase =	[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 
 gthr.h: ${GCCDIR}/gthr.h
-	sed -e '/^#/s/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*\)/_GLIBCPP_\1/g' \
+	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
+	    -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
-	    < ${GCCDIR}/gthr.h > gthr.h
+	    < ${.ALLSRC} > ${.TARGET}
 
 gthr-single.h: ${GCCDIR}/gthr-single.h
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*_H\)/_GLIBCPP_\1/g' \
-	    < ${GCCDIR}/gthr-single.h > gthr-single.h
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    < ${.ALLSRC} > ${.TARGET}
 
 gthr-posix.h: ${GCCDIR}/gthr-posix.h
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*_H\)/_GLIBCPP_\1/g' \
-	    -e 's/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*WEAK\)/_GLIBCPP_\1/g' \
-	    < ${GCCDIR}/gthr-posix.h > gthr-posix.h
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \
+	    -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
+	    < ${.ALLSRC} > ${.TARGET}
 
 gthr-default.h: ${GCCDIR}/gthr-posix.h
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*_H\)/_GLIBCPP_\1/g' \
-	    -e 's/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*WEAK\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    -e 's/SUPPORTS_WEAK/__GXX_WEAK__/g' \
+	    -e 's/\(${uppercase}*USE_WEAK\)/_GLIBCXX_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
-	    < ${GCCDIR}/gthr-posix.h > gthr-default.h
+	    < ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES+=	${THRHDRS}
 
+c++config.h: ${.CURDIR}/config.h ${SRCDIR}/include/bits/c++config
+	cat ${SRCDIR}/include/bits/c++config > ${.TARGET} && \
+	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
+	    -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
+	    -e 's/VERSION/_GLIBCXX_VERSION/g' \
+	    -e 's/WORDS_/_GLIBCXX_WORDS_/g' \
+	    < ${.CURDIR}/config.h >> ${.TARGET} && \
+	echo "#endif // _CXXCONFIG_" >> ${.TARGET}
+CLEANFILES+=	c++config.h
+
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libstdc++/config.h b/gnu/lib/libstdc++/config.h
index b48fe80..a34d4da 100644
--- a/gnu/lib/libstdc++/config.h
+++ b/gnu/lib/libstdc++/config.h
@@ -1,48 +1,74 @@
 /* $FreeBSD$ */
 
-/* config.h.  Generated automatically by configure.  */
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+// acconfig.h symbols and macros for libstdc++ v3 -*- C++ -*-
 
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
+// Defines libstdc++ version.
+/* #undef PACKAGE */
+/* #undef VERSION */
 
-// Define if GCC supports weak symbols.
-#define _GLIBCPP_SUPPORTS_WEAK __GXX_WEAK__
+// Needed for gettext.
+/* #undef ENABLE_NLS */
+/* #undef HAVE_CATGETS */
+/* #undef HAVE_GETTEXT */
+/* #undef HAVE_STPCPY */
 
 // Include I/O support for 'long long' and 'unsigned long long'.
-#define _GLIBCPP_USE_LONG_LONG 1
+#define _GLIBCXX_USE_LONG_LONG 1
+
+// Include support for 'long double'.
+/* #undef _GLIBCXX_USE_LONG_DOUBLE */
+
+// Define if C99 math functions (like fpclassify) should be exposed.
+#define _GLIBCXX_USE_C99_MATH 1
 
 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
-#define _GLIBCPP_USE_C99 1
+#define _GLIBCXX_USE_C99 1
 
 // Define if code specialized for wchar_t should be used.
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 
 // Define if using setrlimit to limit memory usage during 'make check'.
-/* #undef _GLIBCPP_MEM_LIMITS */
+#define _GLIBCXX_MEM_LIMITS 1
 
 // Define to use concept checking code from the boost libraries.
-/* #undef _GLIBCPP_CONCEPT_CHECKS */
+/* #undef _GLIBCXX_CONCEPT_CHECKS */
 
 // Define to use symbol versioning in the shared library.
-/* #undef _GLIBCPP_SYMVER */
+/* #undef _GLIBCXX_SYMVER */
 
 // Define symbol versioning in assember directives. If symbol
 // versioning is beigng used, and the assembler supports this kind of
 // thing, then use it.
-// NB: _GLIBCPP_AT_AT is a hack to work around quoting issues in m4.
-#if _GLIBCPP_SYMVER
-  #define _GLIBCPP_ASM_SYMVER(cur, old, version) \
-   asm (".symver " #cur "," #old _GLIBCPP_AT_AT #version);
+// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4.
+#if _GLIBCXX_SYMVER
+  #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
+   asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version);
 #else
-  #define _GLIBCPP_ASM_SYMVER(cur, old, version)
+  #define _GLIBCXX_ASM_SYMVER(cur, old, version)
 #endif
 
+// Define if LFS support is available.
+/* #undef _GLIBCXX_USE_LFS */
+
+// Define if NLS translations are to be used.
+/* #undef _GLIBCXX_USE_NLS */
+
 // Define if gthr-default.h exists (meaning that threading support is enabled).
 #define HAVE_GTHR_DEFAULT 1
 
-// Define if drand48 exists.
-#define HAVE_DRAND48 1
+// Define if the atan2f function exists.
+#define HAVE_ATAN2F 1
+
+// Define if the atan2l function exists.
+/* #undef HAVE_ATAN2L */
+
+// Define if the tanl function exists.
+/* #undef HAVE_TANL */
+
+// Define if the copysignf function exists.
+#define HAVE_COPYSIGNF 1
 
 // Define if getpagesize exists.
 #define HAVE_GETPAGESIZE 1
@@ -68,6 +94,9 @@
 // Define if you have the expl function.
 /* #undef HAVE_EXPL */
 
+// Define if you have the hypot function.
+#define HAVE_HYPOT 1
+
 // Define if you have the hypotf function.
 #define HAVE_HYPOTF 1
 
@@ -108,13 +137,13 @@
 #define HAVE___BUILTIN_SINL 1
 
 // Define if the compiler/host combination has __builtin_sqrt
-/* #undef HAVE___BUILTIN_SQRT */
+#define HAVE___BUILTIN_SQRT 1
 
 // Define if the compiler/host combination has __builtin_sqrtf
-/* #undef HAVE___BUILTIN_SQRTF */
+#define HAVE___BUILTIN_SQRTF 1
 
 // Define if the compiler/host combination has __builtin_sqrtl
-/* #undef HAVE___BUILTIN_SQRTL */
+#define HAVE___BUILTIN_SQRTL 1
 
 // Define if poll is available in <poll.h>.
 #define HAVE_POLL 1
@@ -125,696 +154,738 @@
 // Define if S_IFREG is available in <sys/stat.h>.
 /* #undef HAVE_S_IFREG */
 
-// Define if LC_MESSAGES is available in <locale.h>.
-#define HAVE_LC_MESSAGES 1
-
-/* Define if you have the __signbit function.  */
-#define HAVE___SIGNBIT 1
-
-/* Define if you have the __signbitf function.  */
-/* #undef HAVE___SIGNBITF */
-
-/* Define if you have the __signbitl function.  */
-/* #undef HAVE___SIGNBITL */
-
-/* Define if you have the _acosf function.  */
-/* #undef HAVE__ACOSF */
-
-/* Define if you have the _acosl function.  */
-/* #undef HAVE__ACOSL */
-
-/* Define if you have the _asinf function.  */
-/* #undef HAVE__ASINF */
-
-/* Define if you have the _asinl function.  */
-/* #undef HAVE__ASINL */
-
-/* Define if you have the _atan2f function.  */
-/* #undef HAVE__ATAN2F */
-
-/* Define if you have the _atan2l function.  */
-/* #undef HAVE__ATAN2L */
-
-/* Define if you have the _atanf function.  */
-/* #undef HAVE__ATANF */
-
-/* Define if you have the _atanl function.  */
-/* #undef HAVE__ATANL */
-
-/* Define if you have the _ceilf function.  */
-/* #undef HAVE__CEILF */
-
-/* Define if you have the _ceill function.  */
-/* #undef HAVE__CEILL */
-
-/* Define if you have the _copysign function.  */
-/* #undef HAVE__COPYSIGN */
-
-/* Define if you have the _copysignl function.  */
-/* #undef HAVE__COPYSIGNL */
-
-/* Define if you have the _cosf function.  */
-/* #undef HAVE__COSF */
-
-/* Define if you have the _coshf function.  */
-/* #undef HAVE__COSHF */
-
-/* Define if you have the _coshl function.  */
-/* #undef HAVE__COSHL */
-
-/* Define if you have the _cosl function.  */
-/* #undef HAVE__COSL */
-
-/* Define if you have the _expf function.  */
-/* #undef HAVE__EXPF */
-
-/* Define if you have the _expl function.  */
-/* #undef HAVE__EXPL */
-
-/* Define if you have the _fabsf function.  */
-/* #undef HAVE__FABSF */
-
-/* Define if you have the _fabsl function.  */
-/* #undef HAVE__FABSL */
-
-/* Define if you have the _finite function.  */
-/* #undef HAVE__FINITE */
-
-/* Define if you have the _finitef function.  */
-/* #undef HAVE__FINITEF */
-
-/* Define if you have the _finitel function.  */
-/* #undef HAVE__FINITEL */
-
-/* Define if you have the _floorf function.  */
-/* #undef HAVE__FLOORF */
-
-/* Define if you have the _floorl function.  */
-/* #undef HAVE__FLOORL */
-
-/* Define if you have the _fmodf function.  */
-/* #undef HAVE__FMODF */
-
-/* Define if you have the _fmodl function.  */
-/* #undef HAVE__FMODL */
-
-/* Define if you have the _fpclass function.  */
-/* #undef HAVE__FPCLASS */
-
-/* Define if you have the _frexpf function.  */
-/* #undef HAVE__FREXPF */
+// Define if writev is available in <sys/uio.h>.
+#define HAVE_WRITEV 1
 
-/* Define if you have the _frexpl function.  */
-/* #undef HAVE__FREXPL */
-
-/* Define if you have the _hypot function.  */
-/* #undef HAVE__HYPOT */
+// Define if int64_t is available in <stdint.h>.
+#define HAVE_INT64_T 1
 
-/* Define if you have the _hypotf function.  */
-/* #undef HAVE__HYPOTF */
-
-/* Define if you have the _hypotl function.  */
-/* #undef HAVE__HYPOTL */
-
-/* Define if you have the _isinf function.  */
-/* #undef HAVE__ISINF */
-
-/* Define if you have the _isinff function.  */
-/* #undef HAVE__ISINFF */
-
-/* Define if you have the _isinfl function.  */
-/* #undef HAVE__ISINFL */
-
-/* Define if you have the _isnan function.  */
-/* #undef HAVE__ISNAN */
-
-/* Define if you have the _isnanf function.  */
-/* #undef HAVE__ISNANF */
-
-/* Define if you have the _isnanl function.  */
-/* #undef HAVE__ISNANL */
-
-/* Define if you have the _ldexpf function.  */
-/* #undef HAVE__LDEXPF */
-
-/* Define if you have the _ldexpl function.  */
-/* #undef HAVE__LDEXPL */
-
-/* Define if you have the _log10f function.  */
-/* #undef HAVE__LOG10F */
-
-/* Define if you have the _log10l function.  */
-/* #undef HAVE__LOG10L */
-
-/* Define if you have the _logf function.  */
-/* #undef HAVE__LOGF */
-
-/* Define if you have the _logl function.  */
-/* #undef HAVE__LOGL */
-
-/* Define if you have the _modff function.  */
-/* #undef HAVE__MODFF */
-
-/* Define if you have the _modfl function.  */
-/* #undef HAVE__MODFL */
-
-/* Define if you have the _powf function.  */
-/* #undef HAVE__POWF */
-
-/* Define if you have the _powl function.  */
-/* #undef HAVE__POWL */
-
-/* Define if you have the _qfpclass function.  */
-/* #undef HAVE__QFPCLASS */
-
-/* Define if you have the _sincos function.  */
-/* #undef HAVE__SINCOS */
-
-/* Define if you have the _sincosf function.  */
-/* #undef HAVE__SINCOSF */
-
-/* Define if you have the _sincosl function.  */
-/* #undef HAVE__SINCOSL */
-
-/* Define if you have the _sinf function.  */
-/* #undef HAVE__SINF */
-
-/* Define if you have the _sinhf function.  */
-/* #undef HAVE__SINHF */
-
-/* Define if you have the _sinhl function.  */
-/* #undef HAVE__SINHL */
-
-/* Define if you have the _sinl function.  */
-/* #undef HAVE__SINL */
-
-/* Define if you have the _sqrtf function.  */
-/* #undef HAVE__SQRTF */
-
-/* Define if you have the _sqrtl function.  */
-/* #undef HAVE__SQRTL */
-
-/* Define if you have the _tanf function.  */
-/* #undef HAVE__TANF */
+// Define if LC_MESSAGES is available in <locale.h>.
+#define HAVE_LC_MESSAGES 1
 
-/* Define if you have the _tanhf function.  */
-/* #undef HAVE__TANHF */
+// Define if <float.h> exists.
+#define HAVE_FLOAT_H 1
 
-/* Define if you have the _tanhl function.  */
-/* #undef HAVE__TANHL */
+// Define if modf is present in <math.h>
+/* #undef HAVE_MODF */
 
-/* Define if you have the _tanl function.  */
-/* #undef HAVE__TANL */
 
-/* Define if you have the acosf function.  */
+/* Define to 1 if you have the `acosf' function. */
 #define HAVE_ACOSF 1
 
-/* Define if you have the acosl function.  */
+/* Define to 1 if you have the `acosl' function. */
 /* #undef HAVE_ACOSL */
 
-/* Define if you have the asinf function.  */
+/* Define to 1 if you have the `asinf' function. */
 #define HAVE_ASINF 1
 
-/* Define if you have the asinl function.  */
+/* Define to 1 if you have the `asinl' function. */
 /* #undef HAVE_ASINL */
 
-/* Define if you have the atan2f function.  */
+/* Define to 1 if you have the `atan2f' function. */
 #define HAVE_ATAN2F 1
 
-/* Define if you have the atan2l function.  */
+/* Define to 1 if you have the `atan2l' function. */
 /* #undef HAVE_ATAN2L */
 
-/* Define if you have the atanf function.  */
+/* Define to 1 if you have the `atanf' function. */
 #define HAVE_ATANF 1
 
-/* Define if you have the atanl function.  */
+/* Define to 1 if you have the `atanl' function. */
 /* #undef HAVE_ATANL */
 
-/* Define if you have the btowc function.  */
+/* Define to 1 if you have the `btowc' function. */
 #define HAVE_BTOWC 1
 
-/* Define if you have the ceilf function.  */
+/* Define to 1 if you have the `ceilf' function. */
 #define HAVE_CEILF 1
 
-/* Define if you have the ceill function.  */
+/* Define to 1 if you have the `ceill' function. */
 /* #undef HAVE_CEILL */
 
-/* Define if you have the copysign function.  */
+/* Define to 1 if you have the `copysign' function. */
 #define HAVE_COPYSIGN 1
 
-/* Define if you have the copysignf function.  */
+/* Define to 1 if you have the `copysignf' function. */
 #define HAVE_COPYSIGNF 1
 
-/* Define if you have the copysignl function.  */
-/* #undef HAVE_COPYSIGNL */
+/* Define to 1 if you have the `copysignl' function. */
+#define HAVE_COPYSIGNL 1
 
-/* Define if you have the cosf function.  */
+/* Define to 1 if you have the `cosf' function. */
 #define HAVE_COSF 1
 
-/* Define if you have the coshf function.  */
+/* Define to 1 if you have the `coshf' function. */
 #define HAVE_COSHF 1
 
-/* Define if you have the coshl function.  */
+/* Define to 1 if you have the `coshl' function. */
 /* #undef HAVE_COSHL */
 
-/* Define if you have the cosl function.  */
+/* Define to 1 if you have the `cosl' function. */
 /* #undef HAVE_COSL */
 
-/* Define if you have the drand48 function.  */
-#define HAVE_DRAND48 1
+/* Define to 1 if you have the <endian.h> header file. */
+/* #undef HAVE_ENDIAN_H */
 
-/* Define if you have the expf function.  */
+/* Define to 1 if you have the `expf' function. */
 #define HAVE_EXPF 1
 
-/* Define if you have the expl function.  */
+/* Define to 1 if you have the `expl' function. */
 /* #undef HAVE_EXPL */
 
-/* Define if you have the fabsf function.  */
+/* Define to 1 if you have the `fabsf' function. */
 #define HAVE_FABSF 1
 
-/* Define if you have the fabsl function.  */
-/* #undef HAVE_FABSL */
+/* Define to 1 if you have the `fabsl' function. */
+#define HAVE_FABSL 1
 
-/* Define if you have the fgetwc function.  */
+/* Define to 1 if you have the `fgetwc' function. */
 #define HAVE_FGETWC 1
 
-/* Define if you have the fgetws function.  */
+/* Define to 1 if you have the `fgetws' function. */
 #define HAVE_FGETWS 1
 
-/* Define if you have the finite function.  */
+/* Define to 1 if you have the `finite' function. */
 #define HAVE_FINITE 1
 
-/* Define if you have the finitef function.  */
+/* Define to 1 if you have the `finitef' function. */
 #define HAVE_FINITEF 1
 
-/* Define if you have the finitel function.  */
+/* Define to 1 if you have the `finitel' function. */
 /* #undef HAVE_FINITEL */
 
-/* Define if you have the floorf function.  */
+/* Define to 1 if you have the <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
+/* Define to 1 if you have the `floorf' function. */
 #define HAVE_FLOORF 1
 
-/* Define if you have the floorl function.  */
+/* Define to 1 if you have the `floorl' function. */
 /* #undef HAVE_FLOORL */
 
-/* Define if you have the fmodf function.  */
+/* Define to 1 if you have the `fmodf' function. */
 #define HAVE_FMODF 1
 
-/* Define if you have the fmodl function.  */
+/* Define to 1 if you have the `fmodl' function. */
 /* #undef HAVE_FMODL */
 
-/* Define if you have the fpclass function.  */
+/* Define to 1 if you have the `fpclass' function. */
 /* #undef HAVE_FPCLASS */
 
-/* Define if you have the fputwc function.  */
+/* Define to 1 if you have the `fputwc' function. */
 #define HAVE_FPUTWC 1
 
-/* Define if you have the fputws function.  */
+/* Define to 1 if you have the `fputws' function. */
 #define HAVE_FPUTWS 1
 
-/* Define if you have the frexpf function.  */
+/* Define to 1 if you have the <fp.h> header file. */
+/* #undef HAVE_FP_H */
+
+/* Define to 1 if you have the `frexpf' function. */
 #define HAVE_FREXPF 1
 
-/* Define if you have the frexpl function.  */
+/* Define to 1 if you have the `frexpl' function. */
 /* #undef HAVE_FREXPL */
 
-/* Define if you have the fwide function.  */
+/* Define to 1 if you have the `fwide' function. */
 #define HAVE_FWIDE 1
 
-/* Define if you have the fwprintf function.  */
+/* Define to 1 if you have the `fwprintf' function. */
 #define HAVE_FWPRINTF 1
 
-/* Define if you have the fwscanf function.  */
+/* Define to 1 if you have the `fwscanf' function. */
 #define HAVE_FWSCANF 1
 
-/* Define if you have the getpagesize function.  */
+/* Define to 1 if you have the <gconv.h> header file. */
+/* #undef HAVE_GCONV_H */
+
+/* Define to 1 if you have the `getpagesize' function. */
 #define HAVE_GETPAGESIZE 1
 
-/* Define if you have the getwc function.  */
+/* Define to 1 if you have the `getwc' function. */
 #define HAVE_GETWC 1
 
-/* Define if you have the getwchar function.  */
+/* Define to 1 if you have the `getwchar' function. */
 #define HAVE_GETWCHAR 1
 
-/* Define if you have the hypot function.  */
+/* Define to 1 if you have the `hypot' function. */
 #define HAVE_HYPOT 1
 
-/* Define if you have the hypotf function.  */
+/* Define to 1 if you have the `hypotf' function. */
 #define HAVE_HYPOTF 1
 
-/* Define if you have the hypotl function.  */
+/* Define to 1 if you have the `hypotl' function. */
 /* #undef HAVE_HYPOTL */
 
-/* Define if you have the iconv function.  */
-/* #undef HAVE_ICONV */
+/* Define to 1 if you have the `iconv' function. */
+#define HAVE_ICONV 1
 
-/* Define if you have the iconv_close function.  */
-/* #undef HAVE_ICONV_CLOSE */
+/* Define to 1 if you have the `iconv_close' function. */
+#define HAVE_ICONV_CLOSE 1
 
-/* Define if you have the iconv_open function.  */
-/* #undef HAVE_ICONV_OPEN */
+/* Define to 1 if you have the `iconv_open' function. */
+#define HAVE_ICONV_OPEN 1
 
-/* Define if you have the isatty function.  */
-#define HAVE_ISATTY 1
+/* Define to 1 if you have the <ieeefp.h> header file. */
+#define HAVE_IEEEFP_H 1
 
-/* Define if you have the isinf function.  */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `isinf' function. */
 #define HAVE_ISINF 1
 
-/* Define if you have the isinff function.  */
+/* Define to 1 if you have the `isinff' function. */
 /* #undef HAVE_ISINFF */
 
-/* Define if you have the isinfl function.  */
+/* Define to 1 if you have the `isinfl' function. */
 /* #undef HAVE_ISINFL */
 
-/* Define if you have the isnan function.  */
+/* Define to 1 if you have the `isnan' function. */
 #define HAVE_ISNAN 1
 
-/* Define if you have the isnanf function.  */
+/* Define to 1 if you have the `isnanf' function. */
 #define HAVE_ISNANF 1
 
-/* Define if you have the isnanl function.  */
+/* Define to 1 if you have the `isnanl' function. */
 /* #undef HAVE_ISNANL */
 
-/* Define if you have the ldexpf function.  */
+/* Define to 1 if you have the `iswblank' function. */
+#define HAVE_ISWBLANK 1
+
+/* Define to 1 if you have the `ldexpf' function. */
 #define HAVE_LDEXPF 1
 
-/* Define if you have the ldexpl function.  */
+/* Define to 1 if you have the `ldexpl' function. */
 /* #undef HAVE_LDEXPL */
 
-/* Define if you have the log10f function.  */
+/* Define to 1 if you have the <libintl.h> header file. */
+/* #undef HAVE_LIBINTL_H */
+
+/* Define to 1 if you have the `m' library (-lm). */
+#define HAVE_LIBM 1
+
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
+
+/* Define to 1 if you have the `log10f' function. */
 #define HAVE_LOG10F 1
 
-/* Define if you have the log10l function.  */
+/* Define to 1 if you have the `log10l' function. */
 /* #undef HAVE_LOG10L */
 
-/* Define if you have the logf function.  */
+/* Define to 1 if you have the `logf' function. */
 #define HAVE_LOGF 1
 
-/* Define if you have the logl function.  */
+/* Define to 1 if you have the `logl' function. */
 /* #undef HAVE_LOGL */
 
-/* Define if you have the mbrlen function.  */
+/* Define to 1 if you have the <machine/endian.h> header file. */
+#define HAVE_MACHINE_ENDIAN_H 1
+
+/* Define to 1 if you have the <machine/param.h> header file. */
+#define HAVE_MACHINE_PARAM_H 1
+
+/* Define to 1 if you have the `mbrlen' function. */
 #define HAVE_MBRLEN 1
 
-/* Define if you have the mbrtowc function.  */
+/* Define to 1 if you have the `mbrtowc' function. */
 #define HAVE_MBRTOWC 1
 
-/* Define if you have the mbsinit function.  */
+/* Define to 1 if you have the `mbsinit' function. */
 #define HAVE_MBSINIT 1
 
-/* Define if you have the mbsrtowcs function.  */
+/* Define to 1 if you have the `mbsrtowcs' function. */
 #define HAVE_MBSRTOWCS 1
 
-/* Define if you have the modff function.  */
+/* Only used in build directory testsuite_hooks.h. */
+#define HAVE_MEMLIMIT_AS 0
+
+/* Only used in build directory testsuite_hooks.h. */
+#define HAVE_MEMLIMIT_DATA 1
+
+/* Only used in build directory testsuite_hooks.h. */
+#define HAVE_MEMLIMIT_RSS 1
+
+/* Only used in build directory testsuite_hooks.h. */
+#define HAVE_MEMLIMIT_VMEM 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have a working `mmap' system call. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the `modff' function. */
 #define HAVE_MODFF 1
 
-/* Define if you have the modfl function.  */
+/* Define to 1 if you have the `modfl' function. */
 /* #undef HAVE_MODFL */
 
-/* Define if you have the nan function.  */
-/* #undef HAVE_NAN */
+/* Define to 1 if you have the <nan.h> header file. */
+/* #undef HAVE_NAN_H */
 
-/* Define if you have the nl_langinfo function.  */
+/* Define to 1 if you have the `nl_langinfo' function. */
 #define HAVE_NL_LANGINFO 1
 
-/* Define if you have the powf function.  */
+/* Define to 1 if you have the `powf' function. */
 #define HAVE_POWF 1
 
-/* Define if you have the powl function.  */
+/* Define to 1 if you have the `powl' function. */
 /* #undef HAVE_POWL */
 
-/* Define if you have the putwc function.  */
+/* Define to 1 if you have the `putwc' function. */
 #define HAVE_PUTWC 1
 
-/* Define if you have the putwchar function.  */
+/* Define to 1 if you have the `putwchar' function. */
 #define HAVE_PUTWCHAR 1
 
-/* Define if you have the qfpclass function.  */
+/* Define to 1 if you have the `qfpclass' function. */
 /* #undef HAVE_QFPCLASS */
 
-/* Define if you have the setenv function.  */
+/* Define to 1 if you have the `setenv' function. */
 #define HAVE_SETENV 1
 
-/* Define if you have the sincos function.  */
+/* Define if sigsetjmp is available. */
+#define HAVE_SIGSETJMP 1
+
+/* Define to 1 if you have the `sincos' function. */
 /* #undef HAVE_SINCOS */
 
-/* Define if you have the sincosf function.  */
+/* Define to 1 if you have the `sincosf' function. */
 /* #undef HAVE_SINCOSF */
 
-/* Define if you have the sincosl function.  */
+/* Define to 1 if you have the `sincosl' function. */
 /* #undef HAVE_SINCOSL */
 
-/* Define if you have the sinf function.  */
+/* Define to 1 if you have the `sinf' function. */
 #define HAVE_SINF 1
 
-/* Define if you have the sinhf function.  */
+/* Define to 1 if you have the `sinhf' function. */
 #define HAVE_SINHF 1
 
-/* Define if you have the sinhl function.  */
+/* Define to 1 if you have the `sinhl' function. */
 /* #undef HAVE_SINHL */
 
-/* Define if you have the sinl function.  */
+/* Define to 1 if you have the `sinl' function. */
 /* #undef HAVE_SINL */
 
-/* Define if you have the sqrtf function.  */
+/* Define to 1 if you have the `sqrtf' function. */
 #define HAVE_SQRTF 1
 
-/* Define if you have the sqrtl function.  */
+/* Define to 1 if you have the `sqrtl' function. */
 /* #undef HAVE_SQRTL */
 
-/* Define if you have the strtof function.  */
+/* 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 `strtof' function. */
 #define HAVE_STRTOF 1
 
-/* Define if you have the strtold function.  */
+/* Define to 1 if you have the `strtold' function. */
 #define HAVE_STRTOLD 1
 
-/* Define if you have the swprintf function.  */
+/* Define to 1 if you have the `swprintf' function. */
 #define HAVE_SWPRINTF 1
 
-/* Define if you have the swscanf function.  */
+/* Define to 1 if you have the `swscanf' function. */
 #define HAVE_SWSCANF 1
 
-/* Define if you have the tanf function.  */
+/* Define to 1 if you have the <sys/filio.h> header file. */
+#define HAVE_SYS_FILIO_H 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/isa_defs.h> header file. */
+/* #undef HAVE_SYS_ISA_DEFS_H */
+
+/* Define to 1 if you have the <sys/machine.h> header file. */
+/* #undef HAVE_SYS_MACHINE_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_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/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 the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the `tanf' function. */
 #define HAVE_TANF 1
 
-/* Define if you have the tanhf function.  */
+/* Define to 1 if you have the `tanhf' function. */
 #define HAVE_TANHF 1
 
-/* Define if you have the tanhl function.  */
+/* Define to 1 if you have the `tanhl' function. */
 /* #undef HAVE_TANHL */
 
-/* Define if you have the tanl function.  */
+/* Define to 1 if you have the `tanl' function. */
 /* #undef HAVE_TANL */
 
-/* Define if you have the ungetwc function.  */
+/* Define to 1 if you have the `ungetwc' function. */
 #define HAVE_UNGETWC 1
 
-/* Define if you have the vfwprintf function.  */
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vfwprintf' function. */
 #define HAVE_VFWPRINTF 1
 
-/* Define if you have the vfwscanf function.  */
+/* Define to 1 if you have the `vfwscanf' function. */
 #define HAVE_VFWSCANF 1
 
-/* Define if you have the vswprintf function.  */
+/* Define to 1 if you have the `vswprintf' function. */
 #define HAVE_VSWPRINTF 1
 
-/* Define if you have the vswscanf function.  */
+/* Define to 1 if you have the `vswscanf' function. */
 #define HAVE_VSWSCANF 1
 
-/* Define if you have the vwprintf function.  */
+/* Define to 1 if you have the `vwprintf' function. */
 #define HAVE_VWPRINTF 1
 
-/* Define if you have the vwscanf function.  */
+/* Define to 1 if you have the `vwscanf' function. */
 #define HAVE_VWSCANF 1
 
-/* Define if you have the wcrtomb function.  */
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define to 1 if you have the `wcrtomb' function. */
 #define HAVE_WCRTOMB 1
 
-/* Define if you have the wcscat function.  */
+/* Define to 1 if you have the `wcscat' function. */
 #define HAVE_WCSCAT 1
 
-/* Define if you have the wcschr function.  */
+/* Define to 1 if you have the `wcschr' function. */
 #define HAVE_WCSCHR 1
 
-/* Define if you have the wcscmp function.  */
+/* Define to 1 if you have the `wcscmp' function. */
 #define HAVE_WCSCMP 1
 
-/* Define if you have the wcscoll function.  */
+/* Define to 1 if you have the `wcscoll' function. */
 #define HAVE_WCSCOLL 1
 
-/* Define if you have the wcscpy function.  */
+/* Define to 1 if you have the `wcscpy' function. */
 #define HAVE_WCSCPY 1
 
-/* Define if you have the wcscspn function.  */
+/* Define to 1 if you have the `wcscspn' function. */
 #define HAVE_WCSCSPN 1
 
-/* Define if you have the wcsftime function.  */
+/* Define to 1 if you have the `wcsftime' function. */
 #define HAVE_WCSFTIME 1
 
-/* Define if you have the wcslen function.  */
+/* Define to 1 if you have the `wcslen' function. */
 #define HAVE_WCSLEN 1
 
-/* Define if you have the wcsncat function.  */
+/* Define to 1 if you have the `wcsncat' function. */
 #define HAVE_WCSNCAT 1
 
-/* Define if you have the wcsncmp function.  */
+/* Define to 1 if you have the `wcsncmp' function. */
 #define HAVE_WCSNCMP 1
 
-/* Define if you have the wcsncpy function.  */
+/* Define to 1 if you have the `wcsncpy' function. */
 #define HAVE_WCSNCPY 1
 
-/* Define if you have the wcspbrk function.  */
+/* Define to 1 if you have the `wcspbrk' function. */
 #define HAVE_WCSPBRK 1
 
-/* Define if you have the wcsrchr function.  */
+/* Define to 1 if you have the `wcsrchr' function. */
 #define HAVE_WCSRCHR 1
 
-/* Define if you have the wcsrtombs function.  */
+/* Define to 1 if you have the `wcsrtombs' function. */
 #define HAVE_WCSRTOMBS 1
 
-/* Define if you have the wcsspn function.  */
+/* Define to 1 if you have the `wcsspn' function. */
 #define HAVE_WCSSPN 1
 
-/* Define if you have the wcsstr function.  */
+/* Define to 1 if you have the `wcsstr' function. */
 #define HAVE_WCSSTR 1
 
-/* Define if you have the wcstod function.  */
+/* Define to 1 if you have the `wcstod' function. */
 #define HAVE_WCSTOD 1
 
-/* Define if you have the wcstof function.  */
+/* Define to 1 if you have the `wcstof' function. */
 #define HAVE_WCSTOF 1
 
-/* Define if you have the wcstok function.  */
+/* Define to 1 if you have the `wcstok' function. */
 #define HAVE_WCSTOK 1
 
-/* Define if you have the wcstol function.  */
+/* Define to 1 if you have the `wcstol' function. */
 #define HAVE_WCSTOL 1
 
-/* Define if you have the wcstoul function.  */
+/* Define to 1 if you have the `wcstoul' function. */
 #define HAVE_WCSTOUL 1
 
-/* Define if you have the wcsxfrm function.  */
+/* Define to 1 if you have the `wcsxfrm' function. */
 #define HAVE_WCSXFRM 1
 
-/* Define if you have the wctob function.  */
+/* Define to 1 if you have the `wctob' function. */
 #define HAVE_WCTOB 1
 
-/* Define if you have the wmemchr function.  */
+/* Define to 1 if you have the <wctype.h> header file. */
+#define HAVE_WCTYPE_H 1
+
+/* Define to 1 if you have the `wmemchr' function. */
 #define HAVE_WMEMCHR 1
 
-/* Define if you have the wmemcmp function.  */
+/* Define to 1 if you have the `wmemcmp' function. */
 #define HAVE_WMEMCMP 1
 
-/* Define if you have the wmemcpy function.  */
+/* Define to 1 if you have the `wmemcpy' function. */
 #define HAVE_WMEMCPY 1
 
-/* Define if you have the wmemmove function.  */
+/* Define to 1 if you have the `wmemmove' function. */
 #define HAVE_WMEMMOVE 1
 
-/* Define if you have the wmemset function.  */
+/* Define to 1 if you have the `wmemset' function. */
 #define HAVE_WMEMSET 1
 
-/* Define if you have the wprintf function.  */
+/* Define to 1 if you have the `wprintf' function. */
 #define HAVE_WPRINTF 1
 
-/* Define if you have the wscanf function.  */
+/* Define to 1 if you have the `wscanf' function. */
 #define HAVE_WSCANF 1
 
-/* Define if you have the <endian.h> header file.  */
-/* #undef HAVE_ENDIAN_H */
+/* Define to 1 if you have the `_acosf' function. */
+/* #undef HAVE__ACOSF */
 
-/* Define if you have the <float.h> header file.  */
-#define HAVE_FLOAT_H 1
+/* Define to 1 if you have the `_acosl' function. */
+/* #undef HAVE__ACOSL */
 
-/* Define if you have the <fp.h> header file.  */
-/* #undef HAVE_FP_H */
+/* Define to 1 if you have the `_asinf' function. */
+/* #undef HAVE__ASINF */
 
-/* Define if you have the <gconv.h> header file.  */
-/* #undef HAVE_GCONV_H */
+/* Define to 1 if you have the `_asinl' function. */
+/* #undef HAVE__ASINL */
 
-/* Define if you have the <ieeefp.h> header file.  */
-#define HAVE_IEEEFP_H 1
+/* Define to 1 if you have the `_atan2f' function. */
+/* #undef HAVE__ATAN2F */
 
-/* Define if you have the <inttypes.h> header file.  */
-#define HAVE_INTTYPES_H 1
+/* Define to 1 if you have the `_atan2l' function. */
+/* #undef HAVE__ATAN2L */
 
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
+/* Define to 1 if you have the `_atanf' function. */
+/* #undef HAVE__ATANF */
 
-/* Define if you have the <machine/endian.h> header file.  */
-#define HAVE_MACHINE_ENDIAN_H 1
+/* Define to 1 if you have the `_atanl' function. */
+/* #undef HAVE__ATANL */
 
-/* Define if you have the <machine/param.h> header file.  */
-#define HAVE_MACHINE_PARAM_H 1
+/* Define to 1 if you have the `_ceilf' function. */
+/* #undef HAVE__CEILF */
 
-/* Define if you have the <nan.h> header file.  */
-/* #undef HAVE_NAN_H */
+/* Define to 1 if you have the `_ceill' function. */
+/* #undef HAVE__CEILL */
 
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
+/* Define to 1 if you have the `_copysign' function. */
+/* #undef HAVE__COPYSIGN */
 
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
+/* Define to 1 if you have the `_copysignl' function. */
+/* #undef HAVE__COPYSIGNL */
 
-/* Define if you have the <sys/filio.h> header file.  */
-#define HAVE_SYS_FILIO_H 1
+/* Define to 1 if you have the `_cosf' function. */
+/* #undef HAVE__COSF */
 
-/* Define if you have the <sys/ioctl.h> header file.  */
-#define HAVE_SYS_IOCTL_H 1
+/* Define to 1 if you have the `_coshf' function. */
+/* #undef HAVE__COSHF */
 
-/* Define if you have the <sys/isa_defs.h> header file.  */
-/* #undef HAVE_SYS_ISA_DEFS_H */
+/* Define to 1 if you have the `_coshl' function. */
+/* #undef HAVE__COSHL */
 
-/* Define if you have the <sys/machine.h> header file.  */
-/* #undef HAVE_SYS_MACHINE_H */
+/* Define to 1 if you have the `_cosl' function. */
+/* #undef HAVE__COSL */
 
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
+/* Define to 1 if you have the `_expf' function. */
+/* #undef HAVE__EXPF */
 
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
+/* Define to 1 if you have the `_expl' function. */
+/* #undef HAVE__EXPL */
 
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
+/* Define to 1 if you have the `_fabsf' function. */
+/* #undef HAVE__FABSF */
 
-/* Define if you have the <sys/types.h> header file.  */
-#define HAVE_SYS_TYPES_H 1
+/* Define to 1 if you have the `_fabsl' function. */
+/* #undef HAVE__FABSL */
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `_finite' function. */
+/* #undef HAVE__FINITE */
 
-/* Define if you have the <wchar.h> header file.  */
-#define HAVE_WCHAR_H 1
+/* Define to 1 if you have the `_finitef' function. */
+/* #undef HAVE__FINITEF */
 
-/* Define if you have the <wctype.h> header file.  */
-#define HAVE_WCTYPE_H 1
+/* Define to 1 if you have the `_finitel' function. */
+/* #undef HAVE__FINITEL */
 
-/* Define if you have the m library (-lm).  */
-#define HAVE_LIBM 1
+/* Define to 1 if you have the `_floorf' function. */
+/* #undef HAVE__FLOORF */
 
-/* Name of package */
-#define PACKAGE "libstdc++"
+/* Define to 1 if you have the `_floorl' function. */
+/* #undef HAVE__FLOORL */
 
-/* Version number of package */
-#define VERSION "3.3.1"
+/* Define to 1 if you have the `_fmodf' function. */
+/* #undef HAVE__FMODF */
 
-/* Define if the compiler is configured for setjmp/longjmp exceptions. */
-/* #undef _GLIBCPP_SJLJ_EXCEPTIONS */
+/* Define to 1 if you have the `_fmodl' function. */
+/* #undef HAVE__FMODL */
 
-/* Define if sigsetjmp is available.   */
-#define HAVE_SIGSETJMP 1
+/* Define to 1 if you have the `_fpclass' function. */
+/* #undef HAVE__FPCLASS */
 
-/* Only used in build directory testsuite_hooks.h. */
-#define HAVE_MEMLIMIT_DATA 0
+/* Define to 1 if you have the `_frexpf' function. */
+/* #undef HAVE__FREXPF */
 
-/* Only used in build directory testsuite_hooks.h. */
-#define HAVE_MEMLIMIT_RSS 0
+/* Define to 1 if you have the `_frexpl' function. */
+/* #undef HAVE__FREXPL */
 
-/* Only used in build directory testsuite_hooks.h. */
-#define HAVE_MEMLIMIT_VMEM 0
+/* Define to 1 if you have the `_hypot' function. */
+/* #undef HAVE__HYPOT */
 
-/* Only used in build directory testsuite_hooks.h. */
-#define HAVE_MEMLIMIT_AS 0
+/* Define to 1 if you have the `_hypotf' function. */
+/* #undef HAVE__HYPOTF */
+
+/* Define to 1 if you have the `_hypotl' function. */
+/* #undef HAVE__HYPOTL */
+
+/* Define to 1 if you have the `_isinf' function. */
+/* #undef HAVE__ISINF */
+
+/* Define to 1 if you have the `_isinff' function. */
+/* #undef HAVE__ISINFF */
+
+/* Define to 1 if you have the `_isinfl' function. */
+/* #undef HAVE__ISINFL */
+
+/* Define to 1 if you have the `_isnan' function. */
+/* #undef HAVE__ISNAN */
+
+/* Define to 1 if you have the `_isnanf' function. */
+/* #undef HAVE__ISNANF */
+
+/* Define to 1 if you have the `_isnanl' function. */
+/* #undef HAVE__ISNANL */
+
+/* Define to 1 if you have the `_ldexpf' function. */
+/* #undef HAVE__LDEXPF */
+
+/* Define to 1 if you have the `_ldexpl' function. */
+/* #undef HAVE__LDEXPL */
+
+/* Define to 1 if you have the `_log10f' function. */
+/* #undef HAVE__LOG10F */
+
+/* Define to 1 if you have the `_log10l' function. */
+/* #undef HAVE__LOG10L */
 
+/* Define to 1 if you have the `_logf' function. */
+/* #undef HAVE__LOGF */
+
+/* Define to 1 if you have the `_logl' function. */
+/* #undef HAVE__LOGL */
+
+/* Define to 1 if you have the `_modff' function. */
+/* #undef HAVE__MODFF */
+
+/* Define to 1 if you have the `_modfl' function. */
+/* #undef HAVE__MODFL */
+
+/* Define to 1 if you have the `_powf' function. */
+/* #undef HAVE__POWF */
+
+/* Define to 1 if you have the `_powl' function. */
+/* #undef HAVE__POWL */
+
+/* Define to 1 if you have the `_qfpclass' function. */
+/* #undef HAVE__QFPCLASS */
+
+/* Define to 1 if you have the `_sincos' function. */
+/* #undef HAVE__SINCOS */
+
+/* Define to 1 if you have the `_sincosf' function. */
+/* #undef HAVE__SINCOSF */
+
+/* Define to 1 if you have the `_sincosl' function. */
+/* #undef HAVE__SINCOSL */
+
+/* Define to 1 if you have the `_sinf' function. */
+/* #undef HAVE__SINF */
+
+/* Define to 1 if you have the `_sinhf' function. */
+/* #undef HAVE__SINHF */
+
+/* Define to 1 if you have the `_sinhl' function. */
+/* #undef HAVE__SINHL */
+
+/* Define to 1 if you have the `_sinl' function. */
+/* #undef HAVE__SINL */
+
+/* Define to 1 if you have the `_sqrtf' function. */
+/* #undef HAVE__SQRTF */
+
+/* Define to 1 if you have the `_sqrtl' function. */
+/* #undef HAVE__SQRTL */
+
+/* Define to 1 if you have the `_tanf' function. */
+/* #undef HAVE__TANF */
+
+/* Define to 1 if you have the `_tanhf' function. */
+/* #undef HAVE__TANHF */
+
+/* Define to 1 if you have the `_tanhl' function. */
+/* #undef HAVE__TANHL */
+
+/* Define to 1 if you have the `_tanl' function. */
+/* #undef HAVE__TANL */
+
+/* Define to 1 if you have the `__signbit' function. */
+#define HAVE___SIGNBIT 1
+
+/* Define to 1 if you have the `__signbitf' function. */
+/* #undef HAVE___SIGNBITF */
+
+/* Define to 1 if you have the `__signbitl' function. */
+/* #undef HAVE___SIGNBITL */
+
+/* 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 "package-unused"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "package-unused version-unused"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libstdc++"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "version-unused"
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if a full hosted library is built, or 0 if freestanding. */
+#define _GLIBCXX_HOSTED 1
+
+/* Define if the compiler is configured for setjmp/longjmp exceptions. */
+/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
 //
 // Systems that have certain non-standard functions prefixed with an
 // underscore, we'll handle those here. Must come after config.h.in.
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index cb41af2..4abeed4 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -14,7 +14,7 @@ SRCS=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc \
 	pure.cc tinfo.cc tinfo2.cc vec.cc
 
 # from libiberty:
-SRCS+=	cp-demangle.c dyn-string.c
+SRCS+=	cp-demangle.c
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
 CFLAGS+=	-I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++
@@ -22,6 +22,6 @@ CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h
 INCS=	${HDRS:S;^;${SRCDIR}/;}
-INCSDIR=${INCLUDEDIR}/c++/3.3
+INCSDIR=${INCLUDEDIR}/c++/3.4
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index d8ea8c2..69b4eb9 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -10,7 +10,7 @@ SUBDIR+= cpp
 .endif
 
 .if !defined(NO_CXX)
-SUBDIR+= cc1plus c++ c++filt
+SUBDIR+= cc1plus c++
 .if !defined(NO_COLLECT2)
 #SUBDIR+= collect2
 .endif
diff --git a/gnu/usr.bin/cc/Makefile.fe b/gnu/usr.bin/cc/Makefile.fe
index c4a02f8..a7057b1 100644
--- a/gnu/usr.bin/cc/Makefile.fe
+++ b/gnu/usr.bin/cc/Makefile.fe
@@ -3,3 +3,13 @@
 #	Front-end-only bits
 
 version!=	sed -n /version_string/p ${GCCDIR}/version.c | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'
+
+#
+# These were previously defined in gcc.c.  Just copy previous values from
+# there. We ifdef most of them out for FREEBSD_NATIVE builds anyway.
+# gcc.c won't compile without them though.
+DRIVER_DEFINES = \
+	-DDEFAULT_TARGET_VERSION=\"$(version)\" \
+	-DDEFAULT_TARGET_MACHINE=\"$(target)\" \
+
+CFLAGS+= ${DRIVER_DEFINES}
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 5423dc7..6182b69 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -9,11 +9,11 @@ GCC_CPU=	arm
 .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 GCC_CPU=	i386
 .elif ${TARGET_ARCH} == "ia64"
+TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD
 GCC_CPU=	ia64
 .elif ${TARGET_ARCH} == "powerpc"
 GCC_CPU=	rs6000
 .elif ${TARGET_ARCH} == "sparc64"
 GCC_CPU=	sparc
 TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
-CFLAGS+=	-DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT}
 .endif
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index fa58603..a681f67 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -11,9 +11,6 @@ LINKS=	${BINDIR}/c++ ${BINDIR}/g++
 LINKS+=	${BINDIR}/c++ ${BINDIR}/CC
 NOMAN=	1
 
-CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
-
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index b4fe47f..0df2e6e 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -13,9 +13,6 @@ NOSHARED?=yes
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
 
-CFLAGS+= -DDEFAULT_TARGET_VERSION=\"$(version)\"
-CFLAGS+= -DDEFAULT_TARGET_MACHINE=\"$(target)\"
-
 DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 6d8d08d..ec11651 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -5,14 +5,14 @@
 .PATH: ${GCCDIR}
  
 PROG=	cc1
-SRCS=	main.c c-parse+%DIKED.c c-lang.c c-decl.c c-opts.c
+SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED?=yes
 
 CFLAGS+= -I.
 
-DPADD=	${LIBCC_INT} 
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
@@ -23,9 +23,8 @@ c-parse+%DIKED.c: c-parse.c
 	    ${.ALLSRC} > ${.TARGET}
 
 c-parse.y: c-parse.in
-	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
-	    -e "/^ifc$$/d" \
-	    -e "/^end ifc$$/d" \
+	sed -e "/^@@ifobjc.*/,/^@@end_ifobjc.*/d" \
+	    -e "/^@@ifc.*/d" -e "/^@@end_ifc.*/d" \
 	    ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES=	c-parse+%DIKED.c c-parse.c c-parse.y
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 9d9e598..c025743 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -5,14 +5,14 @@
 .PATH: ${GCCDIR}/objc ${GCCDIR}
 
 PROG=	cc1obj
-SRCS=	objc-parse+DIKED.c objc-act.c objc-lang.c main.c c-decl.c
+SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
 BINDIR=	/usr/libexec
 NOMAN=	1
 NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.
 
-DPADD=	${LIBCC_INT} 
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
@@ -23,9 +23,8 @@ objc-parse+DIKED.c: objc-parse.c
 	    ${.ALLSRC} > ${.TARGET}
 
 objc-parse.y: c-parse.in
-	sed -e "/^ifc$$/,/^end ifc$$/d" \
-	    -e "/^ifobjc$$/d" \
-	    -e "/^end ifobjc$$/d" \
+	sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \
+	    -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" \
 	    ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES=	objc-parse+DIKED.c objc-parse.c objc-parse.y
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index ca6743c..c26703d 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -5,11 +5,11 @@
 .PATH: ${GCCDIR}/cp ${GCCDIR}
 
 PROG=	cc1plus
-SRCS=	parse+%DIKED.c parse.h cfns.h
-SRCS+=	main.c cp-lang.c c-opts.c \
-	call.c class.c cvt.c decl.c decl2.c error.c except.c expr.c friend.c \
-	init.c lex.c mangle.c method.c pt.c ptree.c repo.c rtti.c search.c \
-	semantics.c spew.c tree.c typeck.c typeck2.c dump.c optimize.c 
+SRCS=	cfns.h
+SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
+	decl.c decl2.c error.c except.c expr.c dump.c friend.c  init.c lex.c \
+	mangle.c method.c name-lookup.c parser.c pt.c ptree.c repo.c rtti.c \
+	search.c semantics.c tree.c typeck.c typeck2.c optimize.c 
 
 BINDIR=	/usr/libexec
 NOMAN=	1
@@ -17,25 +17,15 @@ NOSHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
-DPADD=	${LIBCC_INT} 
+PADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
 #-----------------------------------------------------------------------
 # C++ parser
-
-parse+%DIKED.c y.tab.h: parse.c
-	sed -e "s/malloc/xmalloc/g" \
-	    -e "s/realloc/xrealloc/g" \
-	    ${.ALLSRC:M*c} > ${.TARGET}
-
-parse.h: y.tab.h
-	cp -pf y.tab.h ${.TARGET}
-	grep '^#define[   ]*YYEMPTY' ${.TARGET:S/h$/c/} >>${.TARGET}
-
 cfns.h: cfns.gperf
-	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \
+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
 	    ${.ALLSRC} > ${.TARGET}
 
-CLEANFILES=	parse+%DIKED.c parse.c parse.h y.tab.h cfns.h
+CLEANFILES= cfns.h
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 9e37575..c98244d 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -2,38 +2,65 @@
 
 .include "../Makefile.inc"
 
-.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} ${GCCDIR}/../libiberty
+.PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
 LIB=		cc_int
 INTERNALLIB=	YES
 
-#	dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \
-#	alias.c bitmap.c dwarf2out.c dyn-string.c \
-SRCS=	c-common.c c-dump.c c-format.c c-opts.c \
-	c-pragma.c c-semantics.c \
-	caller-save.c calls.c combine.c convert.c cse.c \
-	dbxout.c dwarfout.c dwarf2out.c dwarf2asm.c emit-rtl.c explow.c expmed.c expr.c \
-	final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \
-	gtype-desc.c haifa-sched.c \
-	integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \
-	print-rtl.c print-tree.c \
-	ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \
-	real.c recog.c reg-stack.c regclass.c \
-	reload.c reload1.c reorg.c rtl.c rtlanal.c \
-	sbitmap.c sdbout.c stmt.c stor-layout.c \
-	toplev.c tracer.c tree.c unroll.c varasm.c xcoffout.c \
-	alias.c bitmap.c dyn-string.c \
-	genrtl.c profile.c regmove.c varray.c \
-	attribs.c cselib.c debug.c rtl-error.c tree-dump.c tree-inline.c
+# Files from libiberty.
+SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
+        dyn-string.c errors.c fibheap.c getpwd.c getruntime.c hashtab.c \
+	hex.c lbasename.c make-temp-file.c md5.c obstack.c partition.c \
+	pexecute.c physmem.c splay-tree.c xexit.c xmalloc.c xmemdup.c \
+	xstrdup.c xstrerror.c xexit.c
 
+# Language-independent files.
+SRCS+=	alias.c bb-reorder.c bitmap.c builtins.c caller-save.c calls.c \
+	cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c \
+	cfgloopanal.c cfgloopmanip.c loop-init.c loop-unswitch.c loop-unroll.c \
+	cfgrtl.c combine.c conflict.c convert.c coverage.c cse.c cselib.c \
+	dbxout.c debug.c df.c diagnostic.c dojump.c doloop.c dominance.c \
+	dwarf2asm.c dwarf2out.c emit-rtl.c except.c explow.c \
+	expmed.c expr.c final.c flow.c fold-const.c function.c gcse.c \
+	genrtl.c ggc-common.c global.c graph.c gtype-desc.c \
+	haifa-sched.c hooks.c ifcvt.c  \
+	integrate.c intl.c jump.c  langhooks.c lcm.c lists.c local-alloc.c \
+	loop.c optabs.c options.c opts.c params.c postreload.c predict.c \
+	print-rtl.c print-tree.c value-prof.c \
+	profile.c ra.c ra-build.c ra-colorize.c ra-debug.c ra-rewrite.c \
+	real.c recog.c reg-stack.c regclass.c regmove.c regrename.c \
+	reload.c reload1.c reorg.c resource.c rtl.c rtlanal.c rtl-error.c \
+	sbitmap.c sched-deps.c sched-ebb.c sched-rgn.c sched-vis.c sdbout.c \
+	sibcall.c simplify-rtx.c sreal.c stmt.c stor-layout.c stringpool.c \
+	targhooks.c timevar.c toplev.c tracer.c tree.c tree-dump.c unroll.c \
+	varasm.c varray.c version.c vmsdbgout.c xcoffout.c alloc-pool.c \
+	et-forest.c cfghooks.c bt-load.c pretty-print.c ggc-page.c web.c
+
+# Miscellaneous files.
+SRCS+=	hashtable.c tree-inline.c tree-optimize.c cgraph.c cgraphunit.c
+
+# Host hooks.
+SRCS+=	host-default.c
+
+# C and ObjC files.
+SRCS+=	attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \
+	c-convert.c c-aux-info.c c-common.c c-opts.c c-format.c c-semantics.c \
+	c-incpath.c cppdefault.c c-ppoutput.c c-cppbuiltin.c prefix.c \
+	c-objc-common.c c-dump.c c-pch.c
+
+# Files shared by cc1plus, cc1 and cc1obj
+SRCS+=	c-pretty-print.c
+
+# Machine-dependent files.
 SRCS+=	${GCC_CPU}.c
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-c.c)
 SRCS+=	${GCC_CPU}-c.c
 .endif
 
-SRCS+=	bb-reorder.c conflict.c ggc-common.c \
-	ggc-page.c ifcvt.c lists.c predict.c regrename.c resource.c sibcall.c \
-	simplify-rtx.c ssa.c timevar.c ssa-dce.c ssa-ccp.c df.c fibheap.c
+# libcpp files.
+SRCS+=	cpplib.c cpplex.c cppmacro.c cppexp.c cppfiles.c cpptrad.c \
+	cpphash.c cpperror.c cppinit.c cppcharset.c \
+	line-map.c mkdeps.c cpppch.c
 
 # insn-* gunk -- headers are built in cc_tools, as they are used by the
 # "build-tools"
@@ -43,45 +70,20 @@ CLEANFILES+= insn-$F.c
 insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE}
 	${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c
 .endfor
+.for F in modes
+SRCS+=	insn-$F.c
+CLEANFILES+= insn-$F.c
+insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F
+	${.OBJDIR}/../cc_tools/gen$F > insn-$F.c
+.endfor
 
-#	shared between the drivers
-SRCS+=	multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c mbchar.c concat.c make-temp-file.c
-#	C_AND_OBJC_OBJS
-#SRCS+=	attribs.c c-errors.c c-lex.c c-pragma.c c-decl.c c-typeck.c \
-#	c-convert.c c-aux-info.c c-common.c c-format.c c-semantics.c \
-#	c-objc-common.c
-
-#	XXX: shared by cc1, cc1obj & cpp0
-#	cc1plus seems to be able to tolerate these here,
-#	BUT only if the right .o's are specified in cc1plus/Makefile
-SRCS+=	c-typeck.c \
-	c-errors.c c-convert.c c-aux-info.c c-objc-common.c
-
-#	libbackend
-SRCS+=	builtins.c diagnostic.c doloop.c dominance.c et-forest.c \
-	except.c gcse.c params.c sched-deps.c sched-vis.c sched-rgn.c sched-ebb.c \
-	stringpool.c c-lex.c langhooks.c hashtable.c \
-	hooks.c \
-	cfg.c cfganal.c cfgbuild.c cfgcleanup.c cfglayout.c cfgloop.c cfgrtl.c
-
-#	libcpp
-SRCS+=	cppdefault.c cpperror.c cppexp.c cppfiles.c cppinit.c cpphash.c \
-	cpplex.c cpplib.c cppmacro.c cppmain.c cpptrad.c mkdeps.c line-map.c
-
-#	stuff that makes libiberty now required (2.95) and shouldn't be...
-SRCS+=  splay-tree.c hashtab.c partition.c lbasename.c md5.c hex.c xmemdup.c physmem.c
 CFLAGS+=	-DHAVE_CONFIG_H
-
 CFLAGS+=	-DTARGET_NAME=\"${target}\" -DIN_GCC
-.if defined(TARGET_CPU_DEFAULT)
-CFLAGS+=	-DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT}
-.endif
 
-UNDERSCORES=	0
-SRCS+=	underscore.c
-CLEANFILES+=	underscore.c
-underscore.c: Makefile
-	echo '/*WARNING: This file is automatically generated!*/' >${.TARGET}
-	echo "int prepends_underscore = ${UNDERSCORES};"	  >>${.TARGET}
+# c-pch.o needs extra defines. Replicate the rule here rather than
+# pollute compiler command line for all other files.
+c-pch.o: c-pch.c
+	${CC} ${CFLAGS} -DHOST_MACHINE=\"${host}\" \
+		 -DTARGET_MACHINE=\"${target}\" -c ${.IMPSRC}
 
 .include <bsd.lib.mk>
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index ca6efdd..27dfe6d 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -16,10 +16,43 @@ CFLAGS+=	-I.
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}
+.PATH: ${GCCDIR} ${GCCDIR}/f
 
 CFLAGS+=	-DGENERATOR_FILE
 
+#
+#-----------------------------------------------------------------------
+# Build 'pocket' libiberty exclusively for build tools use.
+
+LIBIBERTY_SRCS=	choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \
+	dyn-string.c errors.c fibheap.c \
+	getpwd.c getruntime.c hashtab.c hex.c lbasename.c make-temp-file.c \
+	md5.c obstack.c partition.c pexecute.c physmem.c splay-tree.c xexit.c \
+	xmalloc.c xmemdup.c xstrdup.c xstrerror.c xexit.c
+LIBIBERTY_OBJS=	${LIBIBERTY_SRCS:R:S/$/.o/g}
+
+SRCS+=	${LIBIBERTY_SRCS}
+
+LIBIBERTY=libiberty.a
+${LIBIBERTY}: ${LIBIBERTY_OBJS}
+	@rm -f ${.TARGET}
+	@${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q`
+	${RANLIB} ${.TARGET}
+CLEANFILES+=	${LIBIBERTY}
+
+#
+#-----------------------------------------------------------------------
+# options
+OPTION_FILES=${GCCDIR}/f/lang.opt ${GCCDIR}/c.opt ${GCCDIR}/common.opt
+
+.ORDER: options.h options.c
+options.h options.c: opts.sh ${OPTION_FILES}
+	/bin/sh ${GCCDIR}/opts.sh mv options.c options.h ${OPTION_FILES}
+	
+
+GENSRCS+=	options.c options.h
+CLEANFILES+=	options.c options.h
+
 #-----------------------------------------------------------------------
 # insn-* gunk
 
@@ -43,8 +76,8 @@ gen-time-stamp: genattr genattrtab genconditions genconstants genemit \
 .for F in attr codes config emit extract flags opinit output peep recog
 build-tools: gen$F
 
-gen$F: gen$F.o rtl.o obstack.o print-rtl.o bitmap.o errors.o gensupport.o \
-	ggc-none.o hashtab.o read-rtl.o concat.o insn-conditions.o
+gen$F: gen$F.o rtl.o print-rtl.o bitmap.o gensupport.o  ggc-none.o \
+	read-rtl.o insn-conditions.o min-insn-modes.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$F.c
@@ -56,9 +89,9 @@ CLEANFILES+=	gen$F
 #
 build-tools: genattrtab
 
-genattrtab : genattrtab.o rtl.o obstack.o print-rtl.o bitmap.o errors.o \
-	gensupport.o ggc-none.o hashtab.o read-rtl.o concat.o \
-	insn-conditions.o genautomata.o varray.o getruntime.o
+genattrtab : genattrtab.o rtl.o print-rtl.o bitmap.o gensupport.o ggc-none.o \
+	read-rtl.o insn-conditions.o genautomata.o varray.o min-insn-modes.o \
+	${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} -lm
 
 GENSRCS+=	genattrtab.c
@@ -71,18 +104,17 @@ CLEANFILES+=	genattrtab
 .for F in constants conditions
 build-tools: gen$F
 
-gen$F: gen$F.o rtl.o obstack.o bitmap.o errors.o gensupport.o \
-       ggc-none.o hashtab.o read-rtl.o concat.o dummy-conditions.o
+gen$F: gen$F.o rtl.o bitmap.o gensupport.o ggc-none.o read-rtl.o dummy-conditions.o min-insn-modes.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$F.c
 CLEANFILES+=	gen$F
 .endfor
 
-.for F in check genrtl preds
+.for F in modes check genrtl preds
 build-tools: gen$F
 
-gen$F: gen$F.o
+gen$F: gen$F.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gen$F.c
@@ -96,11 +128,26 @@ genrtl.c genrtl.h: gengenrtl
 
 GENSRCS+=	genrtl.c genrtl.h
 
-SRCS+=	bitmap.c concat.c dummy-conditions.c errors.c genautomata.c \
+SRCS+=	bitmap.c concat.c dummy-conditions.c genautomata.c \
 	gensupport.c getruntime.c ggc-none.c hashtab.c \
 	obstack.c physmem.c print-rtl.c read-rtl.c rtl.c varray.c xmemdup.c
 
 #-----------------------------------------------------------------------
+# insn modes stuff.
+
+.ORDER: insn-modes.c insn-modes.h
+insn-modes.h: genmodes
+	./genmodes -h > insn-modes.h
+
+insn-modes.c: genmodes
+	./genmodes > insn-modes.c
+
+min-insn-modes.c: genmodes
+	./genmodes -m > min-insn-modes.c
+
+GENSRCS+= insn-modes.c min-insn-modes.c insn-modes.h
+
+#-----------------------------------------------------------------------
 # Common parser stuff.
 
 tree-check.h: gencheck
@@ -136,7 +183,7 @@ gengtype-yacc+%DIKED.c: gengtype-yacc.c
 	    -e "s/realloc/xrealloc/g" \
 	    ${.ALLSRC} > ${.TARGET}
 
-gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o xmemdup.o
+gengtype: gengtype.o gengtype-yacc+%DIKED.o gengtype-lex.o ${LIBIBERTY}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
 
 GENSRCS+=	gengtype.c
@@ -156,13 +203,28 @@ gtype-time-stamp: gengtype ${GTFILES}
 GENSRCS+=	gtype-desc.c gtype-desc.h
 CLEANFILES+=	gt-*.h gtype-*.h
 
+#
+#-----------------------------------------------------------------------
+# Fortran build tools
+
+.if !defined(NO_FORTRAN)
+gen-time-stamp: fini
+build-tools: fini
+fini: fini.o ${LIBIBERTY}
+	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+SRCS+=		fini.c
+CLEANFILES+=	fini
+.endif
+
 #-----------------------------------------------------------------------
 # Determine content of variables used by the target/host config files
 
 #
-# The list of headers to go into tconfig.h
+# The list of headers to go into tm.h
 #
-TARGET_INC=	ansidecl.h
+.if ${TARGET_ARCH} == "amd64"
+TARGET_INC=	i386/biarch64.h
+.endif
 TARGET_INC+=	${GCC_CPU}/${GCC_CPU}.h
 .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64"
 TARGET_INC+=	${GCC_CPU}/unix.h
@@ -189,13 +251,16 @@ TARGET_INC+=	${GCC_CPU}/x86-64.h
 TARGET_INC+=	${GCC_CPU}/freebsd64.h
 TARGET_INC+=	freebsd64-fix.h
 .endif
+.if ${TARGET_ARCH} == "powepc"
+TARGET_INC+=	altivec-defs.h
+.endif
 TARGET_INC+=	defaults.h
 
 #
 # Use TARGET_INC as a template and build a list of target specific
 # include files for gengtype to scan
 #
-GCONFIG_H=	${.OBJDIR}/tconfig.h ${.CURDIR}/auto-host.h
+GCONFIG_H=	${.CURDIR}/auto-host.h
 
 .for H in ${TARGET_INC}
 .for D in ${GCCDIR}/config ${GCCDIR} ${.CURDIR}
@@ -210,29 +275,29 @@ GCONFIG_H+=	$D/$H
 #
 srcdir=		${GCCDIR}
 HASHTAB_H=	${GCCDIR}/hashtab.h
+SPLAY_TREE_H=	${GCCDIR}/splay-tree.h
 out_file=	${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}.c
 GTFILES_SRCDIR=	${GCCDIR}
 
 #
 # Copied unchanged from gcc/Makefile.in
 #
-GTFILES = $(GCONFIG_H) $(srcdir)/location.h \
-  $(HASHTAB_H) \
-  $(srcdir)/bitmap.h $(srcdir)/function.h  $(srcdir)/rtl.h $(srcdir)/optabs.h \
-  $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h $(srcdir)/real.h \
-  $(srcdir)/varray.h $(srcdir)/ssa.h $(srcdir)/insn-addr.h $(srcdir)/cselib.h \
+GTFILES = $(srcdir)/input.h $(srcdir)/coretypes.h $(srcdir)/cpplib.h \
+  $(GCONFIG_H) $(HASHTAB_H) $(SPLAY_TREE_H) \
+  $(srcdir)/bitmap.h $(srcdir)/coverage.c $(srcdir)/function.h  $(srcdir)/rtl.h \
+  $(srcdir)/optabs.h $(srcdir)/tree.h $(srcdir)/libfuncs.h $(srcdir)/hashtable.h \
+  $(srcdir)/real.h $(srcdir)/varray.h $(srcdir)/insn-addr.h \
+  $(srcdir)/cselib.h $(srcdir)/basic-block.h  $(srcdir)/cgraph.h \
   $(srcdir)/c-common.h $(srcdir)/c-tree.h \
-  $(srcdir)/basic-block.h \
-  $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c \
-  $(srcdir)/dwarf2out.c $(srcdir)/emit-rtl.c \
-  $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
+  $(srcdir)/alias.c $(srcdir)/bitmap.c $(srcdir)/cselib.c $(srcdir)/cgraph.c \
+  $(srcdir)/dbxout.c $(srcdir)/dwarf2out.c $(srcdir)/dwarf2asm.c \
+  $(srcdir)/emit-rtl.c $(srcdir)/except.c $(srcdir)/explow.c $(srcdir)/expr.c \
   $(srcdir)/fold-const.c $(srcdir)/function.c \
   $(srcdir)/gcse.c $(srcdir)/integrate.c $(srcdir)/lists.c $(srcdir)/optabs.c \
   $(srcdir)/profile.c $(srcdir)/ra-build.c $(srcdir)/regclass.c \
-  $(srcdir)/reg-stack.c \
+  $(srcdir)/reg-stack.c $(srcdir)/cfglayout.c $(srcdir)/langhooks.c \
   $(srcdir)/sdbout.c $(srcdir)/stmt.c $(srcdir)/stor-layout.c \
-  $(srcdir)/tree.c $(srcdir)/varasm.c \
-  $(out_file)
+  $(srcdir)/stringpool.c $(srcdir)/tree.c $(srcdir)/varasm.c  $(out_file)
 
 #
 # Build a list of frontend directories to look into
@@ -271,9 +336,10 @@ GTFILES+=	${GTFILES_FILES}
 #-----------------------------------------------------------------------
 # the host/target compiler config.
 
-COMMONHDRS=	config.h hconfig.h multilib.h options.h specs.h tconfig.h \
-		tm_p.h configargs.h safe-ctype.h
-GENSRCS+=	${COMMONHDRS} gencheck.h gtyp-gen.h
+COMMONHDRS=	bconfig.h config.h configargs.h gencheck.h multilib.h \
+		specs.h safe-ctype.h tconfig.h tm.h tm_p.h gcov-iov.h \
+		gtyp-gen.h
+GENSRCS+=	${COMMONHDRS}
 
 MFILE?=	${.CURDIR}/Makefile
 ${COMMONHDRS}: ${MFILE}
@@ -282,10 +348,31 @@ configargs.h:
 	echo 'static const char configuration_arguments[] ='	> ${.TARGET}
 	echo '	"FreeBSD/${TARGET_ARCH} system compiler";'	>> ${.TARGET}
 	echo 'static const char thread_model[] = "posix";'	>> ${.TARGET}
+	echo 'static const struct {'				>> ${.TARGET}
+	echo '	const char *name, *value;'			>> ${.TARGET}
+	echo '} configure_default_options[] = {'		>> ${.TARGET}
+	echo '	{ "NULL", "NULL" } };'				>> ${.TARGET}
+
+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}
 
-hconfig.h:
-	echo '#include "auto-host.h"'			> ${.TARGET}
-	echo '#include <tconfig.h>'			>> ${.TARGET}
+bconfig.h:
+	echo '#ifndef GCC_BCONFIG_H'			> ${.TARGET}
+	echo '#define GCC_BCONFIG_H'			>> ${.TARGET}
+	echo '#include "auto-host.h"'			>> ${.TARGET}
+.if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
+	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
+.endif
+	echo '#ifdef IN_GCC'				>> ${.TARGET}
+	echo '# include "ansidecl.h"'			>> ${.TARGET}
+	echo '#endif'					>> ${.TARGET}
+	echo '#endif /* GCC_BCONFIG_H */'		>> ${.TARGET}
 
 gencheck.h:
 	echo '#include "cp/cp-tree.def"'		> ${.TARGET}
@@ -301,56 +388,39 @@ multilib.h:
 	echo 'static const char *const multilib_exclusions_raw[] = { \
 	    NULL };'					>> ${.TARGET}
 
-options.h:
-	echo '#include "cp/lang-options.h"'		> ${.TARGET}
-	echo '#include "f/lang-options.h"'		>> ${.TARGET}
-	echo '#include "objc/lang-options.h"'		>> ${.TARGET}
-
 specs.h:
 	echo '#include "cp/lang-specs.h"'		> ${.TARGET}
 	echo '#include "f/lang-specs.h"'		>> ${.TARGET}
 	echo '#include "objc/lang-specs.h"'		>> ${.TARGET}
 
-config.h:
-	echo '#include <hconfig.h>'			> ${.TARGET}
-	echo '#ifndef GENERATOR_FILE'			>> ${.TARGET}
-	echo '#include "insn-constants.h"'		>> ${.TARGET}
-	echo '#include "insn-flags.h"'			>> ${.TARGET}
-	echo '#endif'					>> ${.TARGET}
+config.h: bconfig.h
+	echo '#include <bconfig.h>'			> ${.TARGET}
 
-tconfig.h:
-	echo 'struct rtx_def;'				> ${.TARGET}
-	echo 'typedef struct rtx_def *rtx;'		>> ${.TARGET}
-	echo 'struct rtvec_def;'			>> ${.TARGET}
-	echo 'typedef struct rtvec_def *rtvec;'		>> ${.TARGET}
-	echo 'union tree_node;'				>> ${.TARGET}
-	echo 'typedef union tree_node *tree;'		>> ${.TARGET}
-	echo '#ifndef GTY'				>> ${.TARGET}
-	echo '# define GTY(x)'				>> ${.TARGET}
-	echo '#endif'					>> ${.TARGET}
-	echo ''						>> ${.TARGET}
-.if ${TARGET_ARCH} == "amd64"
-	echo '#include "i386/biarch64.h"'		>> ${.TARGET}
-.endif
-.if ${TARGET_ARCH} == "ia64"
-	echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET}
+tm.h:
+	echo '#ifndef GCC_TM_H'				> ${.TARGET}
+	echo '#define GCC_TM_H'				>> ${.TARGET}
+.if defined(TARGET_CPU_DEFAULT)
+	echo "#define TARGET_CPU_DEFAULT (${TARGET_CPU_DEFAULT})" >> ${.TARGET}
 .endif
+	echo '#ifdef IN_GCC'				>> ${.TARGET}
 .for H in ${TARGET_INC}
 	echo '#include "$H"'				>> ${.TARGET}
 .endfor
-	echo '#ifndef POSIX'				>> ${.TARGET}
-	echo '# define POSIX'				>> ${.TARGET}
+	echo '#if !defined GENERATOR_FILE && !defined USED_FOR_TARGET' >> ${.TARGET}
+	echo '# include "insn-constants.h"'		>> ${.TARGET}
+	echo '# include "insn-flags.h"'			>> ${.TARGET}
+	echo '#endif'					>> ${.TARGET}
 	echo '#endif'					>> ${.TARGET}
 .if exists(${GCCDIR}/config/${GCC_CPU}/${GCC_CPU}-modes.def)
 	echo '#define EXTRA_MODES_FILE "${GCC_CPU}/${GCC_CPU}-modes.def"' >> ${.TARGET}
-	echo '#define EXTRA_CC_MODES 1'			>> ${.TARGET}
 .endif
+	echo '#endif /* GCC_TM_H */'			>> ${.TARGET}
 
 tm_p.h:
 	echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"'	>> ${.TARGET}
 	echo '#include "tm-preds.h"'				>> ${.TARGET}
 
-safe-ctype.h: Makefile
+safe-ctype.h:
 	echo '#include <ctype.h>'				> ${.TARGET}
 .for Z in TOUPPER TOLOWER ISDIGIT ISXDIGIT ISUPPER ISLOWER ISALPHA ISALNUM \
     ISSPACE ISPUNCT ISGRAPH ISBLANK ISPRINT ISCNTRL
@@ -391,8 +461,9 @@ gtyp-gen.h:
 	echo "\"$F\", "						>> ${.TARGET}
 .endfor
 	echo "NULL};"						>> ${.TARGET}
-	echo "#define	xexit exit"				>> ${.TARGET}
 
+gcov-iov.h:
+	echo "#define GCOV_VERSION ((gcov_unsigned_t)0x33303470)" >> ${.TARGET}
 
 #-----------------------------------------------------------------------
 # General things.
@@ -400,7 +471,8 @@ gtyp-gen.h:
 SRCS+=		${GENSRCS}
 CLEANFILES+=	${GENSRCS}
 
-all: ${SRCS}
+all:		${SRCS}
+build-tools:	${SRCS}
 
 .include <bsd.prog.mk>
 
@@ -415,19 +487,42 @@ CLEANFILES+=	${OBJS}
 
 .if !exists(${DEPENDFILE})
 # Fudge pre-dependfile dependencies of objects in much the same way as
-# bsd.prog.mk would do if we defined PROG.  There are complications to
-# avoid circular dependencies.  First, only make most objects depend on
-# all headers.  Filter out the objects that would cause problems (i.e.,
-# objects that will be used to create programs that will generate headers).
-#
-${OBJS}: ${SRCS:M*.h:Ngtype-desc.h:Ngenrtl.h:Ntree-check.h:Ntm-preds.h:Ninsn-*.h}
-
-${OBJS:Ngencheck.o:Ngengenrtl.o:Ngenpreds.o}: tree-check.h tm-preds.h genrtl.h
-
-${OBJS:Ngengtype*.o:Nxmemdup.o:Ngengenrtl.o:Ngencheck.o:Ngenpreds.o}: gtype-desc.h
-
-genextract.o: insn-config.h
-
-insn-conditions.o: insn-constants.h
+# 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
 
 .endif
diff --git a/gnu/usr.bin/cc/cc_tools/auto-host.h b/gnu/usr.bin/cc/cc_tools/auto-host.h
index 8649396..5470788 100644
--- a/gnu/usr.bin/cc/cc_tools/auto-host.h
+++ b/gnu/usr.bin/cc/cc_tools/auto-host.h
@@ -2,382 +2,387 @@
 
 #ifndef __FreeBSD_version
 #include <sys/param.h>
+#include <sys/endian.h>
 #endif
 
-/* auto-host.h.  Generated automatically by configure.  */
-/* config.in.  Generated automatically from configure.in by autoheader.  */
+/* auto-host.h.  Generated by configure.  */
+/* config.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
+/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */
+#define BYTEORDER _BYTE_ORDER
 
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
+/* Define as the number of bits in a byte, if \`limits.h' doesn't. */
+/* #undef CHAR_BIT */
 
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
+/* Define 0/1 to force the choice for exception handling model. */
+/* #undef CONFIG_SJLJ_EXCEPTIONS */
 
-/* Define to the type of elements in the array set by `getgroups'.
-   Usually this is either `int' or `gid_t'.  */
-#define GETGROUPS_T gid_t
+/* Define to enable the use of a default assembler. */
+/* #undef DEFAULT_ASSEMBLER */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef gid_t */
+/* Define to enable the use of a default linker. */
+/* #undef DEFAULT_LINKER */
 
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
+/* Define if you want to use __cxa_atexit, rather than atexit, to register C++
+   destructors for local statics and global objects. This is essential for
+   fully standards-compliant handling of destructors, but requires
+   __cxa_atexit in libc. */
+#define DEFAULT_USE_CXA_ATEXIT 1
 
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
+/* Define to 1 if translation of program messages to the user's native
+   language is requested. */
+/* #undef ENABLE_NLS */
 
-/* Define if you have the ANSI # stringizing operator in cpp. */
-#define HAVE_STRINGIZE 1
+#ifdef WANT_COMPILER_INVARIANTS
+/* #warning WANT_COMPILER_INVARIANTS turned on */
 
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
+/* Define if you want more run-time sanity checks. This one gets a grab bag of
+   miscellaneous but relatively cheap checks. */
+#define ENABLE_CHECKING 1
 
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
+/* Define if you want fold checked that it never destructs its argument. This
+   is quite expensive. */
+#define ENABLE_FOLD_CHECKING 1
 
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
+/* Define if you want the garbage collector to operate in maximally paranoid
+   mode, validating the entire heap and collecting garbage at every
+   opportunity. This is extremely expensive. */
+#define ENABLE_GC_ALWAYS_COLLECT 1
 
-/* Define if your C compiler doesn't accept -c and -o together.  */
-/* #undef NO_MINUS_C_MINUS_O */
+/* Define if you want the garbage collector to do object poisoning and other
+   memory allocation checks. This is quite expensive. */
+#define ENABLE_GC_CHECKING 1
 
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
+/* Define if you want all operations on RTL (the basic data structure of the
+   optimizer and back end) to be checked for dynamic type safety at runtime.
+   This is quite expensive. */
+#define ENABLE_RTL_CHECKING 1
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
+/* Define if you want RTL flag accesses to be checked against the RTL codes
+   that are supported for each access macro. This is relatively cheap. */
+#define ENABLE_RTL_FLAG_CHECKING 1
 
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
+/* Define if you want all operations on trees (the basic data structure of the
+   front ends) to be checked for dynamic type safety at runtime. This is
+   moderately expensive. */
+#define ENABLE_TREE_CHECKING 1
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
+/* Define if you want to run subprograms and generated programs through
+   valgrind (a memory checker). This is extremely expensive. */
+/* #undef ENABLE_VALGRIND_CHECKING */
 
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
+#endif /* WANT_COMPILER_INVARIANTS */
 
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#define TIME_WITH_SYS_TIME 1
+/* Define to 1 if installation paths should be looked up in Windows32
+   Registry. Ignored on non windows32 hosts. */
+/* #undef ENABLE_WIN32_REGISTRY */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef uid_t */
+/* Define to enable detailed memory allocation stats gathering. */
+/* #undef GATHER_STATISTICS */
 
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
+/* Define to the type of elements in the array set by `getgroups'. Usually
+   this is either `int' or `gid_t'. */
+#define GETGROUPS_T gid_t
 
-/* Define if your assembler supports specifying the maximum number
-   of bytes to skip when using the GAS .p2align command.  */
-#define HAVE_GAS_MAX_SKIP_P2ALIGN 1
+/* Define to 1 if you have the `alphasort' function. */
+#define HAVE_ALPHASORT 1
 
-/* Define if your assembler supports .balign and .p2align.  */
-#define HAVE_GAS_BALIGN_AND_P2ALIGN 1
+/* Define if your assembler supports dwarf2 .file/.loc directives, and
+   preserves file table indices exactly as given. */
+#define HAVE_AS_DWARF2_DEBUG_LINE 1
 
-/* Define if your assembler uses the old HImode fild and fist notation.  */
-#define HAVE_GAS_FILDS_FISTS 1
+/* Define if your assembler supports explicit relocations. */
+/* #undef HAVE_AS_EXPLICIT_RELOCS */
 
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef ssize_t */
+/* Define if your assembler supports the --gdwarf2 option. */
+#define HAVE_AS_GDWARF2_DEBUG_FLAG 1
 
-/* Define if cpp should also search $prefix/include.  */
-/* #undef PREFIX_INCLUDE_DIR */
+/* Define true if the assembler supports '.long foo@GOTOFF'. */
+#define HAVE_AS_GOTOFF_IN_DATA 1
 
-/* Define if you have the __argz_count function.  */
-/* #undef HAVE___ARGZ_COUNT */
+/* Define if your assembler supports the --gstabs option. */
+#define HAVE_AS_GSTABS_DEBUG_FLAG 1
 
-/* Define if you have the __argz_next function.  */
-/* #undef HAVE___ARGZ_NEXT */
+/* Define if your assembler supports the Sun syntax for cmov. */
+/* #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX */
 
-/* Define if you have the __argz_stringify function.  */
-/* #undef HAVE___ARGZ_STRINGIFY */
+/* Define if your assembler supports .sleb128 and .uleb128. */
+#define HAVE_AS_LEB128 1
 
-/* Define if you have the alphasort function.  */
-#define HAVE_ALPHASORT 1
+/* Define if your assembler supports ltoffx and ldxmov relocations. */
+/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
 
-/* Define if you have the atoll function.  */
-#if __FreeBSD_version >= 500027
-/* FreeBSD didn't always have atoll(3). */
-#define HAVE_ATOLL 1
-#endif
+/* Define if your assembler supports mfcr field. */
+/* #undef HAVE_AS_MFCRF */
 
-/* Define if you have the atoq function.  */
-/* #undef HAVE_ATOQ */
+/* Define if your assembler supports the -no-mul-bug-abort option. */
+/* #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION */
 
-/* Define if you have the clock function.  */
-#define HAVE_CLOCK 1
+/* Define if your assembler supports offsetable %lo(). */
+/* #undef HAVE_AS_OFFSETABLE_LO10 */
 
-/* Define if you have the dcgettext function.  */
-/* #undef HAVE_DCGETTEXT */
+/* Define if your assembler supports .register. */
+/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
 
-/* Define if you have the dup2 function.  */
-#define HAVE_DUP2 1
+/* Define if your assembler supports -relax option. */
+/* #undef HAVE_AS_RELAX_OPTION */
 
-/* Define if you have the feof_unlocked function.  */
-#define HAVE_FEOF_UNLOCKED 1
+/* Define if your assembler and linker support unaligned PC relative relocs.
+   */
+/* #undef HAVE_AS_SPARC_UA_PCREL */
 
-/* Define if you have the fgets_unlocked function.  */
-/* #undef HAVE_FGETS_UNLOCKED */
+/* Define if your assembler and linker support unaligned PC relative relocs
+   against hidden symbols. */
+/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
 
-/* Define if you have the fprintf_unlocked function.  */
-/* #undef HAVE_FPRINTF_UNLOCKED */
+/* Define if your assembler supports thread-local storage. */
+#define HAVE_AS_TLS 1
 
-/* Define if you have the fputc_unlocked function.  */
-/* #undef HAVE_FPUTC_UNLOCKED */
+/* Define to 1 if you have the `atoll' function. */
+#if __FreeBSD_version >= 500027
+#define HAVE_ATOLL 1
+#endif
 
-/* Define if you have the fputs_unlocked function.  */
-/* #undef HAVE_FPUTS_UNLOCKED */
+/* Define to 1 if you have the `atoq' function. */
+/* #undef HAVE_ATOQ */
 
-/* Define if you have the fwrite_unlocked function.  */
-/* #undef HAVE_FWRITE_UNLOCKED */
+/* Define to 1 if you have the `clock' function. */
+#define HAVE_CLOCK 1
 
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
+/* Define if <time.h> defines clock_t. */
+#define HAVE_CLOCK_T 1
 
-/* Define if you have the getegid function.  */
-#define HAVE_GETEGID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ABORT 1
 
-/* Define if you have the geteuid function.  */
-#define HAVE_GETEUID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ATOF 1
 
-/* Define if you have the getgid function.  */
-#define HAVE_GETGID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ATOL 1
 
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_BASENAME 0
 
-/* Define if you have the getrlimit function.  */
-#define HAVE_GETRLIMIT 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_CALLOC 1
 
-/* Define if you have the getrusage function.  */
-#define HAVE_GETRUSAGE 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_CLOCK 1
 
-/* Define if you have the getuid function.  */
-#define HAVE_GETUID 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_ERRNO 1
 
-/* Define if you have the kill function.  */
-#define HAVE_KILL 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FPRINTF_UNLOCKED 0
 
-/* Define if you have the lstat function.  */
-#define HAVE_LSTAT 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FPUTS_UNLOCKED 0
 
-/* Define if you have the mempcpy function.  */
-/* #undef HAVE_MEMPCPY */
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FREE 1
 
-/* Define if you have the munmap function.  */
-#define HAVE_MUNMAP 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_FWRITE_UNLOCKED 0
 
-/* Define if you have the nl_langinfo function.  */
-#define HAVE_NL_LANGINFO 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETCWD 1
 
-/* Define if you have the putc_unlocked function.  */
-#define HAVE_PUTC_UNLOCKED 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETENV 1
 
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETOPT 1
 
-/* Define if you have the scandir function.  */
-#define HAVE_SCANDIR 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETRLIMIT 1
 
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETRUSAGE 1
 
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_GETWD 1
 
-/* Define if you have the setrlimit function.  */
-#define HAVE_SETRLIMIT 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_LDGETNAME 0
 
-/* Define if you have the stpcpy function.  */
-#define HAVE_STPCPY 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_MALLOC 1
 
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_PUTC_UNLOCKED 1
 
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_REALLOC 1
 
-/* Define if you have the strdup function.  */
-#define HAVE_STRDUP 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_SBRK 1
 
-/* Define if you have the strsignal function.  */
-#define HAVE_STRSIGNAL 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_SETRLIMIT 1
 
-/* Define if you have the strtoul function.  */
-#define HAVE_STRTOUL 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_SNPRINTF 1
 
-/* Define if you have the sysconf function.  */
-#define HAVE_SYSCONF 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_STRSIGNAL 1
 
-/* Define if you have the times function.  */
-#define HAVE_TIMES 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_STRSTR 1
 
-/* Define if you have the tsearch function.  */
-#define HAVE_TSEARCH 1
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_TIMES 1
 
-/* Define if you have the <argz.h> header file.  */
-/* #undef HAVE_ARGZ_H */
+/* Define to 1 if we found this declaration otherwise define to 0. */
+#define HAVE_DECL_VASPRINTF 1
 
-/* Define if you have the <direct.h> header file.  */
+/* Define to 1 if you have the <direct.h> header file. */
 /* #undef HAVE_DIRECT_H */
 
-/* Define if you have the <fcntl.h> header file.  */
+/* Define to 1 if you have the `dup2' function. */
+#define HAVE_DUP2 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
-/* Define if you have the <langinfo.h> header file.  */
-#define HAVE_LANGINFO_H 1
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
 
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
+/* Define to 1 if you have the `fprintf_unlocked' function. */
+/* #undef HAVE_FPRINTF_UNLOCKED */
 
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
+/* Define to 1 if you have the `fputc_unlocked' function. */
+/* #undef HAVE_FPUTC_UNLOCKED */
 
-/* Define if you have the <malloc.h> header file.  */
-/* #undef HAVE_MALLOC_H */
+/* Define to 1 if you have the `fputs_unlocked' function. */
+/* #undef HAVE_FPUTS_UNLOCKED */
 
-/* Define if you have the <nl_types.h> header file.  */
-#define HAVE_NL_TYPES_H 1
+/* Define to 1 if you have the `fwrite_unlocked' function. */
+/* #undef HAVE_FWRITE_UNLOCKED */
 
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
+/* Define if your assembler supports .balign and .p2align. */
+#define HAVE_GAS_BALIGN_AND_P2ALIGN 1
 
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
+/* Define if your assembler uses the new HImode fild and fist notation. */
+#define HAVE_GAS_FILDS_FISTS 1
 
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
+/* Define if your assembler and linker support .hidden. */
+#define HAVE_GAS_HIDDEN 1
 
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
+/* Define if your assembler supports specifying the maximum number of bytes to
+   skip when using the GAS .p2align command. */
+#define HAVE_GAS_MAX_SKIP_P2ALIGN 1
 
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
+/* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.
+   */
+#define HAVE_GAS_SHF_MERGE 1
 
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
+/* Define if your assembler supports .subsection and .subsection -1 starts
+   emitting at the beginning of your section. */
+#define HAVE_GAS_SUBSECTION_ORDERING 1
 
-/* Define if you have the <sys/resource.h> header file.  */
-#define HAVE_SYS_RESOURCE_H 1
+/* Define if your assembler supports .weak. */
+#define HAVE_GAS_WEAK 1
 
-/* Define if you have the <sys/stat.h> header file.  */
-#define HAVE_SYS_STAT_H 1
+/* Define to 1 if you have the `getrlimit' function. */
+#define HAVE_GETRLIMIT 1
 
-/* Define if you have the <sys/time.h> header file.  */
-#define HAVE_SYS_TIME_H 1
+/* Define to 1 if you have the `getrusage' function. */
+#define HAVE_GETRUSAGE 1
 
-/* Define if you have the <sys/times.h> header file.  */
-#define HAVE_SYS_TIMES_H 1
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
 
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
+/* Define if you have the iconv() function. */
+/* #undef HAVE_ICONV */
 
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the <iconv.h> header file. */
+/* #undef HAVE_ICONV_H */
 
-/* Define to enable the use of a default linker. */
-/* #undef DEFAULT_LINKER */
+/* Define .init_array/.fini_array sections are available and working. */
+/* #undef HAVE_INITFINI_ARRAY */
 
-/* Define to enable the use of a default assembler. */
-/* #undef DEFAULT_ASSEMBLER */
+/* Define if you have a working <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
 
-/* Define if your compiler understands volatile. */
-#define HAVE_VOLATILE 1
+/* Define to 1 if you have the `kill' function. */
+#define HAVE_KILL 1
 
-/* Define if your compiler supports the `long double' type. */
-#define HAVE_LONG_DOUBLE 1
+/* Define to 1 if you have the <langinfo.h> header file. */
+#define HAVE_LANGINFO_H 1
 
-/* Define if your compiler supports the `long long' type. */
-#define HAVE_LONG_LONG 1
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#define HAVE_LC_MESSAGES 1
 
-/* Define if your compiler supports the `__int64' type. */
-/* #undef HAVE___INT64 */
+/* Define to 1 if you have the <ldfcn.h> header file. */
+/* #undef HAVE_LDFCN_H */
 
-/* Define if the `_Bool' type is built-in. */
-#define HAVE__BOOL 1
+/* Define if your linker supports --as-needed and --no-as-needed options. */
+/* #undef HAVE_LD_AS_NEEDED */
 
-/* The number of bytes in type short */
-#define SIZEOF_SHORT 2
+/* Define if your linker supports --eh-frame-hdr option. */
+#define HAVE_LD_EH_FRAME_HDR 1
 
-/* The number of bytes in type int */
-#define SIZEOF_INT 4
+/* Define if your linker supports -pie option. */
+/* #undef HAVE_LD_PIE */
 
-/* The number of bytes in type long */
-/* #define SIZEOF_LONG 4 */
-#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
-#define SIZEOF_LONG SIZEOF_INT
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
-#define SIZEOF_LONG SIZEOF_LONG_LONG
-#else
-#error "I don't know what arch this is."
-#endif
+/* Define if your linker links a mix of read-only and read-write sections into
+   a read-write section. */
+#define HAVE_LD_RO_RW_SECTION_MIXING 1
 
-/* The number of bytes in type long long */
-#define SIZEOF_LONG_LONG 8
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
 
-/* The number of bytes in type __int64 */
-/* #undef SIZEOF___INT64 */
+/* Define to 1 if you have the <locale.h> header file. */
+#define HAVE_LOCALE_H 1
 
-/* Define if the host execution character set is EBCDIC. */
-/* #undef HOST_EBCDIC */
+/* Define if your compiler supports the \`long long' type. */
+#define HAVE_LONG_LONG 1
 
-#ifdef WANT_COMPILER_INVARIANTS
-//#warning WANT_COMPILER_INVARIANTS turned on
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
 
-/* Define if you want more run-time sanity checks.  This one gets a grab
-   bag of miscellaneous but relatively cheap checks. */
-#define ENABLE_CHECKING 1
+/* Define to 1 if you have the `mbstowcs' function. */
+#define HAVE_MBSTOWCS 1
 
-/* Define if you want all operations on trees (the basic data
-   structure of the front ends) to be checked for dynamic type safety
-   at runtime.  This is moderately expensive. */
-#define ENABLE_TREE_CHECKING 1
+/* Define if valgrind's memcheck.h header is installed. */
+/* #undef HAVE_MEMCHECK_H */
 
-/* Define if you want all operations on RTL (the basic data structure
-   of the optimizer and back end) to be checked for dynamic type safety
-   at runtime.  This is quite expensive. */
-#define ENABLE_RTL_CHECKING 1
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
 
-/* Define if you want RTL flag accesses to be checked against the RTL
-   codes that are supported for each access macro.  This is relatively
-   cheap. */
-#define ENABLE_RTL_FLAG_CHECKING 1
+/* Define to 1 if you have the `mincore' function. */
+#define HAVE_MINCORE 1
 
-/* Define if you want the garbage collector to do object poisoning and
-   other memory allocation checks.  This is quite expensive. */
-#define ENABLE_GC_CHECKING 1
+/* Define to 1 if you have the `mmap' function. */
+#define HAVE_MMAP 1
 
-/* Define if you want the garbage collector to operate in maximally
-   paranoid mode, validating the entire heap and collecting garbage at
-   every opportunity.  This is extremely expensive. */
-#define ENABLE_GC_ALWAYS_COLLECT 1
+/* Define if mmap with MAP_ANON(YMOUS) works. */
+#define HAVE_MMAP_ANON 1
 
-/* Define if you want to run subprograms and generated programs
-   through valgrind (a memory checker).  This is extremely expensive. */
-/* #undef ENABLE_VALGRIND_CHECKING */
+/* Define if mmap of /dev/zero works. */
+#define HAVE_MMAP_DEV_ZERO 1
 
-#endif	/* WANT_COMPILER_INVARIANTS */
+/* Define if read-only mmap of a plain file works. */
+#define HAVE_MMAP_FILE 1
 
-/* Define if you want to use __cxa_atexit, rather than atexit, to
-   register C++ destructors for local statics and global objects.
-   This is essential for fully standards-compliant handling of
-   destructors, but requires __cxa_atexit in libc. */
-#define DEFAULT_USE_CXA_ATEXIT 1
+/* Define to 1 if you have the `nl_langinfo' function. */
+#define HAVE_NL_LANGINFO 1
 
-/* Define if you want the C and C++ compilers to support multibyte
-   character sets for source code. */
-/* #undef MULTIBYTE_CHARS */
+/* Define if printf supports "%p". */
+#define HAVE_PRINTF_PTR 1
 
-/* Always define this when using the GNU C Library */
-/* #undef _GNU_SOURCE */
+/* Define to 1 if you have the `putc_unlocked' function. */
+#define HAVE_PUTC_UNLOCKED 1
+
+/* Define to 1 if you have the `scandir' function. */
+#define HAVE_SCANDIR 1
+
+/* Define to 1 if you have the `setlocale' function. */
+#define HAVE_SETLOCALE 1
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
 
 /* Define if you have a working <stdbool.h> header file. */
 #if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \
@@ -385,255 +390,202 @@
 #define HAVE_STDBOOL_H 1
 #endif
 
-/* Define if you can safely include both <string.h> and <strings.h>. */
-#define STRING_WITH_STRINGS 1
-
-/* Define as the number of bits in a byte, if `limits.h' doesn't. */
-/* #undef CHAR_BIT */
-
-/* Define if the host machine stores words of multi-word integers in
-   big-endian order. */
-/* #undef HOST_WORDS_BIG_ENDIAN */
-
-/* Define to the floating point format of the host machine, if not IEEE. */
-/* #undef HOST_FLOAT_FORMAT */
-
-/* Define to 1 if the host machine stores floating point numbers in
-   memory with the word containing the sign bit at the lowest address,
-   or to 0 if it does it the other way around.
-
-   This macro should not be defined if the ordering is the same as for
-   multi-word integers. */
-/* #undef HOST_FLOAT_WORDS_BIG_ENDIAN */
-
-/* Define if you have a working <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define if printf supports %p. */
-#define HAVE_PRINTF_PTR 1
-
-/* Define if mmap can get us zeroed pages from /dev/zero. */
-#define HAVE_MMAP_DEV_ZERO 1
-
-/* Define if mmap can get us zeroed pages using MAP_ANON(YMOUS). */
-#define HAVE_MMAP_ANON 1
-
-/* Define if read-only mmap of a plain file works. */
-#define HAVE_MMAP_FILE 1
-
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
 
-/* Define as const if the declaration of iconv() needs const. */
-/* #undef ICONV_CONST */
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETENV 1
-
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ATOL 1
-
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_SBRK 1
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ABORT 1
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ATOF 1
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETCWD 1
+/* Define to 1 if you have the `strsignal' function. */
+#define HAVE_STRSIGNAL 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETWD 1
+/* Define if <sys/times.h> defines struct tms. */
+#define HAVE_STRUCT_TMS 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_STRSIGNAL 1
+/* Define to 1 if you have the `sysconf' function. */
+#define HAVE_SYSCONF 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_PUTC_UNLOCKED 1
+/* Define to 1 if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FPUTS_UNLOCKED 0
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FWRITE_UNLOCKED 0
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FPRINTF_UNLOCKED 0
+/* Define to 1 if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_STRSTR 1
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_ERRNO 1
+/* Define to 1 if you have the <sys/times.h> header file. */
+#define HAVE_SYS_TIMES_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_VASPRINTF 1
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_MALLOC 1
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_REALLOC 1
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_CALLOC 1
+/* Define to 1 if you have the `times' function. */
+#define HAVE_TIMES 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_FREE 1
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_BASENAME 1
+/* Define if <sys/types.h> defines \`uchar'. */
+/* #undef HAVE_UCHAR */
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETOPT 1
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_CLOCK 1
+/* Define if valgrind's valgrind/memcheck.h header is installed. */
+/* #undef HAVE_VALGRIND_MEMCHECK_H */
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETRLIMIT 1
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_SETRLIMIT 1
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETRUSAGE 1
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
 
-/* Define to `long' if <sys/resource.h> doesn't define. */
-/* #undef rlim_t */
+/* Define to 1 if you have the `wcswidth' function. */
+#define HAVE_WCSWIDTH 1
 
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_TIMES 1
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
 
-/* Define if <sys/times.h> defines struct tms. */
-#define HAVE_STRUCT_TMS 1
+/* Define this macro if mbstowcs does not crash when its first argument is
+   NULL. */
+#define HAVE_WORKING_MBSTOWCS 1
 
-/* Define if <time.h> defines clock_t. */
-#define HAVE_CLOCK_T 1
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
 
-/* Define .init_array/.fini_array sections are available and working. */
-/* #undef HAVE_INITFINI_ARRAY */
+/* Define if the \`_Bool' type is built-in. */
+#define HAVE__BOOL 1
 
-/* Define if host mkdir takes a single argument. */
-/* #undef MKDIR_TAKES_ONE_ARG */
+/* Define if your compiler supports the \`__int64' type. */
+/* #undef HAVE___INT64 */
 
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
+/* Define if the host machine stores words of multi-word integers in
+   big-endian order. */
+#if _QUAD_HIGHWORD == 0
+#define HOST_WORDS_BIG_ENDIAN 1 
+#endif
 
 /* Define as const if the declaration of iconv() needs const. */
 /* #undef ICONV_CONST */
 
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if translation of program messages to the user's native language
-   is requested. */
-/* #undef ENABLE_NLS */
-
-/* Define if you have the <libintl.h> header file. */
-/* #undef HAVE_LIBINTL_H */
+/* Define if host mkdir takes a single argument. */
+/* #undef MKDIR_TAKES_ONE_ARG */
 
-/* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
+/* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
+#define NEED_64BIT_HOST_WIDE_INT 1
 
-/* Define to use the libintl included with this package instead of any
-   version in the system libraries. */
-/* #undef USE_INCLUDED_LIBINTL */
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
 
-/* Define to 1 if installation paths should be looked up in Windows32
-   Registry. Ignored on non windows32 hosts. */
-/* #undef ENABLE_WIN32_REGISTRY */
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
 
-/* Define to be the last portion of registry key on windows hosts. */
-/* #undef WIN32_REGISTRY_KEY */
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
 
-/* Define if your assembler supports .subsection and .subsection -1 starts
-   emitting at the beginning of your section. */
-#define HAVE_GAS_SUBSECTION_ORDERING 1
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
 
-/* Define if your assembler supports .weak. */
-#define HAVE_GAS_WEAK 1
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
 
-/* Define if your assembler supports .hidden. */
-#define HAVE_GAS_HIDDEN 1
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
 
-/* Define if your assembler supports .uleb128. */
-#define HAVE_AS_LEB128 1
-
-/* Define if your assembler mis-optimizes .eh_frame data. */
-/* #undef USE_AS_TRADITIONAL_FORMAT */
+/* Define to PREFIX/include if cpp should also search that directory. */
+/* #undef PREFIX_INCLUDE_DIR */
 
-/* Define if your assembler supports marking sections with SHF_MERGE flag. */
-#define HAVE_GAS_SHF_MERGE 1
+/* The number of bytes in type int */
+#define SIZEOF_INT 4
 
-/* Define if your assembler supports thread-local storage. */
-#define HAVE_AS_TLS 1
+#if defined(__i386__) || defined(__powerpc__) || defined(__strongarm__)
+/* The number of bytes in type long */
+# define SIZEOF_LONG SIZEOF_INT
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) || defined(__amd64__)
+# define SIZEOF_LONG SIZEOF_LONG_LONG
+#else
+# error "I don't know what arch this is."
+#endif
 
-/* Define if your assembler supports explicit relocations. */
-/* #undef HAVE_AS_EXPLICIT_RELOCS */
+/* The number of bytes in type long long */
+#define SIZEOF_LONG_LONG 8
 
-/* Define if your assembler supports .register. */
-/* #undef HAVE_AS_REGISTER_PSEUDO_OP */
+/* The number of bytes in type short */
+#define SIZEOF_SHORT 2
 
-/* Define if your assembler supports -relax option. */
-/* #undef HAVE_AS_RELAX_OPTION */
+/* The number of bytes in type void * */
+#define SIZEOF_VOID_P SIZEOF_LONG
 
-/* Define if your assembler and linker support unaligned PC relative relocs. */
-/* #undef HAVE_AS_SPARC_UA_PCREL */
+/* The number of bytes in type __int64 */
+/* #undef SIZEOF___INT64 */
 
-/* Define if your assembler and linker support unaligned PC relative relocs against hidden symbols. */
-/* #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN */
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
 
-/* Define if your assembler supports offsetable %lo(). */
-/* #undef HAVE_AS_OFFSETABLE_LO10 */
+/* Define if you can safely include both <string.h> and <strings.h>. */
+#define STRING_WITH_STRINGS 1
 
-/* Define true if the assembler supports '.long foo@GOTOFF'. */
-#define HAVE_AS_GOTOFF_IN_DATA 1
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
 
-/* Define if your assembler supports ltoffx and ldxmov relocations. */
-/* #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS */
+/* Define if your assembler mis-optimizes .eh_frame data. */
+/* #undef USE_AS_TRADITIONAL_FORMAT */
 
-/* Define if your assembler supports dwarf2 .file/.loc directives,
-   and preserves file table indices exactly as given. */
-#define HAVE_AS_DWARF2_DEBUG_LINE 1
+/* Define if gcc should use -lunwind. */
+/* #undef USE_LIBUNWIND_EXCEPTIONS */
 
-/* Define if your assembler supports the --gdwarf2 option. */
-#define HAVE_AS_GDWARF2_DEBUG_FLAG 1
+/* Define to be the last portion of registry key on windows hosts. */
+/* #undef WIN32_REGISTRY_KEY */
 
-/* Define if your assembler supports the --gstabs option. */
-#define HAVE_AS_GSTABS_DEBUG_FLAG 1
+/* whether byteorder is bigendian */
+/* #undef WORDS_BIGENDIAN */
 
-/* Define if your linker links a mix of read-only
-   and read-write sections into a read-write section. */
-#define HAVE_LD_RO_RW_SECTION_MIXING 1
+/* Always define this when using the GNU C Library */
+/* #undef _GNU_SOURCE */
 
-/* Define if your linker supports --eh-frame-hdr option. */
-#define HAVE_LD_EH_FRAME_HDR 1
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef gid_t */
 
-/* Define if your MIPS libgloss linker scripts consistently include STARTUP directives. */
-/* #undef HAVE_MIPS_LIBGLOSS_STARTUP_DIRECTIVES */
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
 
-/* Define 0/1 to force the choice for exception handling model. */
-/* #undef CONFIG_SJLJ_EXCEPTIONS */
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
 
-/* Define if gcc should use -lunwind. */
-/* #undef USE_LIBUNWIND_EXCEPTIONS */
+/* Define to \`long' if <sys/resource.h> doesn't define. */
+/* #undef rlim_t */
 
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef ssize_t */
 
-/* Bison unconditionally undefines `const' if neither `__STDC__' nor
-   __cplusplus are defined.  That's a problem since we use `const' in
-   the GCC headers, and the resulting bison code is therefore type
-   unsafe.  Thus, we must match the bison behavior here.  */
+/* Define to `int' if <sys/types.h> doesn't define. */
+/* #undef uid_t */
 
-#ifndef __STDC__
-#ifndef __cplusplus
-/* #undef const */
-#define const
-#endif
-#endif
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index 266a70c..2997e25 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -14,8 +14,8 @@
 #undef LOCAL_INCLUDE_DIR		/* We don't wish to support one. */
 
 /* Look for the include files in the system-defined places.  */
-#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/3.3"
-#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.3/backward"
+#define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/3.4"
+#define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/3.4/backward"
 #define GCC_INCLUDE_DIR			PREFIX"/include"
 #ifdef CROSS_COMPILE
 #define CROSS_INCLUDE_DIR		PREFIX"/include"
@@ -31,20 +31,19 @@
    programs: /usr/libexec/<OBJFORMAT>/:STANDARD_EXEC_PREFIX:MD_EXEC_PREFIX
    libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX
 */
-#undef	TOOLDIR_BASE_PREFIX		/* Old??  This is not documented. */
 #undef	STANDARD_BINDIR_PREFIX		/* We don't need one for now. */
 #define	STANDARD_EXEC_PREFIX		PREFIX"/libexec/"
+#define	STANDARD_LIBEXEC_PREFIX		PREFIX"/libexec/"
+#define TOOLDIR_BASE_PREFIX		PREFIX
 #undef	MD_EXEC_PREFIX			/* We don't want one. */
 #define	FBSD_DATA_PREFIX		PREFIX"/libdata/gcc/"
 
 /* Under FreeBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */
 
-#define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
-#ifdef CROSS_COMPILE
-#define CROSS_STARTFILE_PREFIX		PREFIX"/lib/"
-#endif
 #undef  MD_STARTFILE_PREFIX		/* We don't need one for now. */
+#define STANDARD_STARTFILE_PREFIX	PREFIX"/lib/"
+#define STARTFILE_PREFIX_SPEC		PREFIX"/lib/"
 
 /* For the native system compiler, we actually build libgcc in a profiled
    version.  So we should use it with -pg.  */
@@ -57,14 +56,6 @@
 /* FreeBSD is 4.4BSD derived */
 #define bsd4_4
 
-/* Dike out [stupid, IMHO] libiberty functions.  */
-#define	xmalloc_set_program_name(dummy)
-#define	xmalloc		malloc
-#define	xcalloc		calloc
-#define	xrealloc	realloc
-#define	xstrdup		strdup
-#define	xstrerror	strerror
-
 /* And now they want to replace ctype.h.... grr... [stupid, IMHO] */
 #define xxxISDIGIT	isdigit
 #define xxxISGRAPH	isgraph
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 4132e23..7ddcee5 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -2,13 +2,10 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR}			${GCCDIR}/../libiberty
+.PATH: ${GCCDIR}
 
 PROG=	collect2
-SRCS=	collect2.c cp-demangle.c cplus-dem.c tlink.c
+SRCS=	collect2.c tlink.c version.c
 NOMAN=
 
-DPADD=	${LIBCC_INT}
-LDADD=	${LIBCC_INT}
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index 74cdf82..af20541 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -23,7 +23,7 @@ gccint.info: gccint.texi include/gcc-common.texi contribute.texi \
     passes.texi c-tree.texi rtl.texi md.texi tm.texi hostconfig.texi \
     fragments.texi configfiles.texi collect2.texi headerdirs.texi \
     include/funding.texi gnu.texi include/gpl.texi include/fdl.texi \
-    contrib.texi languages.texi sourcebuild.texi gty.texi
+    contrib.texi languages.texi sourcebuild.texi gty.texi libgcc.texi
 
 cpp.info: cpp.texi include/fdl.texi cppenv.texi cppopts.texi
 
diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile
index 436bf59..5f2d86f 100644
--- a/gnu/usr.bin/cc/f771/Makefile
+++ b/gnu/usr.bin/cc/f771/Makefile
@@ -14,22 +14,16 @@ NOMAN=
 
 CFLAGS+= -I${GCCDIR}/f -I.
 
-DPADD=	${LIBCC_INT} 
+DPADD=	${LIBCC_INT}
 LDADD=	${LIBCC_INT}
 
-build-tools: fini
-fini: fini.o
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-CLEANFILES=	fini fini.o
-
 #-----------------------------------------------------------------------
 # str-* gunk
 
 .for i in 1t 2t fo io nq op ot
 .ORDER: str-$i.h str-$i.j
-str-$i.j str-$i.h: str-$i.fin fini
-	./fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h
+str-$i.j str-$i.h: str-$i.fin
+	${.OBJDIR}/../cc_tools/fini ${GCCDIR}/f/str-$i.fin str-$i.j str-$i.h
 
 FINIHDRS+=	str-$i.j str-$i.h
 .endfor
diff --git a/gnu/usr.bin/cc/gcov/Makefile b/gnu/usr.bin/cc/gcov/Makefile
index d4be20d..adb2ac1 100644
--- a/gnu/usr.bin/cc/gcov/Makefile
+++ b/gnu/usr.bin/cc/gcov/Makefile
@@ -2,7 +2,7 @@
 
 .include "../Makefile.inc"
 
-.PATH: ${GCCDIR} ${GCCDIR}/doc		${GCCDIR}/../libiberty
+.PATH: ${GCCDIR} ${GCCDIR}/doc
 
 PROG=	gcov
 SRCS=	gcov.c version.c
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index 2157960..b0b4b30 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -8,6 +8,10 @@
 INCS=	emmintrin.h mmintrin.h pmmintrin.h xmmintrin.h
 .elif ${TARGET_ARCH} == "ia64"
 INCS=	ia64intrin.h
+.elif ${TARGET_ARCH} == "arm"
+INCS=	mmintrin.h
+.elif ${TARGET_ARCH} == "powerpc"
+INCS=	ppc-asm.h altivec.h spe.h
 .endif
 
 NOOBJ=