Add some build glue for libstdc++. I'm not a C++ person, but this seems

to work at least for the non-hairy stuff.  The main wrinkle here is that
a whole mess of include files get installed and under different names.
An earlier version of this built a shadow include tree first in the obj
directory, but this depends on the 'make includes' functionality.

More tweaking is certainly going to be needed.

12 files changed, 1432 insertions, 183 deletions

diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 79f73dd..9c07c7c 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -8,10 +8,10 @@ SUBDIR+= libgcc_r
 .endif
 .endif
 
-.if notyet
+# libsupc++ uses libstdc++ headers, although 'make includes' should
+# have taken care of that already.
 .if !defined(NO_CXX)
-SUBDIR+= libsupc++ libstdc++
-.endif
+SUBDIR+= libstdc++ libsupc++
 .endif
 
 .if !defined(NO_OBJC)
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index d27fe64..9ab6a17 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,8 +1,12 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../contrib/libstdc++-v3/src
+GCCDIR=	${.CURDIR}/../../../contrib/gcc
+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} ${SRCDIR}/std \
+       ${SUPDIR}
 
 SUBDIR=	doc
 
@@ -10,18 +14,17 @@ LIB=		stdc++
 SHLIB_MAJOR=	4
 SHLIB_MINOR=	0
 
-CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-I${.CURDIR} -I${SRCDIR}/include -I.
-CXXFLAGS+=	-nostdinc++ \
-		-fno-implicit-templates -ffunction-sections -fdata-sections
-LDFLAGS+=	-version-info 4:0:0 -Wl,--version-script=linker.map
+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
 
-LDADD+=		-lm -lsupc++
-DPADD+=		${LIBM} ${LIBSUPCXX}
+LDADD+=		-lm
+DPADD+=		${LIBM}
 
-# libstdc++ sources (libstdc++-v3/src/Makefile.in, do not reorder)
+# libstdc++ sources (libstdc++/src/Makefile.in, do not reorder)
 SRCS+=	globals.cc limits.cc basic_file_stdio.cc complex_io.cc ios.cc \
-	strstream.cc cmath.cc bitset.cc functexcept.cc stdexcept.cc \
+	strstream-fixed.cc cmath.cc bitset.cc functexcept.cc stdexcept.cc \
 	vterminate.cc c_locale.cc locale.cc localename.cc codecvt.cc \
 	collate_members.cc ctype_members.cc messages_members.cc \
 	monetary_members.cc numeric_members.cc time_members.cc concept-inst.cc \
@@ -31,66 +34,68 @@ SRCS+=	globals.cc limits.cc basic_file_stdio.cc complex_io.cc ios.cc \
 # C parts of math
 SRCS+=	nan.c signbit.c signbitf.c signbitl.c # stubs.c
 
