Bmake glue for GCC 3.4.2-prerelease.

7 files changed, 666 insertions, 558 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>