-#------------------------------------------------------------------------------
-#	From libstdc++-v3/include/Makefile.am
-
-BITHDRS=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 fpos.h fstream.tcc functexcept.h generic_shadow.h \
-	gslice.h gslice_array.h indirect_array.h ios_base.h istream.tcc \
-	locale_facets.h locale_facets.tcc localefwd.h mask_array.h ostream.tcc \
-	pthread_allocimpl.h stream_iterator.h streambuf_iterator.h slice.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_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 \
-	streambuf.tcc stringfwd.h type_traits.h valarray_array.h \
-	valarray_array.tcc valarray_meta.h
-
-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.h strstream \
-	backward_warning.h
-
-EXTHDRS=algorithm functional hash_map hash_set iterator memory numeric \
-	rb_tree rope ropeimpl.h slist stl_hash_fun.h stl_hashtable.h stl_rope.h
-
-# This is the common subset of files that all three "C" header models use.
-BASEDHDRS=std_cassert.h std_cctype.h std_cerrno.h std_cfloat.h std_ciso646.h \
-	std_climits.h std_clocale.h std_cmath.h std_csetjmp.h std_csignal.h \
-	std_cstdarg.h std_cstddef.h std_cstdio.h std_cstdlib.h std_cstring.h \
-	std_ctime.h std_cwchar.h std_cwctype.h \
-	cmath.tcc
-
-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
-
-TGTHDRS=ctype_base.h ctype_inline.h ctype_noninline.h os_defines.h \
-	atomicity.h cpu_limits.h 
-
-# These extra_target_headers files are all built with ad hoc naming rules.
-XTGHDRS=basic_file.h c++config.h c++io.h c++locale.h messages_members.h \
-	codecvt_specializations.h 
-
-THDHDRS=gthr.h gthr-single.h gthr-posix.h gthr-default.h 
-
-BASEDHDRS_renamed=	${BASEDHDRS:Mstd_*:S/std_//g:S/.h//g}
-STDHDRS_renamed=	${STDHDRS:Mstd_*:S/std_//g:S/.h//g}
-
-INCS=		_G_config.h ${HDRS:S;^;${SRCDIR}/;} ${IHDRS} ${STLHDRS}
-
-INCSGROUPS=	INCS STDHDRS
+# 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 \
+	new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc \
+	pure.cc tinfo.cc tinfo2.cc vec.cc
+
+# from libiberty:
+SRCS+=	${GCCDIR}/cp-demangle.c ${GCCDIR}/dyn-string.c
+
+strstream-fixed.cc:	${SRCDIR}/src/strstream.cc
+	sed -e 's,^#include <strstream.h>,#include <backward/strstream.h>,g' \
+	    < ${SRCDIR}/src/strstream.cc > strstream-fixed.cc
+
+CLEANFILES+=	strstream-fixed.cc
+
 INCSDIR=	${INCLUDEDIR}/g++
-STDHDRSDIR=	${INCLUDEDIR}/g++/std
+BUILDHDRS=	gthr.h gthr-single.h gthr-posix.h gthr-default.h
+
+BASELINKS!=	awk '$$0 !~ /^\#/ {print "include/" $$1, $$2}' ${.CURDIR}/includes.map
+CONFIGLINKS!=	awk '$$0 !~ /^\#/ {print "config/" $$1, $$2}' ${.CURDIR}/configs.map
+CPULINKS!=	awk '$$0 !~ /^\#/ {print "config/" $$1, $$2}' ${.CURDIR}/${MACHINE_ARCH}.map
+INCLUDES=	${BASELINKS} ${CONFIGLINKS} ${CPULINKS}
+
+gthr.h: ${GCCDIR}/gthr.h
+	sed -e '/^#/s/\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][ABCDEFGHIJKLMNOPQRSTUVWXYZ_]*\)/_GLIBCPP_\1/g' \
+	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
+	    < ${GCCDIR}/gthr.h > gthr.h
+
+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
+
+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
+
+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' \
+	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
+	    < ${GCCDIR}/gthr-posix.h > gthr-default.h
+
+CLEANFILES+=	${BUILDHDRS}
+buildincludes:	${BUILDHDRS}
+
+installincludes:
+	@set ${INCLUDES}; \
+	while test $$# -ge 2; do \
+		l=${SRCDIR}/$$1; \
+		shift; \
+		t=$$1; \
+		shift; \
+		${ECHO} $$l -\> ${DESTDIR}${INCSDIR}/$$t; \
+		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		     $$l ${DESTDIR}${INCSDIR}/$$t; \
+	done; true
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	    ${BUILDHDRS} ${.CURDIR}/c++config.h ${DESTDIR}${INCSDIR}/bits
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libstdc++/_G_config.h b/gnu/lib/libstdc++/_G_config.h
deleted file mode 100644
index 59dbc77..0000000
--- a/gnu/lib/libstdc++/_G_config.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $FreeBSD$ */
-
-/* XXX _G_VTABLE_LABEL_PREFIX is different between ELF and a.out */
-
-/* AUTOMATICALLY GENERATED; DO NOT EDIT! */ 
-#ifndef _G_config_h
-#define _G_config_h
-#define _G_LIB_VERSION "3.0.0"
-#define _G_VTABLE_LABEL_HAS_LENGTH 1
-#ifdef __ELF__
-#define _G_NAMES_HAVE_UNDERSCORE 0
-#define _G_VTABLE_LABEL_PREFIX "_vt$"
-#define _G_VTABLE_LABEL_PREFIX_ID _vt$
-#else
-#define _G_NAMES_HAVE_UNDERSCORE 1
-#define _G_VTABLE_LABEL_PREFIX "__vt$"
-#endif
-#define _G_HAVE_ST_BLKSIZE 1
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-typedef          int   _G_int8_t __attribute__((__mode__(__QI__)));
-typedef unsigned int  _G_uint8_t __attribute__((__mode__(__QI__)));
-typedef          int  _G_int16_t __attribute__((__mode__(__HI__)));
-typedef unsigned int _G_uint16_t __attribute__((__mode__(__HI__)));
-typedef          int  _G_int32_t __attribute__((__mode__(__SI__)));
-typedef unsigned int _G_uint32_t __attribute__((__mode__(__SI__)));
-typedef          int  _G_int64_t __attribute__((__mode__(__DI__)));
-typedef unsigned int _G_uint64_t __attribute__((__mode__(__DI__)));
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-__extension__ typedef long long _G_llong;
-__extension__ typedef unsigned long long _G_ullong;
-#endif
-#else
-typedef  short  _G_int16_t;
-typedef unsigned short _G_uint16_t;
-typedef  int  _G_int32_t;
-typedef unsigned int _G_uint32_t;
-#endif
-
-typedef unsigned long _G_clock_t;
-typedef unsigned int _G_dev_t;
-typedef int __attribute__((__mode__(__DI__))) _G_fpos_t;
-typedef unsigned int _G_gid_t;
-typedef unsigned int _G_ino_t;
-typedef unsigned short _G_mode_t;
-typedef unsigned short _G_nlink_t;
-typedef int __attribute__((__mode__(__DI__))) _G_off_t;
-typedef int _G_pid_t;
-#ifndef __PTRDIFF_TYPE__
-#define __PTRDIFF_TYPE__ int
-#endif
-typedef __PTRDIFF_TYPE__ _G_ptrdiff_t;
-typedef unsigned int _G_sigset_t;
-#ifndef __SIZE_TYPE__
-#define __SIZE_TYPE__ unsigned int
-#endif
-typedef __SIZE_TYPE__ _G_size_t;
-typedef long _G_time_t;
-typedef unsigned int _G_uid_t;
-typedef int _G_wchar_t;
-
-#define _G_BUFSIZ 1024
-#define _G_FOPEN_MAX 20
-#define _G_FILENAME_MAX 1024
-#if defined (__cplusplus) || defined (__STDC__)
-#define _G_ARGS(ARGLIST) ARGLIST
-#else
-#define _G_ARGS(ARGLIST) ()
-#endif
-#if !defined (__GNUG__) || defined (__STRICT_ANSI__)
-#define _G_NO_NRV
-#endif
-#if !defined (__GNUG__)
-#define _G_NO_EXTERN_TEMPLATES
-#endif
-typedef int _G_ssize_t;
-typedef int /* default */ _G_wint_t;
-#ifdef __i386__
-typedef char * _G_va_list;
-#else
-#define _G_NEED_STDARG_H
-#define _G_va_list va_list
-#endif /* __i386__ */
-#define _G_signal_return_type void
-#define _G_sprintf_return_type int
-#define _G_HAVE_ATEXIT 1
-#define _G_HAVE_SYS_RESOURCE 1
-#define _G_HAVE_SYS_TIMES 1
-#define _G_HAVE_SYS_SOCKET 1
-#define _G_HAVE_SYS_CDEFS 1
-#define _G_HAVE_SYS_WAIT 1
-#define _G_HAVE_UNISTD 1
-#define _G_HAVE_DIRENT 1
-#define _G_HAVE_CURSES 1
-#define _G_MATH_H_INLINES 0
-#define _G_HAVE_BOOL 1
-#define _G_HAVE_PRINTF_FP 0
-#define _G_HAVE_LONG_DOUBLE_IO 0
-/* #undef NULL */	/* FreeBSD 4.0-CURRENT has a proper 'NULL' definition. */
-#define __need_NULL
-#include <stddef.h>
-#endif /* !_G_config_h */
diff --git a/gnu/lib/libstdc++/alpha.map b/gnu/lib/libstdc++/alpha.map
new file mode 100644
index 0000000..4865ef5
--- /dev/null
+++ b/gnu/lib/libstdc++/alpha.map
@@ -0,0 +1,3 @@
+# $FreeBSD$
+cpu/alpha/bits/atomicity.h	bits/atomicity.h
+cpu/alpha/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/c++config.h b/gnu/lib/libstdc++/c++config.h
new file mode 100644
index 0000000..6f0c96c
--- /dev/null
+++ b/gnu/lib/libstdc++/c++config.h
@@ -0,0 +1,1154 @@
+// $FreeBSD$
+
+// Predefined symbols and macros -*- C++ -*-
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#ifndef _CPP_CPPCONFIG
+#define _CPP_CPPCONFIG 1
+
+// Pick up any OS-specific definitions.
+#include <bits/os_defines.h>
+
+// The current version of the C++ library in compressed ISO date format.
+#define __GLIBCPP__ 20020514
+
+// This is necessary until GCC supports separate template
+// compilation.  
+#define _GLIBCPP_NO_TEMPLATE_EXPORT 1
+
+// This is a hack around not having either pre-compiled headers or
+// export compilation. If defined, the io, string, and valarray
+// headers will include all the necessary bits. If not defined, the
+// implementation optimizes the headers for the most commonly-used
+// types. For the io library, this means that larger, out-of-line
+// member functions are only declared, and definitions are not parsed
+// by the compiler, but instead instantiated into the library binary.
+#define _GLIBCPP_FULLY_COMPLIANT_HEADERS 1
+
+// To enable older, ARM-style iostreams and other anachronisms use this.
+//#define _GLIBCPP_DEPRECATED 1
+
+// Use corrected code from the committee library group's issues list.
+#define _GLIBCPP_RESOLVE_LIB_DEFECTS 1
+
+// In those parts of the standard C++ library that use a mutex instead
+// of a spin-lock, we now unconditionally use GCC's gthr.h mutex
+// abstraction layer.  All support to directly map to various
+// threading models has been removed.  Note: gthr.h may well map to
+// gthr-single.h which is a correct way to express no threads support
+// in gcc.  Support for the undocumented _NOTHREADS has been removed.
+
+// Default to the typically high-speed, pool-based allocator (as
+// libstdc++-v2) instead of the malloc-based allocator (libstdc++-v3
+// snapshots).  See libstdc++-v3/docs/html/17_intro/howto.html for
+// details on why you don't want to override this setting.  Ensure
+// that threads are properly configured on your platform before
+// assigning blame to the STL container-memory allocator.  After doing
+// so, please report any possible issues to libstdc++@gcc.gnu.org .
+// Do not blindly #define __USE_MALLOC here or on the command line.
+
+// The remainder of the prewritten config is mostly automatic; all the
+// user hooks are listed above.
+
+// End of prewritten config; the discovered settings follow.
+/* config.h.  Generated automatically by configure.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+
+/* Define if you have a working `mmap' system call.  */
+#define _GLIBCPP_HAVE_MMAP 1
+
+// Define if GCC supports weak symbols.
+#define _GLIBCPP_SUPPORTS_WEAK __GXX_WEAK__
+
+// Define if gthr-default.h exists (meaning that threading support is enabled).
+#define _GLIBCPP_HAVE_GTHR_DEFAULT 1
+
+// Include I/O support for 'long long' and 'unsigned long long'.
+#define _GLIBCPP_USE_LONG_LONG 1
+
+// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
+/* #undef _GLIBCPP_USE_C99 */
+
+// Define if code specialized for wchar_t should be used.
+/* #undef _GLIBCPP_USE_WCHAR_T */
+
+// Define if using setrlimit to limit memory usage during 'make check'.
+/* #undef _GLIBCPP_MEM_LIMITS */
+
+// Define to use concept checking code from the boost libraries.
+/* #undef _GLIBCPP_CONCEPT_CHECKS */
+
+// Define if mbstate_t exists in wchar.h.
+#define _GLIBCPP_HAVE_MBSTATE_T 1
+
+// Define if you have the modff function.
+#define _GLIBCPP_HAVE_MODFF 1
+
+// Define if you have the modfl function.
+/* #undef _GLIBCPP_HAVE_MODFL */
+
+// Define if you have the expf function.
+#define _GLIBCPP_HAVE_EXPF 1
+
+// Define if you have the expl function.
+/* #undef _GLIBCPP_HAVE_EXPL */
+
+// Define if you have the hypotf function.
+#define _GLIBCPP_HAVE_HYPOTF 1
+
+// Define if you have the hypotl function.
+/* #undef _GLIBCPP_HAVE_HYPOTL */
+
+// Define if the compiler/host combination has __builtin_abs
+#define _GLIBCPP_HAVE___BUILTIN_ABS 1
+
+// Define if the compiler/host combination has __builtin_labs
+#define _GLIBCPP_HAVE___BUILTIN_LABS 1
+
+// Define if the compiler/host combination has __builtin_cos
+/* #undef _GLIBCPP_HAVE___BUILTIN_COS */
+
+// Define if the compiler/host combination has __builtin_cosf
+/* #undef _GLIBCPP_HAVE___BUILTIN_COSF */
+
+// Define if the compiler/host combination has __builtin_cosl
+/* #undef _GLIBCPP_HAVE___BUILTIN_COSL */
+
+// Define if the compiler/host combination has __builtin_fabs
+#define _GLIBCPP_HAVE___BUILTIN_FABS 1
+
+// Define if the compiler/host combination has __builtin_fabsf
+#define _GLIBCPP_HAVE___BUILTIN_FABSF 1
+
+// Define if the compiler/host combination has __builtin_fabsl
+#define _GLIBCPP_HAVE___BUILTIN_FABSL 1
+
+// Define if the compiler/host combination has __builtin_sin
+/* #undef _GLIBCPP_HAVE___BUILTIN_SIN */
+
+// Define if the compiler/host combination has __builtin_sinf
+/* #undef _GLIBCPP_HAVE___BUILTIN_SINF */
+
+// Define if the compiler/host combination has __builtin_sinl
+/* #undef _GLIBCPP_HAVE___BUILTIN_SINL */
+
+// Define if the compiler/host combination has __builtin_sqrt
+/* #undef _GLIBCPP_HAVE___BUILTIN_SQRT */
+
+// Define if the compiler/host combination has __builtin_sqrtf
+/* #undef _GLIBCPP_HAVE___BUILTIN_SQRTF */
+
+// Define if the compiler/host combination has __builtin_sqrtl
+/* #undef _GLIBCPP_HAVE___BUILTIN_SQRTL */
+
+// Define if LC_MESSAGES is available in <locale.h>.
+#define _GLIBCPP_HAVE_LC_MESSAGES 1
+
+/* Define if you have the __signbit function.  */
+/* #undef _GLIBCPP_HAVE___SIGNBIT */
+
+/* Define if you have the __signbitf function.  */
+/* #undef _GLIBCPP_HAVE___SIGNBITF */
+
+/* Define if you have the __signbitl function.  */
+/* #undef _GLIBCPP_HAVE___SIGNBITL */
+
+/* Define if you have the _acosf function.  */
+/* #undef _GLIBCPP_HAVE__ACOSF */
+
+/* Define if you have the _acosl function.  */
+/* #undef _GLIBCPP_HAVE__ACOSL */
+
+/* Define if you have the _asinf function.  */
+/* #undef _GLIBCPP_HAVE__ASINF */
+
+/* Define if you have the _asinl function.  */
+/* #undef _GLIBCPP_HAVE__ASINL */
+
+/* Define if you have the _atan2f function.  */
+/* #undef _GLIBCPP_HAVE__ATAN2F */
+
+/* Define if you have the _atan2l function.  */
+/* #undef _GLIBCPP_HAVE__ATAN2L */
+
+/* Define if you have the _atanf function.  */
+/* #undef _GLIBCPP_HAVE__ATANF */
+
+/* Define if you have the _atanl function.  */
+/* #undef _GLIBCPP_HAVE__ATANL */
+
+/* Define if you have the _ceilf function.  */
+/* #undef _GLIBCPP_HAVE__CEILF */
+
+/* Define if you have the _ceill function.  */
+/* #undef _GLIBCPP_HAVE__CEILL */
+
+/* Define if you have the _copysign function.  */
+/* #undef _GLIBCPP_HAVE__COPYSIGN */
+
+/* Define if you have the _copysignl function.  */
+/* #undef _GLIBCPP_HAVE__COPYSIGNL */
+
+/* Define if you have the _cosf function.  */
+/* #undef _GLIBCPP_HAVE__COSF */
+
+/* Define if you have the _coshf function.  */
+/* #undef _GLIBCPP_HAVE__COSHF */
+
+/* Define if you have the _coshl function.  */
+/* #undef _GLIBCPP_HAVE__COSHL */
+
+/* Define if you have the _cosl function.  */
+/* #undef _GLIBCPP_HAVE__COSL */
+
+/* Define if you have the _expf function.  */
+/* #undef _GLIBCPP_HAVE__EXPF */
+
+/* Define if you have the _expl function.  */
+/* #undef _GLIBCPP_HAVE__EXPL */
+
+/* Define if you have the _fabsf function.  */
+/* #undef _GLIBCPP_HAVE__FABSF */
+
+/* Define if you have the _fabsl function.  */
+/* #undef _GLIBCPP_HAVE__FABSL */
+
+/* Define if you have the _finite function.  */
+/* #undef _GLIBCPP_HAVE__FINITE */
+
+/* Define if you have the _finitef function.  */
+/* #undef _GLIBCPP_HAVE__FINITEF */
+
+/* Define if you have the _finitel function.  */
+/* #undef _GLIBCPP_HAVE__FINITEL */
+
+/* Define if you have the _floorf function.  */
+/* #undef _GLIBCPP_HAVE__FLOORF */
+
+/* Define if you have the _floorl function.  */
+/* #undef _GLIBCPP_HAVE__FLOORL */
+
+/* Define if you have the _fmodf function.  */
+/* #undef _GLIBCPP_HAVE__FMODF */
+
+/* Define if you have the _fmodl function.  */
+/* #undef _GLIBCPP_HAVE__FMODL */
+
+/* Define if you have the _fpclass function.  */
+/* #undef _GLIBCPP_HAVE__FPCLASS */
+
+/* Define if you have the _frexpf function.  */
+/* #undef _GLIBCPP_HAVE__FREXPF */
+
+/* Define if you have the _frexpl function.  */
+/* #undef _GLIBCPP_HAVE__FREXPL */
+
+/* Define if you have the _hypot function.  */
+/* #undef _GLIBCPP_HAVE__HYPOT */
+
+/* Define if you have the _hypotf function.  */
+/* #undef _GLIBCPP_HAVE__HYPOTF */
+
+/* Define if you have the _hypotl function.  */
+/* #undef _GLIBCPP_HAVE__HYPOTL */
+
+/* Define if you have the _isinf function.  */
+/* #undef _GLIBCPP_HAVE__ISINF */
+
+/* Define if you have the _isinff function.  */
+/* #undef _GLIBCPP_HAVE__ISINFF */
+
+/* Define if you have the _isinfl function.  */
+/* #undef _GLIBCPP_HAVE__ISINFL */
+
+/* Define if you have the _isnan function.  */
+/* #undef _GLIBCPP_HAVE__ISNAN */
+
+/* Define if you have the _isnanf function.  */
+/* #undef _GLIBCPP_HAVE__ISNANF */
+
+/* Define if you have the _isnanl function.  */
+/* #undef _GLIBCPP_HAVE__ISNANL */
+
+/* Define if you have the _ldexpf function.  */
+/* #undef _GLIBCPP_HAVE__LDEXPF */
+
+/* Define if you have the _ldexpl function.  */
+/* #undef _GLIBCPP_HAVE__LDEXPL */
+
+/* Define if you have the _log10f function.  */
+/* #undef _GLIBCPP_HAVE__LOG10F */
+
+/* Define if you have the _log10l function.  */
+/* #undef _GLIBCPP_HAVE__LOG10L */
+
+/* Define if you have the _logf function.  */
+/* #undef _GLIBCPP_HAVE__LOGF */
+
+/* Define if you have the _logl function.  */
+/* #undef _GLIBCPP_HAVE__LOGL */
+
+/* Define if you have the _modff function.  */
+/* #undef _GLIBCPP_HAVE__MODFF */
+
+/* Define if you have the _modfl function.  */
+/* #undef _GLIBCPP_HAVE__MODFL */
+
+/* Define if you have the _powf function.  */
+/* #undef _GLIBCPP_HAVE__POWF */
+
+/* Define if you have the _powl function.  */
+/* #undef _GLIBCPP_HAVE__POWL */
+
+/* Define if you have the _qfpclass function.  */
+/* #undef _GLIBCPP_HAVE__QFPCLASS */
+
+/* Define if you have the _sincos function.  */
+/* #undef _GLIBCPP_HAVE__SINCOS */
+
+/* Define if you have the _sincosf function.  */
+/* #undef _GLIBCPP_HAVE__SINCOSF */
+
+/* Define if you have the _sincosl function.  */
+/* #undef _GLIBCPP_HAVE__SINCOSL */
+
+/* Define if you have the _sinf function.  */
+/* #undef _GLIBCPP_HAVE__SINF */
+
+/* Define if you have the _sinhf function.  */
+/* #undef _GLIBCPP_HAVE__SINHF */
+
+/* Define if you have the _sinhl function.  */
+/* #undef _GLIBCPP_HAVE__SINHL */
+
+/* Define if you have the _sinl function.  */
+/* #undef _GLIBCPP_HAVE__SINL */
+
+/* Define if you have the _sqrtf function.  */
+/* #undef _GLIBCPP_HAVE__SQRTF */
+
+/* Define if you have the _sqrtl function.  */
+/* #undef _GLIBCPP_HAVE__SQRTL */
+
+/* Define if you have the _tanf function.  */
+/* #undef _GLIBCPP_HAVE__TANF */
+
+/* Define if you have the _tanhf function.  */
+/* #undef _GLIBCPP_HAVE__TANHF */
+
+/* Define if you have the _tanhl function.  */
+/* #undef _GLIBCPP_HAVE__TANHL */
+
+/* Define if you have the _tanl function.  */
+/* #undef _GLIBCPP_HAVE__TANL */
+
+/* Define if you have the acosf function.  */
+#define _GLIBCPP_HAVE_ACOSF 1
+
+/* Define if you have the acosl function.  */
+/* #undef _GLIBCPP_HAVE_ACOSL */
+
+/* Define if you have the asinf function.  */
+#define _GLIBCPP_HAVE_ASINF 1
+
+/* Define if you have the asinl function.  */
+/* #undef _GLIBCPP_HAVE_ASINL */
+
+/* Define if you have the atan2f function.  */
+#define _GLIBCPP_HAVE_ATAN2F 1
+
+/* Define if you have the atan2l function.  */
+/* #undef _GLIBCPP_HAVE_ATAN2L */
+
+/* Define if you have the atanf function.  */
+#define _GLIBCPP_HAVE_ATANF 1
+
+/* Define if you have the atanl function.  */
+/* #undef _GLIBCPP_HAVE_ATANL */
+
+/* Define if you have the btowc function.  */
+/* #undef _GLIBCPP_HAVE_BTOWC */
+
+/* Define if you have the ceilf function.  */
+#define _GLIBCPP_HAVE_CEILF 1
+
+/* Define if you have the ceill function.  */
+/* #undef _GLIBCPP_HAVE_CEILL */
+
+/* Define if you have the copysign function.  */
+#define _GLIBCPP_HAVE_COPYSIGN 1
+
+/* Define if you have the copysignf function.  */
+#define _GLIBCPP_HAVE_COPYSIGNF 1
+
+/* Define if you have the copysignl function.  */
+/* #undef _GLIBCPP_HAVE_COPYSIGNL */
+
+/* Define if you have the cosf function.  */
+#define _GLIBCPP_HAVE_COSF 1
+
+/* Define if you have the coshf function.  */
+#define _GLIBCPP_HAVE_COSHF 1
+
+/* Define if you have the coshl function.  */
+/* #undef _GLIBCPP_HAVE_COSHL */
+
+/* Define if you have the cosl function.  */
+/* #undef _GLIBCPP_HAVE_COSL */
+
+/* Define if you have the drand48 function.  */
+#define _GLIBCPP_HAVE_DRAND48 1
+
+/* Define if you have the expf function.  */
+#define _GLIBCPP_HAVE_EXPF 1
+
+/* Define if you have the expl function.  */
+/* #undef _GLIBCPP_HAVE_EXPL */
+
+/* Define if you have the fabsf function.  */
+#define _GLIBCPP_HAVE_FABSF 1
+
+/* Define if you have the fabsl function.  */
+/* #undef _GLIBCPP_HAVE_FABSL */
+
+/* Define if you have the fgetwc function.  */
+/* #undef _GLIBCPP_HAVE_FGETWC */
+
+/* Define if you have the fgetws function.  */
+/* #undef _GLIBCPP_HAVE_FGETWS */
+
+/* Define if you have the finite function.  */
+#define _GLIBCPP_HAVE_FINITE 1
+
+/* Define if you have the finitef function.  */
+#define _GLIBCPP_HAVE_FINITEF 1
+
+/* Define if you have the finitel function.  */
+/* #undef _GLIBCPP_HAVE_FINITEL */
+
+/* Define if you have the floorf function.  */
+#define _GLIBCPP_HAVE_FLOORF 1
+
+/* Define if you have the floorl function.  */
+/* #undef _GLIBCPP_HAVE_FLOORL */
+
+/* Define if you have the fmodf function.  */
+#define _GLIBCPP_HAVE_FMODF 1
+
+/* Define if you have the fmodl function.  */
+/* #undef _GLIBCPP_HAVE_FMODL */
+
+/* Define if you have the fpclass function.  */
+/* #undef _GLIBCPP_HAVE_FPCLASS */
+
+/* Define if you have the fputwc function.  */
+/* #undef _GLIBCPP_HAVE_FPUTWC */
+
+/* Define if you have the fputws function.  */
+/* #undef _GLIBCPP_HAVE_FPUTWS */
+
+/* Define if you have the frexpf function.  */
+#define _GLIBCPP_HAVE_FREXPF 1
+
+/* Define if you have the frexpl function.  */
+/* #undef _GLIBCPP_HAVE_FREXPL */
+
+/* Define if you have the fwide function.  */
+/* #undef _GLIBCPP_HAVE_FWIDE */
+
+/* Define if you have the fwprintf function.  */
+/* #undef _GLIBCPP_HAVE_FWPRINTF */
+
+/* Define if you have the fwscanf function.  */
+/* #undef _GLIBCPP_HAVE_FWSCANF */
+
+/* Define if you have the getpagesize function.  */
+#define _GLIBCPP_HAVE_GETPAGESIZE 1
+
+/* Define if you have the getwc function.  */
+/* #undef _GLIBCPP_HAVE_GETWC */
+
+/* Define if you have the getwchar function.  */
+/* #undef _GLIBCPP_HAVE_GETWCHAR */
+
+/* Define if you have the hypot function.  */
+#define _GLIBCPP_HAVE_HYPOT 1
+
+/* Define if you have the hypotf function.  */
+#define _GLIBCPP_HAVE_HYPOTF 1
+
+/* Define if you have the hypotl function.  */
+/* #undef _GLIBCPP_HAVE_HYPOTL */
+
+/* Define if you have the iconv function.  */
+/* #undef _GLIBCPP_HAVE_ICONV */
+
+/* Define if you have the iconv_close function.  */
+/* #undef _GLIBCPP_HAVE_ICONV_CLOSE */
+
+/* Define if you have the iconv_open function.  */
+/* #undef _GLIBCPP_HAVE_ICONV_OPEN */
+
+/* Define if you have the isinf function.  */
+#define _GLIBCPP_HAVE_ISINF 1
+
+/* Define if you have the isinff function.  */
+/* #undef _GLIBCPP_HAVE_ISINFF */
+
+/* Define if you have the isinfl function.  */
+/* #undef _GLIBCPP_HAVE_ISINFL */
+
+/* Define if you have the isnan function.  */
+#define _GLIBCPP_HAVE_ISNAN 1
+
+/* Define if you have the isnanf function.  */
+#define _GLIBCPP_HAVE_ISNANF 1
+
+/* Define if you have the isnanl function.  */
+/* #undef _GLIBCPP_HAVE_ISNANL */
+
+/* Define if you have the ldexpf function.  */
+#define _GLIBCPP_HAVE_LDEXPF 1
+
+/* Define if you have the ldexpl function.  */
+/* #undef _GLIBCPP_HAVE_LDEXPL */
+
+/* Define if you have the log10f function.  */
+#define _GLIBCPP_HAVE_LOG10F 1
+
+/* Define if you have the log10l function.  */
+/* #undef _GLIBCPP_HAVE_LOG10L */
+
+/* Define if you have the logf function.  */
+#define _GLIBCPP_HAVE_LOGF 1
+
+/* Define if you have the logl function.  */
+/* #undef _GLIBCPP_HAVE_LOGL */
+
+/* Define if you have the mbrlen function.  */
+/* #undef _GLIBCPP_HAVE_MBRLEN */
+
+/* Define if you have the mbrtowc function.  */
+/* #undef _GLIBCPP_HAVE_MBRTOWC */
+
+/* Define if you have the mbsinit function.  */
+/* #undef _GLIBCPP_HAVE_MBSINIT */
+
+/* Define if you have the mbsrtowcs function.  */
+/* #undef _GLIBCPP_HAVE_MBSRTOWCS */
+
+/* Define if you have the modff function.  */
+#define _GLIBCPP_HAVE_MODFF 1
+
+/* Define if you have the modfl function.  */
+/* #undef _GLIBCPP_HAVE_MODFL */
+
+/* Define if you have the nan function.  */
+/* #undef _GLIBCPP_HAVE_NAN */
+
+/* Define if you have the nl_langinfo function.  */
+#define _GLIBCPP_HAVE_NL_LANGINFO 1
+
+/* Define if you have the powf function.  */
+#define _GLIBCPP_HAVE_POWF 1
+
+/* Define if you have the powl function.  */
+/* #undef _GLIBCPP_HAVE_POWL */
+
+/* Define if you have the putwc function.  */
+/* #undef _GLIBCPP_HAVE_PUTWC */
+
+/* Define if you have the putwchar function.  */
+/* #undef _GLIBCPP_HAVE_PUTWCHAR */
+
+/* Define if you have the qfpclass function.  */
+/* #undef _GLIBCPP_HAVE_QFPCLASS */
+
+/* Define if you have the setenv function.  */
+#define _GLIBCPP_HAVE_SETENV 1
+
+/* Define if you have the sincos function.  */
+/* #undef _GLIBCPP_HAVE_SINCOS */
+
+/* Define if you have the sincosf function.  */
+/* #undef _GLIBCPP_HAVE_SINCOSF */
+
+/* Define if you have the sincosl function.  */
+/* #undef _GLIBCPP_HAVE_SINCOSL */
+
+/* Define if you have the sinf function.  */
+#define _GLIBCPP_HAVE_SINF 1
+
+/* Define if you have the sinhf function.  */
+#define _GLIBCPP_HAVE_SINHF 1
+
+/* Define if you have the sinhl function.  */
+/* #undef _GLIBCPP_HAVE_SINHL */
+
+/* Define if you have the sinl function.  */
+/* #undef _GLIBCPP_HAVE_SINL */
+
+/* Define if you have the sqrtf function.  */
+#define _GLIBCPP_HAVE_SQRTF 1
+
+/* Define if you have the sqrtl function.  */
+/* #undef _GLIBCPP_HAVE_SQRTL */
+
+/* Define if you have the strtof function.  */
+/* #undef _GLIBCPP_HAVE_STRTOF */
+
+/* Define if you have the strtold function.  */
+/* #undef _GLIBCPP_HAVE_STRTOLD */
+
+/* Define if you have the swprintf function.  */
+/* #undef _GLIBCPP_HAVE_SWPRINTF */
+
+/* Define if you have the swscanf function.  */
+/* #undef _GLIBCPP_HAVE_SWSCANF */
+
+/* Define if you have the tanf function.  */
+#define _GLIBCPP_HAVE_TANF 1
+
+/* Define if you have the tanhf function.  */
+#define _GLIBCPP_HAVE_TANHF 1
+
+/* Define if you have the tanhl function.  */
+/* #undef _GLIBCPP_HAVE_TANHL */
+
+/* Define if you have the tanl function.  */
+/* #undef _GLIBCPP_HAVE_TANL */
+
+/* Define if you have the ungetwc function.  */
+/* #undef _GLIBCPP_HAVE_UNGETWC */
+
+/* Define if you have the vfwprintf function.  */
+/* #undef _GLIBCPP_HAVE_VFWPRINTF */
+
+/* Define if you have the vfwscanf function.  */
+/* #undef _GLIBCPP_HAVE_VFWSCANF */
+
+/* Define if you have the vswprintf function.  */
+/* #undef _GLIBCPP_HAVE_VSWPRINTF */
+
+/* Define if you have the vswscanf function.  */
+/* #undef _GLIBCPP_HAVE_VSWSCANF */
+
+/* Define if you have the vwprintf function.  */
+/* #undef _GLIBCPP_HAVE_VWPRINTF */
+
+/* Define if you have the vwscanf function.  */
+/* #undef _GLIBCPP_HAVE_VWSCANF */
+
+/* Define if you have the wcrtomb function.  */
+/* #undef _GLIBCPP_HAVE_WCRTOMB */
+
+/* Define if you have the wcscat function.  */
+#define _GLIBCPP_HAVE_WCSCAT 1
+
+/* Define if you have the wcschr function.  */
+#define _GLIBCPP_HAVE_WCSCHR 1
+
+/* Define if you have the wcscmp function.  */
+#define _GLIBCPP_HAVE_WCSCMP 1
+
+/* Define if you have the wcscoll function.  */
+/* #undef _GLIBCPP_HAVE_WCSCOLL */
+
+/* Define if you have the wcscpy function.  */
+#define _GLIBCPP_HAVE_WCSCPY 1
+
+/* Define if you have the wcscspn function.  */
+#define _GLIBCPP_HAVE_WCSCSPN 1
+
+/* Define if you have the wcsftime function.  */
+/* #undef _GLIBCPP_HAVE_WCSFTIME */
+
+/* Define if you have the wcslen function.  */
+#define _GLIBCPP_HAVE_WCSLEN 1
+
+/* Define if you have the wcsncat function.  */
+#define _GLIBCPP_HAVE_WCSNCAT 1
+
+/* Define if you have the wcsncmp function.  */
+#define _GLIBCPP_HAVE_WCSNCMP 1
+
+/* Define if you have the wcsncpy function.  */
+#define _GLIBCPP_HAVE_WCSNCPY 1
+
+/* Define if you have the wcspbrk function.  */
+#define _GLIBCPP_HAVE_WCSPBRK 1
+
+/* Define if you have the wcsrchr function.  */
+#define _GLIBCPP_HAVE_WCSRCHR 1
+
+/* Define if you have the wcsrtombs function.  */
+/* #undef _GLIBCPP_HAVE_WCSRTOMBS */
+
+/* Define if you have the wcsspn function.  */
+#define _GLIBCPP_HAVE_WCSSPN 1
+
+/* Define if you have the wcsstr function.  */
+#define _GLIBCPP_HAVE_WCSSTR 1
+
+/* Define if you have the wcstod function.  */
+/* #undef _GLIBCPP_HAVE_WCSTOD */
+
+/* Define if you have the wcstof function.  */
+/* #undef _GLIBCPP_HAVE_WCSTOF */
+
+/* Define if you have the wcstok function.  */
+/* #undef _GLIBCPP_HAVE_WCSTOK */
+
+/* Define if you have the wcstol function.  */
+/* #undef _GLIBCPP_HAVE_WCSTOL */
+
+/* Define if you have the wcstoul function.  */
+/* #undef _GLIBCPP_HAVE_WCSTOUL */
+
+/* Define if you have the wcsxfrm function.  */
+/* #undef _GLIBCPP_HAVE_WCSXFRM */
+
+/* Define if you have the wctob function.  */
+/* #undef _GLIBCPP_HAVE_WCTOB */
+
+/* Define if you have the wmemchr function.  */
+#define _GLIBCPP_HAVE_WMEMCHR 1
+
+/* Define if you have the wmemcmp function.  */
+#define _GLIBCPP_HAVE_WMEMCMP 1
+
+/* Define if you have the wmemcpy function.  */
+#define _GLIBCPP_HAVE_WMEMCPY 1
+
+/* Define if you have the wmemmove function.  */
+#define _GLIBCPP_HAVE_WMEMMOVE 1
+
+/* Define if you have the wmemset function.  */
+#define _GLIBCPP_HAVE_WMEMSET 1
+
+/* Define if you have the wprintf function.  */
+/* #undef _GLIBCPP_HAVE_WPRINTF */
+
+/* Define if you have the wscanf function.  */
+/* #undef _GLIBCPP_HAVE_WSCANF */
+
+/* Define if you have the <endian.h> header file.  */
+/* #undef _GLIBCPP_HAVE_ENDIAN_H */
+
+/* Define if you have the <float.h> header file.  */
+#define _GLIBCPP_HAVE_FLOAT_H 1
+
+/* Define if you have the <fp.h> header file.  */
+/* #undef _GLIBCPP_HAVE_FP_H */
+
+/* Define if you have the <gconv.h> header file.  */
+/* #undef _GLIBCPP_HAVE_GCONV_H */
+
+/* Define if you have the <ieeefp.h> header file.  */
+#define _GLIBCPP_HAVE_IEEEFP_H 1
+
+/* Define if you have the <inttypes.h> header file.  */
+#define _GLIBCPP_HAVE_INTTYPES_H 1
+
+/* Define if you have the <locale.h> header file.  */
+#define _GLIBCPP_HAVE_LOCALE_H 1
+
+/* Define if you have the <machine/endian.h> header file.  */
+#define _GLIBCPP_HAVE_MACHINE_ENDIAN_H 1
+
+/* Define if you have the <machine/param.h> header file.  */
+#define _GLIBCPP_HAVE_MACHINE_PARAM_H 1
+
+/* Define if you have the <nan.h> header file.  */
+/* #undef _GLIBCPP_HAVE_NAN_H */
+
+/* Define if you have the <stdlib.h> header file.  */
+/* #undef _GLIBCPP_HAVE_STDLIB_H */
+
+/* Define if you have the <sys/isa_defs.h> header file.  */
+/* #undef _GLIBCPP_HAVE_SYS_ISA_DEFS_H */
+
+/* Define if you have the <sys/machine.h> header file.  */
+/* #undef _GLIBCPP_HAVE_SYS_MACHINE_H */
+
+/* Define if you have the <sys/resource.h> header file.  */
+#define _GLIBCPP_HAVE_SYS_RESOURCE_H 1
+
+/* Define if you have the <sys/stat.h> header file.  */
+/* #undef _GLIBCPP_HAVE_SYS_STAT_H */
+
+/* Define if you have the <sys/types.h> header file.  */
+/* #undef _GLIBCPP_HAVE_SYS_TYPES_H */
+
+/* Define if you have the <unistd.h> header file.  */
+#define _GLIBCPP_HAVE_UNISTD_H 1
+
+/* Define if you have the <wchar.h> header file.  */
+#define _GLIBCPP_HAVE_WCHAR_H 1
+
+/* Define if you have the <wctype.h> header file.  */
+#define _GLIBCPP_HAVE_WCTYPE_H 1
+
+/* Define if you have the m library (-lm).  */
+#define _GLIBCPP_HAVE_LIBM 1
+
+/* Name of package */
+#define _GLIBCPP_PACKAGE "libstdc++"
+
+/* Version number of package */
+#define _GLIBCPP_VERSION "3.1.0"
+
+/* Define if the compiler is configured for setjmp/longjmp exceptions. */
+/* #undef _GLIBCPP_SJLJ_EXCEPTIONS */
+
+/* Define if sigsetjmp is available.   */
+#define _GLIBCPP_HAVE_SIGSETJMP 1
+
+/* Only used in build directory testsuite_hooks.h. */
+#define _GLIBCPP_HAVE_MEMLIMIT_DATA 0
+
+/* Only used in build directory testsuite_hooks.h. */
+#define _GLIBCPP_HAVE_MEMLIMIT_RSS 0
+
+/* Only used in build directory testsuite_hooks.h. */
+#define _GLIBCPP_HAVE_MEMLIMIT_VMEM 0
+
+/* Only used in build directory testsuite_hooks.h. */
+#define _GLIBCPP_HAVE_MEMLIMIT_AS 0
+
+//
+// Systems that have certain non-standard functions prefixed with an
+// underscore, we'll handle those here. Must come after config.h.in.
+//
+#if defined (_GLIBCPP_HAVE__ISNAN) && ! defined (_GLIBCPP_HAVE_ISNAN)
+# define _GLIBCPP_HAVE_ISNAN 1
+# define isnan _isnan
+#endif
+
+#if defined (_GLIBCPP_HAVE__ISNANF) && ! defined (_GLIBCPP_HAVE_ISNANF)
+# define _GLIBCPP_HAVE_ISNANF 1
+# define isnanf _isnanf
+#endif
+
+#if defined (_GLIBCPP_HAVE__ISNANL) && ! defined (_GLIBCPP_HAVE_ISNANL)
+# define _GLIBCPP_HAVE_ISNANL 1
+# define isnanl _isnanl
+#endif
+
+#if defined (_GLIBCPP_HAVE__ISINF) && ! defined (_GLIBCPP_HAVE_ISINF)
+# define _GLIBCPP_HAVE_ISINF 1
+# define isinf _isinf
+#endif
+
+#if defined (_GLIBCPP_HAVE__ISINFF) && ! defined (_GLIBCPP_HAVE_ISINFF)
+# define _GLIBCPP_HAVE_ISINFF 1
+# define isinff _isinff
+#endif
+
+#if defined (_GLIBCPP_HAVE__ISINFL) && ! defined (_GLIBCPP_HAVE_ISINFL)
+# define _GLIBCPP_HAVE_ISINFL 1
+# define isinfl _isinfl
+#endif
+
+#if defined (_GLIBCPP_HAVE__COPYSIGN) && ! defined (_GLIBCPP_HAVE_COPYSIGN)
+# define _GLIBCPP_HAVE_COPYSIGN 1
+# define copysign _copysign
+#endif
+
+#if defined (_GLIBCPP_HAVE__COPYSIGNL) && ! defined (_GLIBCPP_HAVE_COPYSIGNL)
+# define _GLIBCPP_HAVE_COPYSIGNL 1
+# define copysignl _copysignl
+#endif
+
+#if defined (_GLIBCPP_HAVE__COSF) && ! defined (_GLIBCPP_HAVE_COSF)
+# define _GLIBCPP_HAVE_COSF 1
+# define cosf _cosf
+#endif
+
+#if defined (_GLIBCPP_HAVE__ACOSF) && ! defined (_GLIBCPP_HAVE_ACOSF)
+# define _GLIBCPP_HAVE_ACOSF 1
+# define acosf _acosf
+#endif
+
+#if defined (_GLIBCPP_HAVE__ACOSL) && ! defined (_GLIBCPP_HAVE_ACOSL)
+# define _GLIBCPP_HAVE_ACOSL 1
+# define acosl _acosl
+#endif
+
+#if defined (_GLIBCPP_HAVE__ASINF) && ! defined (_GLIBCPP_HAVE_ASINF)
+# define _GLIBCPP_HAVE_ASINF 1
+# define asinf _asinf
+#endif
+
+#if defined (_GLIBCPP_HAVE__ASINL) && ! defined (_GLIBCPP_HAVE_ASINL)
+# define _GLIBCPP_HAVE_ASINL 1
+# define asinl _asinl
+#endif
+
+#if defined (_GLIBCPP_HAVE__ATANF) && ! defined (_GLIBCPP_HAVE_ATANF)
+# define _GLIBCPP_HAVE_ATANF 1
+# define atanf _atanf
+#endif
+
+#if defined (_GLIBCPP_HAVE__ATANL) && ! defined (_GLIBCPP_HAVE_ATANL)
+# define _GLIBCPP_HAVE_ATANL 1
+# define atanl _atanl
+#endif
+
+#if defined (_GLIBCPP_HAVE__CEILF) && ! defined (_GLIBCPP_HAVE_CEILF)
+# define _GLIBCPP_HAVE_CEILF 1
+# define aceil _ceilf
+#endif
+
+#if defined (_GLIBCPP_HAVE__CEILL) && ! defined (_GLIBCPP_HAVE_CEILL)
+# define _GLIBCPP_HAVE_CEILL 1
+# define aceil _ceill
+#endif
+
+#if defined (_GLIBCPP_HAVE__COSHF) && ! defined (_GLIBCPP_HAVE_COSHF)
+# define _GLIBCPP_HAVE_COSHF 1
+# define coshf _coshf
+#endif
+
+#if defined (_GLIBCPP_HAVE__COSL) && ! defined (_GLIBCPP_HAVE_COSL)
+# define _GLIBCPP_HAVE_COSL 1
+# define cosl _cosl
+#endif
+
+#if defined (_GLIBCPP_HAVE__LOGF) && ! defined (_GLIBCPP_HAVE_LOGF)
+# define _GLIBCPP_HAVE_LOGF 1
+# define logf _logf
+#endif
+
+#if defined (_GLIBCPP_HAVE__COSHL) && ! defined (_GLIBCPP_HAVE_COSHL)
+# define _GLIBCPP_HAVE_COSHL 1
+# define coshl _coshl
+#endif
+
+#if defined (_GLIBCPP_HAVE__EXPF) && ! defined (_GLIBCPP_HAVE_EXPF)
+# define _GLIBCPP_HAVE_EXPF 1
+# define expf _expf
+#endif
+
+#if defined (_GLIBCPP_HAVE__EXPL) && ! defined (_GLIBCPP_HAVE_EXPL)
+# define _GLIBCPP_HAVE_EXPL 1
+# define expl _expl
+#endif
+
+#if defined (_GLIBCPP_HAVE__FABSF) && ! defined (_GLIBCPP_HAVE_FABSF)
+# define _GLIBCPP_HAVE_FABSF 1
+# define fabsf _fabsf
+#endif
+
+#if defined (_GLIBCPP_HAVE__FABSL) && ! defined (_GLIBCPP_HAVE_FABSL)
+# define _GLIBCPP_HAVE_FABSL 1
+# define fabsl _fabsl
+#endif
+
+#if defined (_GLIBCPP_HAVE__FLOORF) && ! defined (_GLIBCPP_HAVE_FLOORF)
+# define _GLIBCPP_HAVE_FLOORF 1
+# define floorf _floorf
+#endif
+
+#if defined (_GLIBCPP_HAVE__FLOORL) && ! defined (_GLIBCPP_HAVE_FLOORL)
+# define _GLIBCPP_HAVE_FLOORL 1
+# define floorl _floorl
+#endif
+
+#if defined (_GLIBCPP_HAVE__FMODF) && ! defined (_GLIBCPP_HAVE_FMODF)
+# define _GLIBCPP_HAVE_FMODF 1
+# define fmodf _fmodf
+#endif
+
+#if defined (_GLIBCPP_HAVE__FMODL) && ! defined (_GLIBCPP_HAVE_FMODL)
+# define _GLIBCPP_HAVE_FMODL 1
+# define fmodl _fmodl
+#endif
+
+#if defined (_GLIBCPP_HAVE__FREXPF) && ! defined (_GLIBCPP_HAVE_FREXPF)
+# define _GLIBCPP_HAVE_FREXPF 1
+# define frexpf _frexpf
+#endif
+
+#if defined (_GLIBCPP_HAVE__FREXPL) && ! defined (_GLIBCPP_HAVE_FREXPL)
+# define _GLIBCPP_HAVE_FREXPL 1
+# define frexpl _frexpl
+#endif
+
+#if defined (_GLIBCPP_HAVE__LDEXPF) && ! defined (_GLIBCPP_HAVE_LDEXPF)
+# define _GLIBCPP_HAVE_LDEXPF 1
+# define ldexpf _ldexpf
+#endif
+
+#if defined (_GLIBCPP_HAVE__LDEXPL) && ! defined (_GLIBCPP_HAVE_LDEXPL)
+# define _GLIBCPP_HAVE_LDEXPL 1
+# define ldexpl _ldexpl
+#endif
+
+#if defined (_GLIBCPP_HAVE__LOG10F) && ! defined (_GLIBCPP_HAVE_LOG10F)
+# define _GLIBCPP_HAVE_LOG10F 1
+# define log10f _log10f
+#endif
+
+#if defined (_GLIBCPP_HAVE__LOGL) && ! defined (_GLIBCPP_HAVE_LOGL)
+# define _GLIBCPP_HAVE_LOGL 1
+# define logl _logl
+#endif
+
+#if defined (_GLIBCPP_HAVE__POWF) && ! defined (_GLIBCPP_HAVE_POWF)
+# define _GLIBCPP_HAVE_POWF 1
+# define powf _powf
+#endif
+
+#if defined (_GLIBCPP_HAVE__LOG10L) && ! defined (_GLIBCPP_HAVE_LOG10L)
+# define _GLIBCPP_HAVE_LOG10L 1
+# define log10l _log10l
+#endif
+
+#if defined (_GLIBCPP_HAVE__MODF) && ! defined (_GLIBCPP_HAVE_MODF)
+# define _GLIBCPP_HAVE_MODF 1
+# define modf _modf
+#endif
+
+#if defined (_GLIBCPP_HAVE__MODL) && ! defined (_GLIBCPP_HAVE_MODL)
+# define _GLIBCPP_HAVE_MODL 1
+# define modl _modl
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINF) && ! defined (_GLIBCPP_HAVE_SINF)
+# define _GLIBCPP_HAVE_SINF 1
+# define sinf _sinf
+#endif
+
+#if defined (_GLIBCPP_HAVE__POWL) && ! defined (_GLIBCPP_HAVE_POWL)
+# define _GLIBCPP_HAVE_POWL 1
+# define powl _powl
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINHF) && ! defined (_GLIBCPP_HAVE_SINHF)
+# define _GLIBCPP_HAVE_SINHF 1
+# define sinhf _sinhf
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINL) && ! defined (_GLIBCPP_HAVE_SINL)
+# define _GLIBCPP_HAVE_SINL 1
+# define sinl _sinl
+#endif
+
+#if defined (_GLIBCPP_HAVE__SQRTF) && ! defined (_GLIBCPP_HAVE_SQRTF)
+# define _GLIBCPP_HAVE_SQRTF 1
+# define sqrtf _sqrtf
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINHL) && ! defined (_GLIBCPP_HAVE_SINHL)
+# define _GLIBCPP_HAVE_SINHL 1
+# define sinhl _sinhl
+#endif
+
+#if defined (_GLIBCPP_HAVE__TANF) && ! defined (_GLIBCPP_HAVE_TANF)
+# define _GLIBCPP_HAVE_TANF 1
+# define tanf _tanf
+#endif
+
+#if defined (_GLIBCPP_HAVE__SQRTL) && ! defined (_GLIBCPP_HAVE_SQRTL)
+# define _GLIBCPP_HAVE_SQRTL 1
+# define sqrtl _sqrtl
+#endif
+
+#if defined (_GLIBCPP_HAVE__TANHF) && ! defined (_GLIBCPP_HAVE_TANHF)
+# define _GLIBCPP_HAVE_TANHF 1
+# define tanhf _tanhf
+#endif
+
+#if defined (_GLIBCPP_HAVE__TANL) && ! defined (_GLIBCPP_HAVE_TANL)
+# define _GLIBCPP_HAVE_TANF 1
+# define tanf _tanf
+#endif
+
+#if defined (_GLIBCPP_HAVE__STRTOF) && ! defined (_GLIBCPP_HAVE_STRTOF)
+# define _GLIBCPP_HAVE_STRTOF 1
+# define strtof _strtof
+#endif
+
+#if defined (_GLIBCPP_HAVE__TANHL) && ! defined (_GLIBCPP_HAVE_TANHL)
+# define _GLIBCPP_HAVE_TANHL 1
+# define tanhl _tanhl
+#endif
+
+#if defined (_GLIBCPP_HAVE__STRTOLD) && ! defined (_GLIBCPP_HAVE_STRTOLD)
+# define _GLIBCPP_HAVE_STRTOLD 1
+# define strtold _strtold
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINCOS) && ! defined (_GLIBCPP_HAVE_SINCOS)
+# define _GLIBCPP_HAVE_SINCOS 1
+# define sincos _sincos
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINCOSF) && ! defined (_GLIBCPP_HAVE_SINCOSF)
+# define _GLIBCPP_HAVE_SINCOSF 1
+# define sincosf _sincosf
+#endif
+
+#if defined (_GLIBCPP_HAVE__SINCOSL) && ! defined (_GLIBCPP_HAVE_SINCOSL)
+# define _GLIBCPP_HAVE_SINCOSL 1
+# define sincosl _sincosl
+#endif
+
+#if defined (_GLIBCPP_HAVE__FINITE) && ! defined (_GLIBCPP_HAVE_FINITE)
+# define _GLIBCPP_HAVE_FINITE 1
+# define finite _finite
+#endif
+
+#if defined (_GLIBCPP_HAVE__FINITEF) && ! defined (_GLIBCPP_HAVE_FINITEF)
+# define _GLIBCPP_HAVE_FINITEF 1
+# define finitef _finitef
+#endif
+
+#if defined (_GLIBCPP_HAVE__FINITEL) && ! defined (_GLIBCPP_HAVE_FINITEL)
+# define _GLIBCPP_HAVE_FINITEL 1
+# define finitel _finitel
+#endif
+
+#if defined (_GLIBCPP_HAVE__QFINITE) && ! defined (_GLIBCPP_HAVE_QFINITE)
+# define _GLIBCPP_HAVE_QFINITE 1
+# define qfinite _qfinite
+#endif
+
+#if defined (_GLIBCPP_HAVE__FPCLASS) && ! defined (_GLIBCPP_HAVE_FPCLASS)
+# define _GLIBCPP_HAVE_FPCLASS 1
+# define fpclass _fpclass
+#endif
+
+#if defined (_GLIBCPP_HAVE__QFPCLASS) && ! defined (_GLIBCPP_HAVE_QFPCLASS)
+# define _GLIBCPP_HAVE_QFPCLASS 1
+# define qfpclass _qfpclass
+#endif
+
+#endif // _CPP_CPPCONFIG_
diff --git a/gnu/lib/libstdc++/configs.map b/gnu/lib/libstdc++/configs.map
new file mode 100644
index 0000000..7f6cb86
--- /dev/null
+++ b/gnu/lib/libstdc++/configs.map
@@ -0,0 +1,10 @@
+# $FreeBSD$
+io/basic_file_stdio.h				bits/basic_file.h
+io/c_io_stdio.h					bits/c++io.h
+locale/generic/c_locale.h			bits/c++locale.h
+locale/generic/codecvt_specializations.h	bits/codecvt_specializations.h
+locale/generic/messages_members.h		bits/messages_members.h
+os/bsd/freebsd/bits/ctype_base.h		bits/ctype_base.h
+os/bsd/freebsd/bits/ctype_inline.h		bits/ctype_inline.h
+os/bsd/freebsd/bits/ctype_noninline.h		bits/ctype_noninline.h
+os/bsd/freebsd/bits/os_defines.h		bits/os_defines.h
diff --git a/gnu/lib/libstdc++/i386.map b/gnu/lib/libstdc++/i386.map
new file mode 100644
index 0000000..d4e0837
--- /dev/null
+++ b/gnu/lib/libstdc++/i386.map
@@ -0,0 +1,3 @@
+# $FreeBSD$
+cpu/i386/bits/atomicity.h	bits/atomicity.h
+cpu/i386/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/ia64.map b/gnu/lib/libstdc++/ia64.map
new file mode 100644
index 0000000..931668d
--- /dev/null
+++ b/gnu/lib/libstdc++/ia64.map
@@ -0,0 +1,3 @@
+# $FreeBSD$
+cpu/ia64/bits/atomicity.h	bits/atomicity.h
+cpu/ia64/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/includes.map b/gnu/lib/libstdc++/includes.map
new file mode 100644
index 0000000..77d69b2
--- /dev/null
+++ b/gnu/lib/libstdc++/includes.map
@@ -0,0 +1,165 @@
+# $FreeBSD$
+backward/algo.h			backward/algo.h
+backward/algobase.h		backward/algobase.h
+backward/alloc.h		backward/alloc.h
+backward/backward_warning.h	backward/backward_warning.h
+backward/bvector.h		backward/bvector.h
+backward/complex.h		backward/complex.h
+backward/defalloc.h		backward/defalloc.h
+backward/deque.h		backward/deque.h
+backward/fstream.h		backward/fstream.h
+backward/function.h		backward/function.h
+backward/hash_map.h		backward/hash_map.h
+backward/hash_set.h		backward/hash_set.h
+backward/hashtable.h		backward/hashtable.h
+backward/heap.h			backward/heap.h
+backward/iomanip.h		backward/iomanip.h
+backward/iostream.h		backward/iostream.h
+backward/istream.h		backward/istream.h
+backward/iterator.h		backward/iterator.h
+backward/list.h			backward/list.h
+backward/map.h			backward/map.h
+backward/multimap.h		backward/multimap.h
+backward/multiset.h		backward/multiset.h
+backward/new.h			backward/new.h
+backward/ostream.h		backward/ostream.h
+backward/pair.h			backward/pair.h
+backward/queue.h		backward/queue.h
+backward/rope.h			backward/rope.h
+backward/set.h			backward/set.h
+backward/slist.h		backward/slist.h
+backward/stack.h		backward/stack.h
+backward/stream.h		backward/stream.h
+backward/streambuf.h		backward/streambuf.h
+backward/strstream		backward/strstream
+backward/strstream.h		backward/strstream.h
+backward/tempbuf.h		backward/tempbuf.h
+backward/tree.h			backward/tree.h
+backward/vector.h		backward/vector.h
+bits/basic_ios.h		bits/basic_ios.h
+bits/basic_ios.tcc		bits/basic_ios.tcc
+bits/basic_string.h		bits/basic_string.h
+bits/basic_string.tcc		bits/basic_string.tcc
+bits/boost_concept_check.h	bits/boost_concept_check.h
+bits/char_traits.h		bits/char_traits.h
+bits/codecvt.h			bits/codecvt.h
+bits/concept_check.h		bits/concept_check.h
+bits/cpp_type_traits.h		bits/cpp_type_traits.h
+bits/fpos.h			bits/fpos.h
+bits/fstream.tcc		bits/fstream.tcc
+bits/functexcept.h		bits/functexcept.h
+bits/generic_shadow.h		bits/generic_shadow.h
+bits/gslice.h			bits/gslice.h
+bits/gslice_array.h		bits/gslice_array.h
+bits/indirect_array.h		bits/indirect_array.h
+bits/ios_base.h			bits/ios_base.h
+bits/istream.tcc		bits/istream.tcc
+bits/locale_facets.h		bits/locale_facets.h
+bits/locale_facets.tcc		bits/locale_facets.tcc
+bits/localefwd.h		bits/localefwd.h
+bits/mask_array.h		bits/mask_array.h
+bits/ostream.tcc		bits/ostream.tcc
+bits/pthread_allocimpl.h	bits/pthread_allocimpl.h
+bits/slice.h			bits/slice.h
+bits/slice_array.h		bits/slice_array.h
+bits/sstream.tcc		bits/sstream.tcc
+bits/stl_algo.h			bits/stl_algo.h
+bits/stl_algobase.h		bits/stl_algobase.h
+bits/stl_alloc.h		bits/stl_alloc.h
+bits/stl_bvector.h		bits/stl_bvector.h
+bits/stl_construct.h		bits/stl_construct.h
+bits/stl_deque.h		bits/stl_deque.h
+bits/stl_function.h		bits/stl_function.h
+bits/stl_heap.h			bits/stl_heap.h
+bits/stl_iterator.h		bits/stl_iterator.h
+bits/stl_iterator_base_funcs.h	bits/stl_iterator_base_funcs.h
+bits/stl_iterator_base_types.h	bits/stl_iterator_base_types.h
+bits/stl_list.h			bits/stl_list.h
+bits/stl_map.h			bits/stl_map.h
+bits/stl_multimap.h		bits/stl_multimap.h
+bits/stl_multiset.h		bits/stl_multiset.h
+bits/stl_numeric.h		bits/stl_numeric.h
+bits/stl_pair.h			bits/stl_pair.h
+bits/stl_pthread_alloc.h	bits/stl_pthread_alloc.h
+bits/stl_queue.h		bits/stl_queue.h
+bits/stl_raw_storage_iter.h	bits/stl_raw_storage_iter.h
+bits/stl_relops.h		bits/stl_relops.h
+bits/stl_set.h			bits/stl_set.h
+bits/stl_stack.h		bits/stl_stack.h
+bits/stl_tempbuf.h		bits/stl_tempbuf.h
+bits/stl_threads.h		bits/stl_threads.h
+bits/stl_tree.h			bits/stl_tree.h
+bits/stl_uninitialized.h	bits/stl_uninitialized.h
+bits/stl_vector.h		bits/stl_vector.h
+bits/stream_iterator.h		bits/stream_iterator.h
+bits/streambuf.tcc		bits/streambuf.tcc
+bits/streambuf_iterator.h	bits/streambuf_iterator.h
+bits/stringfwd.h		bits/stringfwd.h
+bits/type_traits.h		bits/type_traits.h
+bits/valarray_array.h		bits/valarray_array.h
+bits/valarray_array.tcc		bits/valarray_array.tcc
+bits/valarray_meta.h		bits/valarray_meta.h
+c_std/cmath.tcc			bits/cmath.tcc
+c_std/std_cassert.h		cassert
+c_std/std_cctype.h		cctype
+c_std/std_cerrno.h		cerrno
+c_std/std_cfloat.h		cfloat
+c_std/std_ciso646.h		ciso646
+c_std/std_climits.h		climits
+c_std/std_clocale.h		clocale
+c_std/std_cmath.h		cmath
+c_std/std_csetjmp.h		csetjmp
+c_std/std_csignal.h		csignal
+c_std/std_cstdarg.h		cstdarg
+c_std/std_cstddef.h		cstddef
+c_std/std_cstdio.h		cstdio
+c_std/std_cstdlib.h		cstdlib
+c_std/std_cstring.h		cstring
+c_std/std_ctime.h		ctime
+c_std/std_cwchar.h		cwchar
+c_std/std_cwctype.h		cwctype
+ext/algorithm			ext/algorithm
+ext/enc_filebuf.h		ext/enc_filebuf.h
+ext/functional			ext/functional
+ext/hash_map			ext/hash_map
+ext/hash_set			ext/hash_set
+ext/iterator			ext/iterator
+ext/memory			ext/memory
+ext/numeric			ext/numeric
+ext/rb_tree			ext/rb_tree
+ext/rope			ext/rope
+ext/ropeimpl.h			ext/ropeimpl.h
+ext/slist			ext/slist
+ext/stdio_filebuf.h		ext/stdio_filebuf.h
+ext/stl_hash_fun.h		ext/stl_hash_fun.h
+ext/stl_hashtable.h		ext/stl_hashtable.h
+ext/stl_rope.h			ext/stl_rope.h
+std/std_algorithm.h		algorithm
+std/std_bitset.h		bitset
+std/std_complex.h		complex
+std/std_deque.h			deque
+std/std_fstream.h		fstream
+std/std_functional.h		functional
+std/std_iomanip.h		iomanip
+std/std_ios.h			ios
+std/std_iosfwd.h		iosfwd
+std/std_iostream.h		iostream
+std/std_istream.h		istream
+std/std_iterator.h		iterator
+std/std_limits.h		limits
+std/std_list.h			list
+std/std_locale.h		locale
+std/std_map.h			map
+std/std_memory.h		memory
+std/std_numeric.h		numeric
+std/std_ostream.h		ostream
+std/std_queue.h			queue
+std/std_set.h			set
+std/std_sstream.h		sstream
+std/std_stack.h			stack
+std/std_stdexcept.h		stdexcept
+std/std_streambuf.h		streambuf
+std/std_string.h		string
+std/std_utility.h		utility
+std/std_valarray.h		valarray
+std/std_vector.h		vector
diff --git a/gnu/lib/libstdc++/powerpc.map b/gnu/lib/libstdc++/powerpc.map
new file mode 100644
index 0000000..9d9c1c9
--- /dev/null
+++ b/gnu/lib/libstdc++/powerpc.map
@@ -0,0 +1,3 @@
+# $FreeBSD$
+cpu/powerpc/bits/atomicity.h	bits/atomicity.h
+cpu/powerpc/bits/cpu_limits.h	bits/cpu_limits.h
diff --git a/gnu/lib/libstdc++/sparc64.map b/gnu/lib/libstdc++/sparc64.map
new file mode 100644
index 0000000..5b9ccba
--- /dev/null
+++ b/gnu/lib/libstdc++/sparc64.map
@@ -0,0 +1,3 @@
+# $FreeBSD$
+cpu/sparc/sparc64/bits/atomicity.h	bits/atomicity.h
+cpu/generic/bits/cpu_limits.h		bits/cpu_limits.h
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index 2e5b1cc..681b1d8 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
-SRCDIR=	${.CURDIR}/../../../contrib/libstdc++-v3
-.PATH: ${SRCDIR} ${SRCDIR}/../../gcc
+GCCDIR=	${.CURDIR}/../../../contrib/gcc
+SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
 
-LIB=	stdc++
+.PATH: ${SRCDIR} ${GCCDIR}
+
+# Static only.
+LIB=	supc++
 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 \
@@ -14,12 +17,11 @@ SRCS=	del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc \
 SRCS+=	cp-demangle.c dyn-string.c
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
-CFLAGS+=	-I${SRCDIR}/../../gcc
-CXXFLAGS+=	-nostdinc++ \
-		-fno-implicit-templates -ffunction-sections -fdata-sections
+CFLAGS+=	-I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++
+CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h
 INCS=	${HDRS:S;^;${SRCDIR}/;}
-INCSDIR=${INCLUDEDIR}/g++-v3
+INCSDIR=${INCLUDEDIR}/g++
 
 .include <bsd.lib.mk>