2003-07-04 Benjamin Kosnik <bkoz@redhat.com>

Move from CPP to CXX. * include/bits/c++config: Move to GLIBCXX from GLIBCPP. * testsuite/Makefile.am: Same. * testsuite/Makefile.in: Regenerate. * po/Makefile.am: Same. * po/Makefile.in: Regenerate. * libsupc++/Makefile.am: Same. * libsupc++/Makefile.in: Regenerate. * libmath/Makefile.am: Same. * libmath/Makefile.in: Regenerate. * include/Makefile.am: Same. * include/Makefile.in: Regenerate. * src/Makefile.am: Same. * src/Makefile.in: Regenerate. * acconfig.h: Same. * configure.host: Same. * configure.in: Same. * configure: Regenerate. * acinclude.m4: Same. * aclocal.m4: Same. * src: Change all files in this directory. * testsuite: Same. * include: Same, standardize include guards. * config: Same. * libsupc++: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68958 138bc75d-0d04-0410-961f-82ee72b054a4
author: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> 2003-07-05 04:05:45 +0000
committer: bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> 2003-07-05 04:05:45 +0000
commit: 5a64d8cf37253f8227d179a52a0c022a927db8b6 (patch)
tree: 01daea8defdbdbfae1385af0f177ec7506e8ca8d
parent: 755edffdacb0e09129b815d8e4dbb060d7fb6552 (diff)
download: gcc-5a64d8cf37253f8227d179a52a0c022a927db8b6.tar.gz
323 files changed, 3741 insertions, 3685 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 078886137dc..d48c01486b2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,31 @@
+2003-07-04  Benjamin Kosnik  <bkoz@redhat.com>
+
+	Move from CPP to CXX.
+	* include/bits/c++config: Move to GLIBCXX from GLIBCPP.
+	* testsuite/Makefile.am: Same.
+	* testsuite/Makefile.in: Regenerate.
+	* po/Makefile.am: Same.
+	* po/Makefile.in: Regenerate.	
+	* libsupc++/Makefile.am: Same.
+	* libsupc++/Makefile.in: Regenerate.	
+	* libmath/Makefile.am: Same.
+	* libmath/Makefile.in: Regenerate.	
+	* include/Makefile.am: Same.
+	* include/Makefile.in: Regenerate.	
+	* src/Makefile.am: Same.
+	* src/Makefile.in: Regenerate.	
+	* acconfig.h: Same.
+	* configure.host: Same.
+	* configure.in: Same.
+	* configure: Regenerate.
+	* acinclude.m4: Same.
+	* aclocal.m4: Same.
+	* src: Change all files in this directory.
+	* testsuite: Same.
+	* include: Same, standardize include guards.
+	* config: Same.
+	* libsupc++: Same.
+	
 2003-07-04  Zack Weinberg  <zack@codesourcery.com>
 
 	* testsuite/22_locale/collate/compare/wchar_t/2.cc
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index 0234b75f11e..420322d0513 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -96,8 +96,8 @@ FPOS_H = @FPOS_H@
 FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
@@ -127,18 +127,18 @@ baseline_dir = @baseline_dir@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_builddir = @glibcpp_builddir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_srcdir = @glibcpp_srcdir@
-glibcpp_thread_h = @glibcpp_thread_h@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_builddir = @glibcxx_builddir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_srcdir = @glibcxx_srcdir@
+glibcxx_thread_h = @glibcxx_thread_h@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
@@ -278,7 +278,7 @@ maintainer-clean-hdr:
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -298,7 +298,7 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
+	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 	  rev="$$subdir $$rev"; \
diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h
index 45559b852d1..b856b6ba8d3 100644
--- a/libstdc++-v3/acconfig.h
+++ b/libstdc++-v3/acconfig.h
@@ -11,50 +11,50 @@
 #undef HAVE_STPCPY
 
 // Define if GCC supports weak symbols.
-#undef _GLIBCPP_SUPPORTS_WEAK
+#undef _GLIBCXX_SUPPORTS_WEAK
 
 // Include I/O support for 'long long' and 'unsigned long long'.
-#undef _GLIBCPP_USE_LONG_LONG
+#undef _GLIBCXX_USE_LONG_LONG
 
 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
-#undef _GLIBCPP_USE_C99
+#undef _GLIBCXX_USE_C99
 
 // Include support for 'long double'.
-#undef _GLIBCPP_USE_LONG_DOUBLE
+#undef _GLIBCXX_USE_LONG_DOUBLE
 
 // Include support for shadow headers, ie --enable-cshadow-headers.
-#undef _GLIBCPP_USE_SHADOW_HEADERS
+#undef _GLIBCXX_USE_SHADOW_HEADERS
 
 // Define if code specialized for wchar_t should be used.
-#undef _GLIBCPP_USE_WCHAR_T
+#undef _GLIBCXX_USE_WCHAR_T
 
 // Define if using setrlimit to limit memory usage during 'make check'.
-#undef _GLIBCPP_MEM_LIMITS
+#undef _GLIBCXX_MEM_LIMITS
 
 // Define to use concept checking code from the boost libraries.
-#undef _GLIBCPP_CONCEPT_CHECKS
+#undef _GLIBCXX_CONCEPT_CHECKS
 
 // Define if the atan2f function exists.
-#undef _GLIBCPP_HAVE_ATAN2F 
+#undef _GLIBCXX_HAVE_ATAN2F 
 
 // Define if the atan2l function exists.
-#undef _GLIBCPP_HAVE_ATAN2L
+#undef _GLIBCXX_HAVE_ATAN2L
 
 // Define if the copysignf function exists.
-#undef _GLIBCPP_HAVE_COPYSIGNF
+#undef _GLIBCXX_HAVE_COPYSIGNF
 
 // 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 gthr-default.h exists (meaning that threading support is enabled).
@@ -154,7 +154,7 @@
 #undef HAVE_MODF
 
 // Define if NLS translations are to be used.
-#undef _GLIBCPP_USE_NLS
+#undef _GLIBCXX_USE_NLS
 
 // @BOTTOM@
 //
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 21402896eb3..64c4d813875 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1,8 +1,8 @@
 dnl
 dnl Initialize basic configure bits, set toplevel_srcdir for Makefiles.
 dnl
-dnl GLIBCPP_TOPREL_CONFIGURE
-AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
+dnl GLIBCXX_TOPREL_CONFIGURE
+AC_DEFUN(GLIBCXX_TOPREL_CONFIGURE, [
   dnl Default to --enable-multilib (this is also passed by default
   dnl from the ubercommon-top-level configure)
   AC_ARG_ENABLE(multilib,
@@ -39,19 +39,19 @@ AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
 dnl
 dnl Initialize the rest of the library configury.
 dnl
-dnl GLIBCPP_CONFIGURE
-AC_DEFUN(GLIBCPP_CONFIGURE, [
+dnl GLIBCXX_CONFIGURE
+AC_DEFUN(GLIBCXX_CONFIGURE, [
   # Export build and source directories.
   # These need to be absolute paths, yet at the same time need to
   # canonicalize only relative paths, because then amd will not unmount
   # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
-  glibcpp_builddir=`${PWDCMD-pwd}`
+  glibcxx_builddir=`${PWDCMD-pwd}`
   case $srcdir in
-  [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
-  *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+  [\\/$]* | ?:[\\/]*) glibcxx_srcdir=${srcdir} ;;
+  *) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
   esac
-  AC_SUBST(glibcpp_builddir)
-  AC_SUBST(glibcpp_srcdir)
+  AC_SUBST(glibcxx_builddir)
+  AC_SUBST(glibcxx_srcdir)
 
   dnl This is here just to satisfy automake.
   ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
@@ -73,8 +73,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   AC_ARG_WITH(newlib,
   [  --with-newlib                    Configuring with newlib])
 
-  glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
-  AC_SUBST(glibcpp_basedir)
+  glibcxx_basedir=$srcdir/$toprel/$1/libstdc++-v3
+  AC_SUBST(glibcxx_basedir)
 
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
@@ -131,15 +131,15 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
   dnl Fool anybody using AC_PROG_CXX.
   AC_PROVIDE([AC_PROG_CXX])
-  # Use glibcpp_CXX so that we do not cause CXX to be cached with the
+  # Use glibcxx_CXX so that we do not cause CXX to be cached with the
   # flags that come in CXX while configuring libstdc++.  They're different
   # from those used for all other target libraries.  If CXX is set in
   # the environment, respect that here.
-  glibcpp_CXX=$CXX
-  AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
-  AC_SUBST(glibcpp_CXX)
-  CXX=$glibcpp_CXX
-  test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
+  glibcxx_CXX=$CXX
+  AC_CHECK_PROGS(glibcxx_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
+  AC_SUBST(glibcxx_CXX)
+  CXX=$glibcxx_CXX
+  test -z "$glibcxx_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
 
   AC_PROG_CXX_GNU
 
@@ -169,7 +169,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
 
   # For directory versioning (e.g., headers) and other variables.
   AC_MSG_CHECKING([for GCC version number])
-  gcc_version=`$glibcpp_CXX -dumpversion`
+  gcc_version=`$glibcxx_CXX -dumpversion`
   AC_MSG_RESULT($gcc_version)
 
   # For some reason, gettext needs this.
@@ -197,16 +197,16 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
     AC_EXEEXT
   fi
 
-  case [$]{glibcpp_basedir} in
-    /* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcpp_basedir} ;;
-    *) glibcpp_flagbasedir='[$](top_builddir)/'[$]{glibcpp_basedir} ;;
+  case [$]{glibcxx_basedir} in
+    /* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcxx_basedir} ;;
+    *) glibcxx_flagbasedir='[$](top_builddir)/'[$]{glibcxx_basedir} ;;
   esac
 
   # Set up safe default values for all subsequent AM_CONDITIONAL tests.
   need_libmath=no
   enable_wchar_t=no
   #enable_debug=no
-  #glibcpp_pch_comp=no
+  #glibcxx_pch_comp=no
   #enable_cheaders=c
   #c_compatibility=no
   #enable_abi_check=no
@@ -214,7 +214,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
 
   # Find platform-specific directories containing configuration info.  In
   # addition to possibly modifying the same flags, it also sets up symlinks.
-  GLIBCPP_CHECK_HOST
+  GLIBCXX_CHECK_HOST
 ])
 
 
@@ -222,8 +222,8 @@ dnl
 dnl Check to see if g++ can compile this library, and if so, if any version-
 dnl specific precautions need to be taken.
 dnl
-dnl GLIBCPP_CHECK_COMPILER_VERSION
-AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
+dnl GLIBCXX_CHECK_COMPILER_VERSION
+AC_DEFUN(GLIBCXX_CHECK_COMPILER_VERSION, [
 if test ! -f stamp-sanity-compiler; then
   AC_MSG_CHECKING([for g++ that will successfully compile libstdc++-v3])
   AC_LANG_SAVE
@@ -252,11 +252,11 @@ dnl
 dnl Define SECTION_FLAGS='-ffunction-sections -fdata-sections' if
 dnl compiler supports it and the user has not requested debug mode.
 dnl
-dnl GLIBCPP_CHECK_COMPILER_FEATURES
-AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [
+dnl GLIBCXX_CHECK_COMPILER_FEATURES
+AC_DEFUN(GLIBCXX_CHECK_COMPILER_FEATURES, [
   # All these tests are for C++; save the language and the compiler flags.
   # The CXXFLAGS thing is suspicious, but based on similar bits previously
-  # found in GLIBCPP_CONFIGURE.
+  # found in GLIBCXX_CONFIGURE.
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
@@ -298,11 +298,11 @@ dnl safe (like an empty string).
 dnl
 dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible.
 dnl Define OPT_LDFLAGS='-Wl,-O1' if possible.
-dnl Define LD, with_gnu_ld, and (possibly) glibcpp_gnu_ld_version as
+dnl Define LD, with_gnu_ld, and (possibly) glibcxx_gnu_ld_version as
 dnl side-effects of testing.
 dnl
-dnl GLIBCPP_CHECK_LINKER_FEATURES
-AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
+dnl GLIBCXX_CHECK_LINKER_FEATURES
+AC_DEFUN(GLIBCXX_CHECK_LINKER_FEATURES, [
   # If we're not using GNU ld, then there's no point in even trying these
   # tests.  Check for that first.  We should have already tested for gld
   # by now (in libtool), but require it now just to be safe...
@@ -331,7 +331,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   changequote([,])
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'`
 
   # Set --gc-sections.
@@ -387,11 +387,11 @@ dnl Check to see if the (math function) argument passed is
 dnl declared when using the c++ compiler
 dnl ASSUMES argument is a math function with ONE parameter
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_1
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
+dnl GLIBCXX_CHECK_MATH_DECL_1
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_1, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>
@@ -400,11 +400,11 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
 		      #endif
 		     ],
                      [ $1(0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
 ])
 
 dnl
@@ -419,14 +419,14 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with ONE parameter
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
-  GLIBCPP_CHECK_MATH_DECL_1($1)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+dnl GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1, [
+  GLIBCXX_CHECK_MATH_DECL_1($1)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   else
-    GLIBCPP_CHECK_MATH_DECL_1(_$1)
-    if test x$glibcpp_cv_func__$1_use = x"yes"; then
+    GLIBCXX_CHECK_MATH_DECL_1(_$1)
+    if test x$glibcxx_cv_func__$1_use = x"yes"; then
       AC_CHECK_FUNCS(_$1)
     fi
   fi
@@ -434,22 +434,22 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
 
 
 dnl
-dnl Like GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of
+dnl Like GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of
 dnl of functions at once.  It's an all-or-nothing check -- either
 dnl HAVE_XYZ is defined for each of the functions, or for none of them.
 dnl Doing it this way saves significant configure time.
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1, [
   AC_MSG_CHECKING([for $1 functions])
-  AC_CACHE_VAL(glibcpp_cv_func_$2_use, [
+  AC_CACHE_VAL(glibcxx_cv_func_$2_use, [
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
     AC_TRY_COMPILE([#include <math.h>],
                    [ `for x in $3; do echo "$x (0);"; done` ],
-                   [glibcpp_cv_func_$2_use=yes],
-                   [glibcpp_cv_func_$2_use=no])
+                   [glibcxx_cv_func_$2_use=yes],
+                   [glibcxx_cv_func_$2_use=no])
     AC_LANG_RESTORE])
-  AC_MSG_RESULT($glibcpp_cv_func_$2_use)
-  if test x$glibcpp_cv_func_$2_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$2_use)
+  if test x$glibcxx_cv_func_$2_use = x"yes"; then
     AC_CHECK_FUNCS($3)
   fi
 ])
@@ -459,20 +459,20 @@ dnl Check to see if the (math function) argument passed is
 dnl declared when using the c++ compiler
 dnl ASSUMES argument is a math function with TWO parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_2
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [
+dnl GLIBCXX_CHECK_MATH_DECL_2
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_2, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>],
                      [ $1(0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
 ])
 
 dnl
@@ -486,14 +486,14 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with TWO parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
-  GLIBCPP_CHECK_MATH_DECL_2($1)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+dnl GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2, [
+  GLIBCXX_CHECK_MATH_DECL_2($1)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   else
-    GLIBCPP_CHECK_MATH_DECL_2(_$1)
-    if test x$glibcpp_cv_func__$1_use = x"yes"; then
+    GLIBCXX_CHECK_MATH_DECL_2(_$1)
+    if test x$glibcxx_cv_func__$1_use = x"yes"; then
       AC_CHECK_FUNCS(_$1)
     fi
   fi
@@ -505,20 +505,20 @@ dnl Check to see if the (math function) argument passed is
 dnl declared when using the c++ compiler
 dnl ASSUMES argument is a math function with THREE parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_3
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [
+dnl GLIBCXX_CHECK_MATH_DECL_3
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_3, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>],
                      [ $1(0, 0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
 ])
 
 dnl
@@ -532,14 +532,14 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with THREE parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
-  GLIBCPP_CHECK_MATH_DECL_3($1)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+dnl GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3, [
+  GLIBCXX_CHECK_MATH_DECL_3($1)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   else
-    GLIBCPP_CHECK_MATH_DECL_3(_$1)
-    if test x$glibcpp_cv_func__$1_use = x"yes"; then
+    GLIBCXX_CHECK_MATH_DECL_3(_$1)
+    if test x$glibcxx_cv_func__$1_use = x"yes"; then
       AC_CHECK_FUNCS(_$1)
     fi
   fi
@@ -555,21 +555,21 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with TWO parameters
 dnl
-dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
-AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
+dnl GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2
+AC_DEFUN(GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <stdlib.h>],
                      [ $1(0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   fi
 ])
@@ -584,21 +584,21 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a function with THREE parameters
 dnl
-dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3
-AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [
+dnl GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3
+AC_DEFUN(GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <stdlib.h>],
                      [ $1(0, 0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   fi
 ])
@@ -616,31 +616,31 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with ONE parameter
 dnl
-dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
-AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
+dnl GLIBCXX_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
+AC_DEFUN(GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>],
                      [ $1(0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_MSG_CHECKING([for $1 linkage])
-    if test x${glibcpp_cv_func_$1_link+set} != xset; then
-      AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
+    if test x${glibcxx_cv_func_$1_link+set} != xset; then
+      AC_CACHE_VAL(glibcxx_cv_func_$1_link, [
         AC_TRY_LINK([#include <math.h>],
                     [ $1(0);],
-                    [glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
+                    [glibcxx_cv_func_$1_link=yes], [glibcxx_cv_func_$1_link=no])
       ])
     fi
-    AC_MSG_RESULT($glibcpp_cv_func_$1_link)
-    if test x$glibcpp_cv_func_$1_link = x"yes"; then
+    AC_MSG_RESULT($glibcxx_cv_func_$1_link)
+    if test x$glibcxx_cv_func_$1_link = x"yes"; then
       ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       AC_DEFINE_UNQUOTED(${ac_tr_func})
     fi
@@ -666,27 +666,27 @@ dnl check for __builtin_cosf
 dnl check for __builtin_cos
 dnl check for __builtin_cosl
 dnl
-dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
+dnl GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT, [
   dnl Test for builtin math functions.
   dnl These are made in gcc/c-common.c
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_abs)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabs)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsl)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_labs)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_abs)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabs)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_labs)
 
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrt)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrt)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtl)
 
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sin)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sin)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinl)
 
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cos)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cos)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosl)
 
   dnl There is, without a doubt, a more elegant way to have these
   dnl names exported so that they won't be stripped out of acconfig.h by
@@ -724,14 +724,14 @@ dnl Define HAVE_STRTOLD if "strtold" is declared and links
 dnl Define HAVE_STRTOF if "strtof" is declared and links
 dnl Define HAVE_DRAND48 if "drand48" is declared and links
 dnl
-dnl GLIBCPP_CHECK_STDLIB_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [
+dnl GLIBCXX_CHECK_STDLIB_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_STDLIB_SUPPORT, [
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
 
-  GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtold)
-  GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtof)
+  GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtold)
+  GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtof)
   AC_CHECK_FUNCS(drand48)
 
   CXXFLAGS="$ac_save_CXXFLAGS"
@@ -746,8 +746,8 @@ dnl This might seem like overkill but experience has shown that it's not...
 dnl
 dnl Define HAVE_CARGF etc if "cargf" is found.
 dnl
-dnl GLIBCPP_CHECK_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
+dnl GLIBCXX_CHECK_MATH_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_MATH_SUPPORT, [
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
@@ -758,67 +758,67 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   LIBS="$LIBS $libm"
 
   dnl Check to see if certain C math functions exist.
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnan)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finite)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysign)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincos)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fpclass)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(qfpclass)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypot)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnan)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(finite)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(copysign)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3(sincos)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(fpclass)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(qfpclass)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(hypot)
 
   dnl Check to see if basic C math functions have float versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(float trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(float trig,
                                           float_trig,
                                           acosf asinf atanf \
                                           cosf sinf tanf \
                                           coshf sinhf tanhf)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(float round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(float round,
                                           float_round,
                                           ceilf floorf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2f)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10f)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modff)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(expf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(atan2f)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(fabsf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(fmodf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(frexpf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(hypotf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(logf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(log10f)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(modff)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(powf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3(sincosf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
 
   dnl Check to see if basic C math functions have long double versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
                                           long_double_trig,
                                           acosl asinl atanl \
                                           cosl sinl tanl \
                                           coshl sinhl tanhl)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
                                           long_double_round,
                                           ceill floorl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
 
   dnl Some runtimes have these functions with a preceding underscore. Please
   dnl keep this sync'd with the one above. And if you add any new symbol,
@@ -826,22 +826,22 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   dnl Check to see if certain C math functions exist.
 
   dnl Check to see if basic C math functions have float versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_float trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_float trig,
                                           _float_trig,
                                           _acosf _asinf _atanf \
                                           _cosf _sinf _tanf \
                                           _coshf _sinhf _tanhf)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_float round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_float round,
                                           _float_round,
                                           _ceilf _floorf)
 
   dnl Check to see if basic C math functions have long double versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double trig,
                                           _long_double_trig,
                                           _acosl _asinl _atanl \
                                           _cosl _sinl _tanl \
                                           _coshl _sinhl _tanhl)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double round,
                                           _long_double_round,
                                           _ceill _floorl)
 
@@ -857,8 +857,8 @@ dnl Don't compile bits in math/* if native support exits.
 dnl
 dnl Define USE_COMPLEX_LONG_DOUBLE etc if "copysignl" is found.
 dnl
-dnl GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
+dnl GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl Check for complex versions of math functions of platform.  This will
   dnl always pass if libm is available, and fail if it isn't.  If it is
   dnl available, we assume we'll need it later, so add it to LIBS.
@@ -872,7 +872,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl Compile the long double complex functions only if the function
   dnl provides the non-complex long double functions that are needed.
   dnl Currently this includes copysignl, which should be
-  dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above.
+  dnl cached from the GLIBCXX_CHECK_MATH_SUPPORT macro, above.
   if test x$ac_cv_func_copysignl = x"yes"; then
     AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"])
   fi
@@ -888,9 +888,9 @@ dnl Check to see what architecture and operating system we are compiling
 dnl for.  Also, if architecture- or OS-specific flags are required for
 dnl compilation, pick them up here.
 dnl
-dnl GLIBCPP_CHECK_HOST
-AC_DEFUN(GLIBCPP_CHECK_HOST, [
-  . [$]{glibcpp_basedir}/configure.host
+dnl GLIBCXX_CHECK_HOST
+AC_DEFUN(GLIBCXX_CHECK_HOST, [
+  . [$]{glibcxx_basedir}/configure.host
   AC_MSG_RESULT(CPU config directory is $cpu_include_dir)
   AC_MSG_RESULT(OS config directory is $os_include_dir)
 ])
@@ -901,11 +901,11 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
 dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled.  (This
 dnl must have been previously checked.)
 dnl
-dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found
+dnl Define _GLIBCXX_USE_WCHAR_T if all the bits are found
 dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h
 dnl
-dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
+dnl GLIBCXX_CHECK_WCHAR_T_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_WCHAR_T_SUPPORT, [
   dnl Wide characters disabled by default.
 
   dnl Test wchar.h for mbstate_t, which is needed for char_traits and
@@ -999,7 +999,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
     dnl above support is present.
     if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
-      AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
+      AC_DEFINE(_GLIBCXX_USE_WCHAR_T)
       enable_wchar_t=yes
     fi
   fi
@@ -1011,7 +1011,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
 dnl
 dnl Check to see if debugging libraries are to be built.
 dnl
-dnl GLIBCPP_ENABLE_DEBUG
+dnl GLIBCXX_ENABLE_DEBUG
 dnl
 dnl --enable-libstdcxx-debug
 dnl builds a separate set of debugging libraries in addition to the
@@ -1023,53 +1023,53 @@ dnl
 dnl --enable-libstdcxx-debug-flags=FLAGS
 dnl iff --enable-debug == yes, then use FLAGS to build the debug library.
 dnl
-dnl  +  Usage:  GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_DEBUG[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
-define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_DEBUG, [dnl
+define([GLIBCXX_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(libstdcxx_debug,
 changequote(<<, >>)dnl
-<<  --enable-libstdcxx-debug          build extra debug library [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
+<<  --enable-libstdcxx-debug          build extra debug library [default=>>GLIBCXX_ENABLE_DEBUG_DEFAULT],
 changequote([, ])dnl
 [case "${enableval}" in
  yes) enable_libstdcxx_debug=yes ;;
  no)  enable_libstdcxx_debug=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
  esac],
-enable_libstdcxx_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
+enable_libstdcxx_debug=GLIBCXX_ENABLE_DEBUG_DEFAULT)dnl
 AC_MSG_CHECKING([for additional debug build])
 AC_MSG_RESULT($enable_libstdcxx_debug)
-AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_libstdcxx_debug" = yes)
+AM_CONDITIONAL(GLIBCXX_BUILD_DEBUG, test "$enable_libstdcxx_debug" = yes)
 ])
 
 
 dnl Check for explicit debug flags.
 dnl
-dnl GLIBCPP_ENABLE_DEBUG_FLAGS
+dnl GLIBCXX_ENABLE_DEBUG_FLAGS
 dnl
 dnl --enable-libstdcxx-debug-flags='-O1'
 dnl is a general method for passing flags to be used when
 dnl building debug libraries with --enable-debug.
 dnl
 dnl --disable-libstdcxx-debug-flags does nothing.
-dnl  +  Usage:  GLIBCPP_ENABLE_DEBUG_FLAGS(default flags)
+dnl  +  Usage:  GLIBCXX_ENABLE_DEBUG_FLAGS(default flags)
 dnl       If "default flags" is an empty string (or "none"), the effect is
 dnl       the same as --disable or --enable=no.
-AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl
-define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
+AC_DEFUN(GLIBCXX_ENABLE_DEBUG_FLAGS, [dnl
+define([GLIBCXX_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
 AC_ARG_ENABLE(libstdcxx_debug_flags,
 changequote(<<, >>)dnl
 <<  --enable-libstdcxx-debug-flags=FLAGS    pass compiler FLAGS when building 
                                             debug library;
-                                [default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT],
+                                [default=>>GLIBCXX_ENABLE_DEBUG_FLAGS_DEFAULT],
 changequote([, ])dnl
 [case "${enableval}" in
  none)  ;;
  -*) enable_libstdcxx_debug_flags="${enableval}" ;;
  *)   AC_MSG_ERROR([Unknown argument to extra debugging flags]) ;;
  esac],
-enable_libstdcxx_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
+enable_libstdcxx_debug_flags=GLIBCXX_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
 
 dnl Option parsed, now set things appropriately
 case x"$enable_libstdcxx_debug" in
@@ -1095,7 +1095,7 @@ AC_MSG_RESULT($DEBUG_FLAGS)
 dnl
 dnl Check for "unusual" flags to pass to the compiler while building.
 dnl
-dnl GLIBCPP_ENABLE_CXX_FLAGS
+dnl GLIBCXX_ENABLE_CXX_FLAGS
 dnl --enable-cxx-flags='-foo -bar -baz' is a general method for passing
 dnl     experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc.
 dnl     Somehow this same set of flags must be passed when [re]building
@@ -1104,16 +1104,16 @@ dnl --disable-cxx-flags passes nothing.
 dnl  +  See http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00131.html
 dnl         http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00284.html
 dnl         http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00035.html
-dnl  +  Usage:  GLIBCPP_ENABLE_CXX_FLAGS(default flags)
+dnl  +  Usage:  GLIBCXX_ENABLE_CXX_FLAGS(default flags)
 dnl       If "default flags" is an empty string (or "none"), the effect is
 dnl       the same as --disable or --enable=no.
-AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
-define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
+AC_DEFUN(GLIBCXX_ENABLE_CXX_FLAGS, [dnl
+define([GLIBCXX_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
 AC_MSG_CHECKING([for extra compiler flags for building])
 AC_ARG_ENABLE(cxx_flags,
 changequote(<<, >>)dnl
 <<  --enable-cxx-flags=FLAGS     pass compiler FLAGS when building library;
-                                  [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
+                                  [default=>>GLIBCXX_ENABLE_CXX_FLAGS_DEFAULT],
 changequote([, ])dnl
 [case "x$enable_cxx_flags" in
   xyes)
@@ -1123,7 +1123,7 @@ changequote([, ])dnl
   *)
     enable_cxx_flags="$enableval" ;;
 esac],
-enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT)
+enable_cxx_flags=GLIBCXX_ENABLE_CXX_FLAGS_DEFAULT)
 
 dnl Run through flags (either default or command-line) and set anything
 dnl extra (e.g., #defines) that must accompany particular g++ options.
@@ -1146,13 +1146,13 @@ AC_SUBST(EXTRA_CXX_FLAGS)
 dnl
 dnl Check for which locale library to use:  gnu or generic.
 dnl
-dnl GLIBCPP_ENABLE_CLOCALE
+dnl GLIBCXX_ENABLE_CLOCALE
 dnl --enable-clocale=gnu sets config/locale/c_locale_gnu.cc and friends
 dnl --enable-clocale=generic sets config/locale/c_locale_generic.cc and friends
 dnl
 dnl default is generic
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
+AC_DEFUN(GLIBCXX_ENABLE_CLOCALE, [
   AC_MSG_CHECKING([for clocale to use])
   AC_ARG_ENABLE(clocale,
   [  --enable-clocale        enable model for target locale package.
@@ -1170,10 +1170,10 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
   if test x$enable_clocale_flag = xno; then
     case x${target_os} in
       xlinux* | xgnu*)
-	AC_EGREP_CPP([_GLIBCPP_ok], [
+	AC_EGREP_CPP([_GLIBCXX_ok], [
         #include <features.h>
         #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-          _GLIBCPP_ok
+          _GLIBCXX_ok
         #endif
         ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
 
@@ -1255,11 +1255,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
       fi
       # Export the build objects.
       for ling in $ALL_LINGUAS; do \
-        glibcpp_MOFILES="$glibcpp_MOFILES $ling.mo"; \
-        glibcpp_POFILES="$glibcpp_POFILES $ling.po"; \
+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
       done
-      AC_SUBST(glibcpp_MOFILES)
-      AC_SUBST(glibcpp_POFILES)
+      AC_SUBST(glibcxx_MOFILES)
+      AC_SUBST(glibcxx_POFILES)
 
       CLOCALE_H=config/locale/gnu/c_locale.h
       CLOCALE_CC=config/locale/gnu/c_locale.cc
@@ -1300,8 +1300,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 
   # This is where the testsuite looks for locale catalogs, using the
   # -DLOCALEDIR define during testsuite compilation.
-  glibcpp_localedir=${glibcpp_builddir}/po/share/locale
-  AC_SUBST(glibcpp_localedir)
+  glibcxx_localedir=${glibcxx_builddir}/po/share/locale
+  AC_SUBST(glibcxx_localedir)
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
   if test $USE_NLS = yes; then
@@ -1309,7 +1309,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
     AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
   fi
   if test $USE_NLS = yes; then
-    AC_DEFINE(_GLIBCPP_USE_NLS)
+    AC_DEFINE(_GLIBCXX_USE_NLS)
   fi
 
   AC_SUBST(USE_NLS)
@@ -1332,11 +1332,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 dnl
 dnl Check for which I/O library to use:  stdio, or something specific.
 dnl
-dnl GLIBCPP_ENABLE_CSTDIO
+dnl GLIBCXX_ENABLE_CSTDIO
 dnl
 dnl default is stdio
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
+AC_DEFUN(GLIBCXX_ENABLE_CSTDIO, [
   AC_MSG_CHECKING([for cstdio to use])
   AC_ARG_ENABLE(cstdio,
   [  --enable-cstdio         enable stdio for target io package.
@@ -1377,7 +1377,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
 dnl
 dnl Check to see if building and using a C++ precompiled header can be done.
 dnl
-dnl GLIBCPP_ENABLE_PCH
+dnl GLIBCXX_ENABLE_PCH
 dnl
 dnl --enable-libstdcxx-pch=yes
 dnl default, this shows intent to use stdc++.h.gch If it looks like it
@@ -1387,18 +1387,18 @@ dnl
 dnl --disable-libstdcxx-pch
 dnl turns off attempts to use or build stdc++.h.gch.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_PCH, [dnl
-define([GLIBCPP_ENABLE_PCH_DEFAULT], ifelse($1,,, $1))dnl
+AC_DEFUN(GLIBCXX_ENABLE_PCH, [dnl
+define([GLIBCXX_ENABLE_PCH_DEFAULT], ifelse($1,,, $1))dnl
 AC_ARG_ENABLE(libstdcxx_pch,
 changequote(<<, >>)dnl
-<<  --enable-libstdcxx-pch     build pre-compiled libstdc++ includes [default=>>GLIBCPP_ENABLE_PCH_DEFAULT],
+<<  --enable-libstdcxx-pch     build pre-compiled libstdc++ includes [default=>>GLIBCXX_ENABLE_PCH_DEFAULT],
 changequote([, ])dnl
 [case "${enableval}" in
  yes) enable_libstdcxx_pch=yes ;;
  no)  enable_libstdcxx_pch=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable PCH]) ;;
  esac],
-enable_libstdcxx_pch=GLIBCPP_ENABLE_PCH_DEFAULT)dnl
+enable_libstdcxx_pch=GLIBCXX_ENABLE_PCH_DEFAULT)dnl
 
   if test x$enable_libstdcxx_pch = xyes; then
     ac_test_CXXFLAGS="${CXXFLAGS+set}"
@@ -1427,13 +1427,13 @@ enable_libstdcxx_pch=GLIBCPP_ENABLE_PCH_DEFAULT)dnl
   AC_MSG_CHECKING([for enabled PCH])
   AC_MSG_RESULT([$enable_libstdcxx_pch])
 
-  AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$enable_libstdcxx_pch" = yes)
+  AM_CONDITIONAL(GLIBCXX_BUILD_PCH, test "$enable_libstdcxx_pch" = yes)
   if test "$enable_libstdcxx_pch" = yes; then
-	glibcpp_PCHFLAGS="-include bits/stdc++.h"
+	glibcxx_PCHFLAGS="-include bits/stdc++.h"
   else
-	glibcpp_PCHFLAGS=""
+	glibcxx_PCHFLAGS=""
   fi
-  AC_SUBST(glibcpp_PCHFLAGS)
+  AC_SUBST(glibcxx_PCHFLAGS)
 ])
 
 dnl
@@ -1448,18 +1448,18 @@ dnl having to write complex code (the sed commands to clean the macro
 dnl namespace are complex and fragile enough as it is).  We must also
 dnl add a relative path so that -I- is supported properly.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
+AC_DEFUN(GLIBCXX_ENABLE_THREADS, [
   AC_MSG_CHECKING([for thread model used by GCC])
   target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
   AC_MSG_RESULT([$target_thread_file])
 
   if test $target_thread_file != single; then
     AC_DEFINE(HAVE_GTHR_DEFAULT)
-    AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
+    AC_DEFINE(_GLIBCXX_SUPPORTS_WEAK, __GXX_WEAK__)
   fi
 
-  glibcpp_thread_h=gthr-$target_thread_file.h
-  AC_SUBST(glibcpp_thread_h)
+  glibcxx_thread_h=gthr-$target_thread_file.h
+  AC_SUBST(glibcxx_thread_h)
 ])
 
 
@@ -1468,13 +1468,13 @@ dnl Check for exception handling support.  If an explicit enable/disable
 dnl sjlj exceptions is given, we don't have to detect.  Otherwise the
 dnl target may or may not support call frame exceptions.
 dnl
-dnl GLIBCPP_ENABLE_SJLJ_EXCEPTIONS
+dnl GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
 dnl --enable-sjlj-exceptions forces the use of builtin setjmp.
 dnl --disable-sjlj-exceptions forces the use of call frame unwinding.
 dnl
-dnl Define _GLIBCPP_SJLJ_EXCEPTIONS if the compiler is configured for it.
+dnl Define _GLIBCXX_SJLJ_EXCEPTIONS if the compiler is configured for it.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_SJLJ_EXCEPTIONS, [
+AC_DEFUN(GLIBCXX_ENABLE_SJLJ_EXCEPTIONS, [
   AC_MSG_CHECKING([for exception model to use])
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -1510,7 +1510,7 @@ EOF
    CXXFLAGS="$old_CXXFLAGS"
    rm -f conftest*])
    if test x$enable_sjlj_exceptions = xyes; then
-     AC_DEFINE(_GLIBCPP_SJLJ_EXCEPTIONS, 1,
+     AC_DEFINE(_GLIBCXX_SJLJ_EXCEPTIONS, 1,
         [Define if the compiler is configured for setjmp/longjmp exceptions.])
      ac_exception_model_name=sjlj
    elif test x$enable_sjlj_exceptions = xno; then
@@ -1530,13 +1530,13 @@ dnl (_Unwind_RaiseException, _Unwind_Resume, etc.) are defined by
 dnl libunwind instead of libgcc and that libstdc++ has a dependency
 dnl on libunwind as well as libgcc.
 dnl
-dnl GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS
+dnl GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS
 dnl --enable-libunwind-exceptions forces the use of libunwind.
 dnl --disable-libunwind-exceptions assumes there is no libunwind.
 dnl
-dnl Define _GLIBCPP_LIBUNWIND_EXCEPTIONS if requested.
+dnl Define _GLIBCXX_LIBUNWIND_EXCEPTIONS if requested.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS, [
+AC_DEFUN(GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS, [
   AC_MSG_CHECKING([for use of libunwind])
   AC_ARG_ENABLE(libunwind-exceptions,
   [  --enable-libunwind-exceptions  force use of libunwind for exceptions],
@@ -1555,28 +1555,28 @@ AC_DEFUN(GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS, [
 dnl
 dnl Check for ISO/IEC 9899:1999 "C99" support.
 dnl
-dnl GLIBCPP_ENABLE_C99
-dnl --enable-c99 defines _GLIBCPP_USE_C99
-dnl --disable-c99 leaves _GLIBCPP_USE_C99 undefined
-dnl  +  Usage:  GLIBCPP_ENABLE_C99[(DEFAULT)]
+dnl GLIBCXX_ENABLE_C99
+dnl --enable-c99 defines _GLIBCXX_USE_C99
+dnl --disable-c99 leaves _GLIBCXX_USE_C99 undefined
+dnl  +  Usage:  GLIBCXX_ENABLE_C99[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If omitted, it
 dnl       defaults to `no'.
 dnl  +  If 'C99' stuff is not available, ignores DEFAULT and sets `no'.
 dnl
-dnl GLIBCPP_ENABLE_C99
-AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
-  define([GLIBCPP_ENABLE_C99_DEFAULT], ifelse($1, yes, yes, no))dnl
+dnl GLIBCXX_ENABLE_C99
+AC_DEFUN(GLIBCXX_ENABLE_C99, [dnl
+  define([GLIBCXX_ENABLE_C99_DEFAULT], ifelse($1, yes, yes, no))dnl
 
   AC_ARG_ENABLE(c99,
   changequote(<<, >>)dnl
-  <<--enable-c99            turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCPP_ENABLE_C99_DEFAULT],
+  <<--enable-c99            turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCXX_ENABLE_C99_DEFAULT],
   changequote([, ])dnl
   [case "$enableval" in
    yes) enable_c99=yes ;;
    no)  enable_c99=no ;;
    *)   AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;;
    esac],
-  enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl
+  enable_c99=GLIBCXX_ENABLE_C99_DEFAULT)dnl
 
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -1679,7 +1679,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
 
   # Option parsed, now set things appropriately
   if test x"$enable_c99" = x"yes"; then
-    AC_DEFINE(_GLIBCPP_USE_C99)
+    AC_DEFINE(_GLIBCXX_USE_C99)
   fi
 
   AC_LANG_RESTORE
@@ -1691,28 +1691,28 @@ dnl Check for template specializations for the 'long long' type extension.
 dnl The result determines only whether 'long long' I/O is enabled; things
 dnl like numeric_limits<> specializations are always available.
 dnl
-dnl GLIBCPP_ENABLE_LONG_LONG
-dnl --enable-long-long defines _GLIBCPP_USE_LONG_LONG
-dnl --disable-long-long leaves _GLIBCPP_USE_LONG_LONG undefined
-dnl  +  Usage:  GLIBCPP_ENABLE_LONG_LONG[(DEFAULT)]
+dnl GLIBCXX_ENABLE_LONG_LONG
+dnl --enable-long-long defines _GLIBCXX_USE_LONG_LONG
+dnl --disable-long-long leaves _GLIBCXX_USE_LONG_LONG undefined
+dnl  +  Usage:  GLIBCXX_ENABLE_LONG_LONG[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If omitted, it
 dnl       defaults to `no'.
 dnl  +  If 'long long' stuff is not available, ignores DEFAULT and sets `no'.
 dnl
-dnl GLIBCPP_ENABLE_LONG_LONG
-AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
-  define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
+dnl GLIBCXX_ENABLE_LONG_LONG
+AC_DEFUN(GLIBCXX_ENABLE_LONG_LONG, [dnl
+  define([GLIBCXX_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
 
   AC_ARG_ENABLE(long-long,
   changequote(<<, >>)dnl
-  <<--enable-long-long      turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
+  <<--enable-long-long      turns on 'long long' [default=>>GLIBCXX_ENABLE_LONG_LONG_DEFAULT],
   changequote([, ])dnl
   [case "$enableval" in
    yes) enable_long_long=yes ;;
    no)  enable_long_long=no ;;
    *)   AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;;
    esac],
-  enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl
+  enable_long_long=GLIBCXX_ENABLE_LONG_LONG_DEFAULT)dnl
 
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -1726,7 +1726,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
 
   # Option parsed, now set things appropriately
   if test x"$enable_long_long" = xyes; then
-    AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
+    AC_DEFINE(_GLIBCXX_USE_LONG_LONG)
   fi
   AC_MSG_RESULT($enable_long_long)
 
@@ -1737,18 +1737,18 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
 dnl
 dnl Check for what type of C headers to use.
 dnl
-dnl GLIBCPP_ENABLE_CHEADERS
+dnl GLIBCXX_ENABLE_CHEADERS
 dnl --enable-cheaders= [does stuff].
 dnl --disable-cheaders [does not do anything, really].
-dnl  +  Usage:  GLIBCPP_ENABLE_CHEADERS[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_CHEADERS[(DEFAULT)]
 dnl       Where DEFAULT is either `c' or `c_std'.
 dnl       If ommitted, it defaults to `c_std'.
-AC_DEFUN(GLIBCPP_ENABLE_CHEADERS, [dnl
-define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
+AC_DEFUN(GLIBCXX_ENABLE_CHEADERS, [dnl
+define([GLIBCXX_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
 AC_MSG_CHECKING([for c header strategy to use])
 AC_ARG_ENABLE(cheaders,
 changequote(<<, >>)dnl
-<<  --enable-cheaders=MODEL       construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
+<<  --enable-cheaders=MODEL       construct "C" header files for g++ [default=>>GLIBCXX_ENABLE_CHEADERS_DEFAULT],
 changequote([, ])
   [case "$enableval" in
    c)
@@ -1760,23 +1760,23 @@ changequote([, ])
    *)   AC_MSG_ERROR([Unknown argument to enable/disable "C" headers])
         ;;
   esac],
-  enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
+  enable_cheaders=GLIBCXX_ENABLE_CHEADERS_DEFAULT)
   AC_MSG_RESULT($enable_cheaders)
 
   dnl Option parsed, now set things appropriately
   case "$enable_cheaders" in
     c_std)
-        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
+        C_INCLUDE_DIR='${glibcxx_srcdir}/include/c_std'
         ;;
     c)
-        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
+        C_INCLUDE_DIR='${glibcxx_srcdir}/include/c'
         ;;
   esac
 
   AC_SUBST(C_INCLUDE_DIR)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_C, test "$enable_cheaders" = c)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_C_STD, test "$enable_cheaders" = c_std)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_COMPATIBILITY, test "$c_compatibility" = yes)
+  AM_CONDITIONAL(GLIBCXX_C_HEADERS_C, test "$enable_cheaders" = c)
+  AM_CONDITIONAL(GLIBCXX_C_HEADERS_C_STD, test "$enable_cheaders" = c_std)
+  AM_CONDITIONAL(GLIBCXX_C_HEADERS_COMPATIBILITY, test "$c_compatibility" = yes)
 ])
 
 
@@ -1784,24 +1784,24 @@ dnl
 dnl Check for wide character support.  Has the same effect as the option
 dnl in gcc's configure, but in a form that autoconf can mess with.
 dnl
-dnl GLIBCPP_ENABLE_C_MBCHAR
+dnl GLIBCXX_ENABLE_C_MBCHAR
 dnl --enable-c-mbchar requests all the wchar_t stuff.
 dnl --disable-c-mbchar doesn't.
-dnl  +  Usage:  GLIBCPP_ENABLE_C_MBCHAR[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_C_MBCHAR[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_C_MBCHAR, [dnl
-define([GLIBCPP_ENABLE_C_MBCHAR_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_C_MBCHAR, [dnl
+define([GLIBCXX_ENABLE_C_MBCHAR_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(c-mbchar,
 changequote(<<, >>)dnl
-<<  --enable-c-mbchar       enable multibyte (wide) characters [default=>>GLIBCPP_ENABLE_C_MBCHAR_DEFAULT],
+<<  --enable-c-mbchar       enable multibyte (wide) characters [default=>>GLIBCXX_ENABLE_C_MBCHAR_DEFAULT],
 changequote([, ])dnl
 [case "$enableval" in
  yes) enable_c_mbchar=yes ;;
  no)  enable_c_mbchar=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable c-mbchar]) ;;
  esac],
-enable_c_mbchar=GLIBCPP_ENABLE_C_MBCHAR_DEFAULT)dnl
+enable_c_mbchar=GLIBCXX_ENABLE_C_MBCHAR_DEFAULT)dnl
 dnl Option parsed, now other scripts can test enable_c_mbchar for yes/no.
 ])
 
@@ -1813,10 +1813,10 @@ dnl TOPLEVEL_INCLUDES
 dnl LIBMATH_INCLUDES
 dnl LIBSUPCXX_INCLUDES
 dnl
-dnl GLIBCPP_EXPORT_INCLUDES
-AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
+dnl GLIBCXX_EXPORT_INCLUDES
+AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
+  GLIBCXX_INCLUDES="-I${glibcxx_builddir}/include/${target_alias} -I${glibcxx_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then
@@ -1828,7 +1828,7 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
   LIBSUPCXX_INCLUDES='-I$(top_srcdir)/libsupc++'
 
   # Now, export this to all the little Makefiles....
-  AC_SUBST(GLIBCPP_INCLUDES)
+  AC_SUBST(GLIBCXX_INCLUDES)
   AC_SUBST(TOPLEVEL_INCLUDES)
   AC_SUBST(LIBMATH_INCLUDES)
   AC_SUBST(LIBSUPCXX_INCLUDES)
@@ -1838,7 +1838,7 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
 dnl
 dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
 dnl
-AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
+AC_DEFUN(GLIBCXX_EXPORT_FLAGS, [
   # Optimization flags that are probably a good idea for thrill-seekers. Just
   # uncomment the lines below and make, everything else is ready to go...
   # OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
@@ -1850,22 +1850,22 @@ AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
 ])
 
 dnl
-dnl  GLIBCPP_EXPORT_INSTALL_INFO
+dnl  GLIBCXX_EXPORT_INSTALL_INFO
 dnl  calculates gxx_install_dir
-dnl  exports glibcpp_toolexecdir
-dnl  exports glibcpp_toolexeclibdir
-dnl  exports glibcpp_prefixdir
+dnl  exports glibcxx_toolexecdir
+dnl  exports glibcxx_toolexeclibdir
+dnl  exports glibcxx_prefixdir
 dnl
 dnl Assumes cross_compiling bits already done, and with_cross_host in
 dnl particular
 dnl
-dnl GLIBCPP_EXPORT_INSTALL_INFO
-AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [
-# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and
-# exported correctly in GLIBCPP_CONFIGURE.
-glibcpp_toolexecdir=no
-glibcpp_toolexeclibdir=no
-glibcpp_prefixdir=${prefix}
+dnl GLIBCXX_EXPORT_INSTALL_INFO
+AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
+# Assumes glibcxx_builddir, glibcxx_srcdir are alreay set up and
+# exported correctly in GLIBCXX_CONFIGURE.
+glibcxx_toolexecdir=no
+glibcxx_toolexeclibdir=no
+glibcxx_prefixdir=${prefix}
 
 # Process the option --with-gxx-include-dir=<path to include-files directory>
 AC_MSG_CHECKING([for --with-gxx-include-dir])
@@ -1911,35 +1911,35 @@ if test $version_specific_libs = yes; then
   if test x"$gxx_include_dir" = x"no"; then
     gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/c++
   fi
-  glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-  glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
+  glibcxx_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  glibcxx_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
 fi
 
-# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
+# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
-if test x"$glibcpp_toolexecdir" = x"no"; then
+if test x"$glibcxx_toolexecdir" = x"no"; then
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
-    glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
-    glibcpp_toolexeclibdir='$(toolexecdir)/lib'
+    glibcxx_toolexecdir='$(exec_prefix)/$(target_alias)'
+    glibcxx_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-    glibcpp_toolexeclibdir='$(libdir)'
+    glibcxx_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+    glibcxx_toolexeclibdir='$(libdir)'
   fi
   multi_os_directory=`$CC -print-multi-os-directory`
   case $multi_os_directory in
   .) ;; # Avoid trailing /.
-  *) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
+  *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
   esac
 fi
 
 AC_MSG_CHECKING([for install location])
 AC_MSG_RESULT($gxx_include_dir)
 
-AC_SUBST(glibcpp_prefixdir)
+AC_SUBST(glibcxx_prefixdir)
 AC_SUBST(gxx_include_dir)
-AC_SUBST(glibcpp_toolexecdir)
-AC_SUBST(glibcpp_toolexeclibdir)
+AC_SUBST(glibcxx_toolexecdir)
+AC_SUBST(glibcxx_toolexeclibdir)
 ])
 
 
@@ -1998,7 +1998,7 @@ dnl @author John Darrington <j.darrington@elvis.murdoch.edu.au>
 dnl @version 1.1 #### replaced Id string now that Id is for lib-v3; pme
 dnl
 dnl #### Changes for libstdc++-v3:  reformatting and linewrapping; prepending
-dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the
+dnl #### GLIBCXX_ to the macro name; adding the :-make fallback in the
 dnl #### conditional's subshell (" --version" is not a command), using a
 dnl #### different option to grep(1).
 dnl #### -pme
@@ -2006,7 +2006,7 @@ dnl #### Fixed Bourne shell portability bug (use ${MAKE-make}, not
 dnl #### ${MAKE:-make}).
 dnl #### -msokolov
 AC_DEFUN(
-  GLIBCPP_CHECK_GNU_MAKE, [AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
+  GLIBCXX_CHECK_GNU_MAKE, [AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
           _cv_gnu_make_command='' ;
 dnl Search all the common names for GNU make
           for a in "${MAKE-make}" make gmake gnumake ; do
@@ -2030,16 +2030,16 @@ dnl string, '#' otherwise
 
 dnl Check for headers for, and arguments to, the setrlimit() function.
 dnl Used only in testsuite_hooks.h.
-AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT_ancilliary, [
+AC_DEFUN(GLIBCXX_CHECK_SETRLIMIT_ancilliary, [
   AC_TRY_COMPILE([#include <unistd.h>
                   #include <sys/time.h>
                   #include <sys/resource.h>
                  ], [ int f = RLIMIT_$1 ; ],
-                 [glibcpp_mresult=1], [glibcpp_mresult=0])
-  AC_DEFINE_UNQUOTED(HAVE_MEMLIMIT_$1, $glibcpp_mresult,
+                 [glibcxx_mresult=1], [glibcxx_mresult=0])
+  AC_DEFINE_UNQUOTED(HAVE_MEMLIMIT_$1, $glibcxx_mresult,
                      [Only used in build directory testsuite_hooks.h.])
 ])
-AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
+AC_DEFUN(GLIBCXX_CHECK_SETRLIMIT, [
   setrlimit_have_headers=yes
   AC_CHECK_HEADERS(unistd.h sys/time.h sys/resource.h,
                    [],
@@ -2048,10 +2048,10 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
   # won't be seeing any of these during testsuite compilation.
   if test $setrlimit_have_headers = yes; then
     # Can't do these in a loop, else the resulting syntax is wrong.
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(DATA)
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(RSS)
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(VMEM)
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(AS)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(DATA)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(RSS)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(VMEM)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(AS)
 
     # Check for rlimit, setrlimit.
     AC_CACHE_VAL(ac_setrlimit, [
@@ -2067,7 +2067,7 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
   AC_MSG_CHECKING([for testsuite memory limit support])
   if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
     ac_mem_limits=yes
-    AC_DEFINE(_GLIBCPP_MEM_LIMITS)
+    AC_DEFINE(_GLIBCXX_MEM_LIMITS)
   else
     ac_mem_limits=no
   fi
@@ -2079,19 +2079,19 @@ dnl
 dnl Does any necessary configuration of the testsuite directory.  Generates
 dnl the testsuite_hooks.h header.
 dnl
-dnl GLIBCPP_CONFIGURE_TESTSUITE  [no args]
-AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
+dnl GLIBCXX_CONFIGURE_TESTSUITE  [no args]
+AC_DEFUN(GLIBCXX_CONFIGURE_TESTSUITE, [
 
-  if test  x"$GLIBCPP_IS_CROSS_COMPILING" = xfalse; then
+  if test  x"$GLIBCXX_IS_CROSS_COMPILING" = xfalse; then
     # Do checks for memory limit functions.
-    GLIBCPP_CHECK_SETRLIMIT
+    GLIBCXX_CHECK_SETRLIMIT
 
     # Look for setenv, so that extended locale tests can be performed.
-    GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
+    GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
   fi
 
   # Export file names for ABI checking.
-  baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
+  baseline_dir="${glibcxx_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
   AC_SUBST(baseline_dir)
 
   # Determine if checking the ABI is desirable.
@@ -2106,8 +2106,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
     esac
   fi
 
-  AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes)	
-  AM_CONDITIONAL(GLIBCPP_TEST_ABI, test "$enable_abi_check" = yes)
+  AM_CONDITIONAL(GLIBCXX_TEST_WCHAR_T, test "$enable_wchar_t" = yes)	
+  AM_CONDITIONAL(GLIBCXX_TEST_ABI, test "$enable_abi_check" = yes)
 ])
 
 
@@ -2125,22 +2125,22 @@ dnl
 dnl Check whether S_ISREG (Posix) or S_IFREG is available in <sys/stat.h>.
 dnl
 
-AC_DEFUN(GLIBCPP_CHECK_S_ISREG_OR_S_IFREG, [
-  AC_CACHE_VAL(glibcpp_cv_S_ISREG, [
+AC_DEFUN(GLIBCXX_CHECK_S_ISREG_OR_S_IFREG, [
+  AC_CACHE_VAL(glibcxx_cv_S_ISREG, [
     AC_TRY_LINK([#include <sys/stat.h>],
                 [struct stat buffer; fstat(0, &buffer); S_ISREG(buffer.st_mode); ],
-                [glibcpp_cv_S_ISREG=yes],
-                [glibcpp_cv_S_ISREG=no])
+                [glibcxx_cv_S_ISREG=yes],
+                [glibcxx_cv_S_ISREG=no])
   ])
-  AC_CACHE_VAL(glibcpp_cv_S_IFREG, [
+  AC_CACHE_VAL(glibcxx_cv_S_IFREG, [
     AC_TRY_LINK([#include <sys/stat.h>],
                 [struct stat buffer; fstat(0, &buffer); S_IFREG & buffer.st_mode; ],
-                [glibcpp_cv_S_IFREG=yes],
-                [glibcpp_cv_S_IFREG=no])
+                [glibcxx_cv_S_IFREG=yes],
+                [glibcxx_cv_S_IFREG=no])
   ])
-  if test x$glibcpp_cv_S_ISREG = xyes; then
+  if test x$glibcxx_cv_S_ISREG = xyes; then
     AC_DEFINE(HAVE_S_ISREG)
-  elif test x$glibcpp_cv_S_IFREG = xyes; then
+  elif test x$glibcxx_cv_S_IFREG = xyes; then
     AC_DEFINE(HAVE_S_IFREG)
   fi
 ])
@@ -2149,14 +2149,14 @@ dnl
 dnl Check whether poll is available in <poll.h>.
 dnl
 
-AC_DEFUN(GLIBCPP_CHECK_POLL, [
-  AC_CACHE_VAL(glibcpp_cv_POLL, [
+AC_DEFUN(GLIBCXX_CHECK_POLL, [
+  AC_CACHE_VAL(glibcxx_cv_POLL, [
     AC_TRY_COMPILE([#include <poll.h>],
                 [struct pollfd pfd[1]; pfd[0].events = POLLIN; poll(pfd, 1, 0); ],
-                [glibcpp_cv_POLL=yes],
-                [glibcpp_cv_POLL=no])
+                [glibcxx_cv_POLL=yes],
+                [glibcxx_cv_POLL=no])
   ])
-  if test x$glibcpp_cv_POLL = xyes; then
+  if test x$glibcxx_cv_POLL = xyes; then
     AC_DEFINE(HAVE_POLL)
   fi
 ])
@@ -2186,27 +2186,27 @@ AC_DEFUN(AC_LC_MESSAGES, [
 dnl
 dnl Check for whether the Boost-derived checks should be turned on.
 dnl
-dnl GLIBCPP_ENABLE_CONCEPT_CHECKS
+dnl GLIBCXX_ENABLE_CONCEPT_CHECKS
 dnl --enable-concept-checks turns them on.
 dnl --disable-concept-checks leaves them off.
-dnl  +  Usage:  GLIBCPP_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_CONCEPT_CHECKS, [dnl
-define([GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_CONCEPT_CHECKS, [dnl
+define([GLIBCXX_ENABLE_CONCEPT_CHECKS_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(concept-checks,
 changequote(<<, >>)dnl
-<<  --enable-concept-checks use Boost-derived template checks [default=>>GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT],
+<<  --enable-concept-checks use Boost-derived template checks [default=>>GLIBCXX_ENABLE_CONCEPT_CHECKS_DEFAULT],
 changequote([, ])dnl
 [case "$enableval" in
  yes) enable_concept_checks=yes ;;
  no)  enable_concept_checks=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable concept checks]) ;;
  esac],
-enable_concept_checks=GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT)dnl
+enable_concept_checks=GLIBCXX_ENABLE_CONCEPT_CHECKS_DEFAULT)dnl
 dnl Option parsed, now set things appropriately
 if test x"$enable_concept_checks" = xyes; then
-  AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS)
+  AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS)
 fi
 ])
 
@@ -2215,20 +2215,20 @@ dnl
 dnl Add version tags to symbols in shared library (or not), additionally
 dnl marking other symbols as private/local (or not).
 dnl
-dnl GLIBCPP_ENABLE_SYMVERS
+dnl GLIBCXX_ENABLE_SYMVERS
 dnl --enable-symvers=style adds a version script to the linker call when
 dnl       creating the shared library.  The choice of version script is
 dnl       controlled by 'style'.
 dnl --disable-symvers does not.
-dnl  +  Usage:  GLIBCPP_ENABLE_SYMVERS[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_SYMVERS[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.  Passing `yes' tries to choose a default style
 dnl       based on linker characteristics.  Passing 'no' disables versioning.
-AC_DEFUN(GLIBCPP_ENABLE_SYMVERS, [dnl
-define([GLIBCPP_ENABLE_SYMVERS_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_SYMVERS, [dnl
+define([GLIBCXX_ENABLE_SYMVERS_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(symvers,
 changequote(<<, >>)dnl
-<<  --enable-symvers=style  enables symbol versioning of the shared library [default=>>GLIBCPP_ENABLE_SYMVERS_DEFAULT],
+<<  --enable-symvers=style  enables symbol versioning of the shared library [default=>>GLIBCXX_ENABLE_SYMVERS_DEFAULT],
 changequote([, ])dnl
 [case "$enableval" in
  yes) enable_symvers=yes ;;
@@ -2238,13 +2238,13 @@ changequote([, ])dnl
  gnu) enable_symvers=$enableval ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable symvers]) ;;
  esac],
-enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl
+enable_symvers=GLIBCXX_ENABLE_SYMVERS_DEFAULT)dnl
 
-# If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we
+# If we never went through the GLIBCXX_CHECK_LINKER_FEATURES macro, then we
 # don't know enough about $LD to do tricks...
 if test x$enable_shared = xno ||
 	test "x$LD" = x ||
-	test x$glibcpp_gnu_ld_version = x; then
+	test x$glibcxx_gnu_ld_version = x; then
   enable_symvers=no
 fi
 
@@ -2253,22 +2253,22 @@ if test $enable_symvers != no; then
   AC_MSG_CHECKING([for shared libgcc])
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=' -lgcc_s'
-  AC_TRY_LINK(, [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no)
+  AC_TRY_LINK(, [return 0], glibcxx_shared_libgcc=yes, glibcxx_shared_libgcc=no)
   CFLAGS="$ac_save_CFLAGS"
-  AC_MSG_RESULT($glibcpp_shared_libgcc)
+  AC_MSG_RESULT($glibcxx_shared_libgcc)
 fi
 
 # For GNU ld, we need at least this version.  It's 2.12 in the same format
-# as the tested-for version.  See GLIBCPP_CHECK_LINKER_FEATURES for more.
-glibcpp_min_gnu_ld_version=21200
+# as the tested-for version.  See GLIBCXX_CHECK_LINKER_FEATURES for more.
+glibcxx_min_gnu_ld_version=21200
 
 # Check to see if unspecified "yes" value can win, given results
 # above.
 if test $enable_symvers = yes ; then
   if test $with_gnu_ld = yes &&
-    test $glibcpp_shared_libgcc = yes ;
+    test $glibcxx_shared_libgcc = yes ;
   then
-    if test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version ; then
+    if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
         enable_symvers=gnu
     else
       ac_test_CFLAGS="${CFLAGS+set}"
@@ -2300,12 +2300,12 @@ case $enable_symvers in
       ;;
   gnu)
       SYMVER_MAP=config/linker-map.gnu
-      AC_DEFINE(_GLIBCPP_SYMVER)
+      AC_DEFINE(_GLIBCXX_SYMVER)
       ;;
 esac
 
 AC_SUBST(SYMVER_MAP)
-AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
+AM_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
 AC_MSG_CHECKING([versioning on shared library symbols])
 AC_MSG_RESULT($enable_symvers)
 ])
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 07e590a2e37..1a5563ce0bc 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -13,8 +13,8 @@ dnl PARTICULAR PURPOSE.
 dnl
 dnl Initialize basic configure bits, set toplevel_srcdir for Makefiles.
 dnl
-dnl GLIBCPP_TOPREL_CONFIGURE
-AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
+dnl GLIBCXX_TOPREL_CONFIGURE
+AC_DEFUN(GLIBCXX_TOPREL_CONFIGURE, [
   dnl Default to --enable-multilib (this is also passed by default
   dnl from the ubercommon-top-level configure)
   AC_ARG_ENABLE(multilib,
@@ -51,19 +51,19 @@ AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
 dnl
 dnl Initialize the rest of the library configury.
 dnl
-dnl GLIBCPP_CONFIGURE
-AC_DEFUN(GLIBCPP_CONFIGURE, [
+dnl GLIBCXX_CONFIGURE
+AC_DEFUN(GLIBCXX_CONFIGURE, [
   # Export build and source directories.
   # These need to be absolute paths, yet at the same time need to
   # canonicalize only relative paths, because then amd will not unmount
   # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
-  glibcpp_builddir=`${PWDCMD-pwd}`
+  glibcxx_builddir=`${PWDCMD-pwd}`
   case $srcdir in
-  [\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
-  *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+  [\\/$]* | ?:[\\/]*) glibcxx_srcdir=${srcdir} ;;
+  *) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
   esac
-  AC_SUBST(glibcpp_builddir)
-  AC_SUBST(glibcpp_srcdir)
+  AC_SUBST(glibcxx_builddir)
+  AC_SUBST(glibcxx_srcdir)
 
   dnl This is here just to satisfy automake.
   ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
@@ -85,8 +85,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   AC_ARG_WITH(newlib,
   [  --with-newlib                    Configuring with newlib])
 
-  glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
-  AC_SUBST(glibcpp_basedir)
+  glibcxx_basedir=$srcdir/$toprel/$1/libstdc++-v3
+  AC_SUBST(glibcxx_basedir)
 
   # Never versions of autoconf add an underscore to these functions.
   # Prevent future problems ...
@@ -143,15 +143,15 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
   [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
   dnl Fool anybody using AC_PROG_CXX.
   AC_PROVIDE([AC_PROG_CXX])
-  # Use glibcpp_CXX so that we do not cause CXX to be cached with the
+  # Use glibcxx_CXX so that we do not cause CXX to be cached with the
   # flags that come in CXX while configuring libstdc++.  They're different
   # from those used for all other target libraries.  If CXX is set in
   # the environment, respect that here.
-  glibcpp_CXX=$CXX
-  AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
-  AC_SUBST(glibcpp_CXX)
-  CXX=$glibcpp_CXX
-  test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
+  glibcxx_CXX=$CXX
+  AC_CHECK_PROGS(glibcxx_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
+  AC_SUBST(glibcxx_CXX)
+  CXX=$glibcxx_CXX
+  test -z "$glibcxx_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
 
   AC_PROG_CXX_GNU
 
@@ -181,7 +181,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
 
   # For directory versioning (e.g., headers) and other variables.
   AC_MSG_CHECKING([for GCC version number])
-  gcc_version=`$glibcpp_CXX -dumpversion`
+  gcc_version=`$glibcxx_CXX -dumpversion`
   AC_MSG_RESULT($gcc_version)
 
   # For some reason, gettext needs this.
@@ -209,16 +209,16 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
     AC_EXEEXT
   fi
 
-  case [$]{glibcpp_basedir} in
-    /* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcpp_basedir} ;;
-    *) glibcpp_flagbasedir='[$](top_builddir)/'[$]{glibcpp_basedir} ;;
+  case [$]{glibcxx_basedir} in
+    /* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcxx_basedir} ;;
+    *) glibcxx_flagbasedir='[$](top_builddir)/'[$]{glibcxx_basedir} ;;
   esac
 
   # Set up safe default values for all subsequent AM_CONDITIONAL tests.
   need_libmath=no
   enable_wchar_t=no
   #enable_debug=no
-  #glibcpp_pch_comp=no
+  #glibcxx_pch_comp=no
   #enable_cheaders=c
   #c_compatibility=no
   #enable_abi_check=no
@@ -226,7 +226,7 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
 
   # Find platform-specific directories containing configuration info.  In
   # addition to possibly modifying the same flags, it also sets up symlinks.
-  GLIBCPP_CHECK_HOST
+  GLIBCXX_CHECK_HOST
 ])
 
 
@@ -234,8 +234,8 @@ dnl
 dnl Check to see if g++ can compile this library, and if so, if any version-
 dnl specific precautions need to be taken.
 dnl
-dnl GLIBCPP_CHECK_COMPILER_VERSION
-AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
+dnl GLIBCXX_CHECK_COMPILER_VERSION
+AC_DEFUN(GLIBCXX_CHECK_COMPILER_VERSION, [
 if test ! -f stamp-sanity-compiler; then
   AC_MSG_CHECKING([for g++ that will successfully compile libstdc++-v3])
   AC_LANG_SAVE
@@ -264,11 +264,11 @@ dnl
 dnl Define SECTION_FLAGS='-ffunction-sections -fdata-sections' if
 dnl compiler supports it and the user has not requested debug mode.
 dnl
-dnl GLIBCPP_CHECK_COMPILER_FEATURES
-AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [
+dnl GLIBCXX_CHECK_COMPILER_FEATURES
+AC_DEFUN(GLIBCXX_CHECK_COMPILER_FEATURES, [
   # All these tests are for C++; save the language and the compiler flags.
   # The CXXFLAGS thing is suspicious, but based on similar bits previously
-  # found in GLIBCPP_CONFIGURE.
+  # found in GLIBCXX_CONFIGURE.
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
@@ -310,11 +310,11 @@ dnl safe (like an empty string).
 dnl
 dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible.
 dnl Define OPT_LDFLAGS='-Wl,-O1' if possible.
-dnl Define LD, with_gnu_ld, and (possibly) glibcpp_gnu_ld_version as
+dnl Define LD, with_gnu_ld, and (possibly) glibcxx_gnu_ld_version as
 dnl side-effects of testing.
 dnl
-dnl GLIBCPP_CHECK_LINKER_FEATURES
-AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
+dnl GLIBCXX_CHECK_LINKER_FEATURES
+AC_DEFUN(GLIBCXX_CHECK_LINKER_FEATURES, [
   # If we're not using GNU ld, then there's no point in even trying these
   # tests.  Check for that first.  We should have already tested for gld
   # by now (in libtool), but require it now just to be safe...
@@ -343,7 +343,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   changequote([,])
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'`
 
   # Set --gc-sections.
@@ -399,11 +399,11 @@ dnl Check to see if the (math function) argument passed is
 dnl declared when using the c++ compiler
 dnl ASSUMES argument is a math function with ONE parameter
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_1
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
+dnl GLIBCXX_CHECK_MATH_DECL_1
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_1, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>
@@ -412,11 +412,11 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
 		      #endif
 		     ],
                      [ $1(0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
 ])
 
 dnl
@@ -431,14 +431,14 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with ONE parameter
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
-  GLIBCPP_CHECK_MATH_DECL_1($1)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+dnl GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1, [
+  GLIBCXX_CHECK_MATH_DECL_1($1)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   else
-    GLIBCPP_CHECK_MATH_DECL_1(_$1)
-    if test x$glibcpp_cv_func__$1_use = x"yes"; then
+    GLIBCXX_CHECK_MATH_DECL_1(_$1)
+    if test x$glibcxx_cv_func__$1_use = x"yes"; then
       AC_CHECK_FUNCS(_$1)
     fi
   fi
@@ -446,22 +446,22 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
 
 
 dnl
-dnl Like GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of
+dnl Like GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of
 dnl of functions at once.  It's an all-or-nothing check -- either
 dnl HAVE_XYZ is defined for each of the functions, or for none of them.
 dnl Doing it this way saves significant configure time.
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1, [
   AC_MSG_CHECKING([for $1 functions])
-  AC_CACHE_VAL(glibcpp_cv_func_$2_use, [
+  AC_CACHE_VAL(glibcxx_cv_func_$2_use, [
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
     AC_TRY_COMPILE([#include <math.h>],
                    [ `for x in $3; do echo "$x (0);"; done` ],
-                   [glibcpp_cv_func_$2_use=yes],
-                   [glibcpp_cv_func_$2_use=no])
+                   [glibcxx_cv_func_$2_use=yes],
+                   [glibcxx_cv_func_$2_use=no])
     AC_LANG_RESTORE])
-  AC_MSG_RESULT($glibcpp_cv_func_$2_use)
-  if test x$glibcpp_cv_func_$2_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$2_use)
+  if test x$glibcxx_cv_func_$2_use = x"yes"; then
     AC_CHECK_FUNCS($3)
   fi
 ])
@@ -471,20 +471,20 @@ dnl Check to see if the (math function) argument passed is
 dnl declared when using the c++ compiler
 dnl ASSUMES argument is a math function with TWO parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_2
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [
+dnl GLIBCXX_CHECK_MATH_DECL_2
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_2, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>],
                      [ $1(0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
 ])
 
 dnl
@@ -498,14 +498,14 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with TWO parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
-  GLIBCPP_CHECK_MATH_DECL_2($1)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+dnl GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2, [
+  GLIBCXX_CHECK_MATH_DECL_2($1)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   else
-    GLIBCPP_CHECK_MATH_DECL_2(_$1)
-    if test x$glibcpp_cv_func__$1_use = x"yes"; then
+    GLIBCXX_CHECK_MATH_DECL_2(_$1)
+    if test x$glibcxx_cv_func__$1_use = x"yes"; then
       AC_CHECK_FUNCS(_$1)
     fi
   fi
@@ -517,20 +517,20 @@ dnl Check to see if the (math function) argument passed is
 dnl declared when using the c++ compiler
 dnl ASSUMES argument is a math function with THREE parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_3
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [
+dnl GLIBCXX_CHECK_MATH_DECL_3
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_3, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>],
                      [ $1(0, 0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
 ])
 
 dnl
@@ -544,14 +544,14 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with THREE parameters
 dnl
-dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
-AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
-  GLIBCPP_CHECK_MATH_DECL_3($1)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+dnl GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3
+AC_DEFUN(GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3, [
+  GLIBCXX_CHECK_MATH_DECL_3($1)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   else
-    GLIBCPP_CHECK_MATH_DECL_3(_$1)
-    if test x$glibcpp_cv_func__$1_use = x"yes"; then
+    GLIBCXX_CHECK_MATH_DECL_3(_$1)
+    if test x$glibcxx_cv_func__$1_use = x"yes"; then
       AC_CHECK_FUNCS(_$1)
     fi
   fi
@@ -567,21 +567,21 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with TWO parameters
 dnl
-dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
-AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
+dnl GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2
+AC_DEFUN(GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <stdlib.h>],
                      [ $1(0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   fi
 ])
@@ -596,21 +596,21 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a function with THREE parameters
 dnl
-dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3
-AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [
+dnl GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3
+AC_DEFUN(GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <stdlib.h>],
                      [ $1(0, 0, 0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_CHECK_FUNCS($1)
   fi
 ])
@@ -628,31 +628,31 @@ dnl argument 1 is name of function to check
 dnl
 dnl ASSUMES argument is a math function with ONE parameter
 dnl
-dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
-AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
+dnl GLIBCXX_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
+AC_DEFUN(GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
   AC_MSG_CHECKING([for $1 declaration])
-  if test x${glibcpp_cv_func_$1_use+set} != xset; then
-    AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
+  if test x${glibcxx_cv_func_$1_use+set} != xset; then
+    AC_CACHE_VAL(glibcxx_cv_func_$1_use, [
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
       AC_TRY_COMPILE([#include <math.h>],
                      [ $1(0);],
-                     [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
+                     [glibcxx_cv_func_$1_use=yes], [glibcxx_cv_func_$1_use=no])
       AC_LANG_RESTORE
     ])
   fi
-  AC_MSG_RESULT($glibcpp_cv_func_$1_use)
-  if test x$glibcpp_cv_func_$1_use = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_func_$1_use)
+  if test x$glibcxx_cv_func_$1_use = x"yes"; then
     AC_MSG_CHECKING([for $1 linkage])
-    if test x${glibcpp_cv_func_$1_link+set} != xset; then
-      AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
+    if test x${glibcxx_cv_func_$1_link+set} != xset; then
+      AC_CACHE_VAL(glibcxx_cv_func_$1_link, [
         AC_TRY_LINK([#include <math.h>],
                     [ $1(0);],
-                    [glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
+                    [glibcxx_cv_func_$1_link=yes], [glibcxx_cv_func_$1_link=no])
       ])
     fi
-    AC_MSG_RESULT($glibcpp_cv_func_$1_link)
-    if test x$glibcpp_cv_func_$1_link = x"yes"; then
+    AC_MSG_RESULT($glibcxx_cv_func_$1_link)
+    if test x$glibcxx_cv_func_$1_link = x"yes"; then
       ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       AC_DEFINE_UNQUOTED(${ac_tr_func})
     fi
@@ -678,27 +678,27 @@ dnl check for __builtin_cosf
 dnl check for __builtin_cos
 dnl check for __builtin_cosl
 dnl
-dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
+dnl GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT, [
   dnl Test for builtin math functions.
   dnl These are made in gcc/c-common.c
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_abs)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabs)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsl)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_labs)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_abs)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabs)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_labs)
 
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrt)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrt)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtl)
 
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sin)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sin)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinl)
 
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosf)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cos)
-  GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosl)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosf)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cos)
+  GLIBCXX_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosl)
 
   dnl There is, without a doubt, a more elegant way to have these
   dnl names exported so that they won't be stripped out of acconfig.h by
@@ -736,14 +736,14 @@ dnl Define HAVE_STRTOLD if "strtold" is declared and links
 dnl Define HAVE_STRTOF if "strtof" is declared and links
 dnl Define HAVE_DRAND48 if "drand48" is declared and links
 dnl
-dnl GLIBCPP_CHECK_STDLIB_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [
+dnl GLIBCXX_CHECK_STDLIB_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_STDLIB_SUPPORT, [
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
 
-  GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtold)
-  GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtof)
+  GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtold)
+  GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtof)
   AC_CHECK_FUNCS(drand48)
 
   CXXFLAGS="$ac_save_CXXFLAGS"
@@ -758,8 +758,8 @@ dnl This might seem like overkill but experience has shown that it's not...
 dnl
 dnl Define HAVE_CARGF etc if "cargf" is found.
 dnl
-dnl GLIBCPP_CHECK_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
+dnl GLIBCXX_CHECK_MATH_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_MATH_SUPPORT, [
   ac_test_CXXFLAGS="${CXXFLAGS+set}"
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS='-fno-builtin -D_GNU_SOURCE'
@@ -770,67 +770,67 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   LIBS="$LIBS $libm"
 
   dnl Check to see if certain C math functions exist.
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnan)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finite)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysign)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincos)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fpclass)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(qfpclass)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypot)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnan)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(finite)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(copysign)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3(sincos)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(fpclass)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(qfpclass)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(hypot)
 
   dnl Check to see if basic C math functions have float versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(float trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(float trig,
                                           float_trig,
                                           acosf asinf atanf \
                                           cosf sinf tanf \
                                           coshf sinhf tanhf)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(float round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(float round,
                                           float_round,
                                           ceilf floorf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2f)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10f)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modff)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosf)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(expf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(atan2f)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(fabsf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(fmodf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(frexpf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(hypotf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(logf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(log10f)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(modff)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(powf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3(sincosf)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
 
   dnl Check to see if basic C math functions have long double versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
                                           long_double_trig,
                                           acosl asinl atanl \
                                           cosl sinl tanl \
                                           coshl sinhl tanhl)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
                                           long_double_round,
                                           ceill floorl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
-  GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
+  GLIBCXX_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
 
   dnl Some runtimes have these functions with a preceding underscore. Please
   dnl keep this sync'd with the one above. And if you add any new symbol,
@@ -838,22 +838,22 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
   dnl Check to see if certain C math functions exist.
 
   dnl Check to see if basic C math functions have float versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_float trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_float trig,
                                           _float_trig,
                                           _acosf _asinf _atanf \
                                           _cosf _sinf _tanf \
                                           _coshf _sinhf _tanhf)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_float round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_float round,
                                           _float_round,
                                           _ceilf _floorf)
 
   dnl Check to see if basic C math functions have long double versions.
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double trig,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double trig,
                                           _long_double_trig,
                                           _acosl _asinl _atanl \
                                           _cosl _sinl _tanl \
                                           _coshl _sinhl _tanhl)
-  GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double round,
+  GLIBCXX_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double round,
                                           _long_double_round,
                                           _ceill _floorl)
 
@@ -869,8 +869,8 @@ dnl Don't compile bits in math/* if native support exits.
 dnl
 dnl Define USE_COMPLEX_LONG_DOUBLE etc if "copysignl" is found.
 dnl
-dnl GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
+dnl GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl Check for complex versions of math functions of platform.  This will
   dnl always pass if libm is available, and fail if it isn't.  If it is
   dnl available, we assume we'll need it later, so add it to LIBS.
@@ -884,7 +884,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
   dnl Compile the long double complex functions only if the function
   dnl provides the non-complex long double functions that are needed.
   dnl Currently this includes copysignl, which should be
-  dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above.
+  dnl cached from the GLIBCXX_CHECK_MATH_SUPPORT macro, above.
   if test x$ac_cv_func_copysignl = x"yes"; then
     AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"])
   fi
@@ -900,9 +900,9 @@ dnl Check to see what architecture and operating system we are compiling
 dnl for.  Also, if architecture- or OS-specific flags are required for
 dnl compilation, pick them up here.
 dnl
-dnl GLIBCPP_CHECK_HOST
-AC_DEFUN(GLIBCPP_CHECK_HOST, [
-  . [$]{glibcpp_basedir}/configure.host
+dnl GLIBCXX_CHECK_HOST
+AC_DEFUN(GLIBCXX_CHECK_HOST, [
+  . [$]{glibcxx_basedir}/configure.host
   AC_MSG_RESULT(CPU config directory is $cpu_include_dir)
   AC_MSG_RESULT(OS config directory is $os_include_dir)
 ])
@@ -913,11 +913,11 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
 dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled.  (This
 dnl must have been previously checked.)
 dnl
-dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found
+dnl Define _GLIBCXX_USE_WCHAR_T if all the bits are found
 dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h
 dnl
-dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
-AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
+dnl GLIBCXX_CHECK_WCHAR_T_SUPPORT
+AC_DEFUN(GLIBCXX_CHECK_WCHAR_T_SUPPORT, [
   dnl Wide characters disabled by default.
 
   dnl Test wchar.h for mbstate_t, which is needed for char_traits and
@@ -1011,7 +1011,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
     dnl above support is present.
     if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
-      AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
+      AC_DEFINE(_GLIBCXX_USE_WCHAR_T)
       enable_wchar_t=yes
     fi
   fi
@@ -1023,7 +1023,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
 dnl
 dnl Check to see if debugging libraries are to be built.
 dnl
-dnl GLIBCPP_ENABLE_DEBUG
+dnl GLIBCXX_ENABLE_DEBUG
 dnl
 dnl --enable-libstdcxx-debug
 dnl builds a separate set of debugging libraries in addition to the
@@ -1035,53 +1035,53 @@ dnl
 dnl --enable-libstdcxx-debug-flags=FLAGS
 dnl iff --enable-debug == yes, then use FLAGS to build the debug library.
 dnl
-dnl  +  Usage:  GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_DEBUG[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
-define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_DEBUG, [dnl
+define([GLIBCXX_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(libstdcxx_debug,
 changequote(<<, >>)dnl
-<<  --enable-libstdcxx-debug          build extra debug library [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
+<<  --enable-libstdcxx-debug          build extra debug library [default=>>GLIBCXX_ENABLE_DEBUG_DEFAULT],
 changequote([, ])dnl
 [case "${enableval}" in
  yes) enable_libstdcxx_debug=yes ;;
  no)  enable_libstdcxx_debug=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
  esac],
-enable_libstdcxx_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
+enable_libstdcxx_debug=GLIBCXX_ENABLE_DEBUG_DEFAULT)dnl
 AC_MSG_CHECKING([for additional debug build])
 AC_MSG_RESULT($enable_libstdcxx_debug)
-AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_libstdcxx_debug" = yes)
+AM_CONDITIONAL(GLIBCXX_BUILD_DEBUG, test "$enable_libstdcxx_debug" = yes)
 ])
 
 
 dnl Check for explicit debug flags.
 dnl
-dnl GLIBCPP_ENABLE_DEBUG_FLAGS
+dnl GLIBCXX_ENABLE_DEBUG_FLAGS
 dnl
 dnl --enable-libstdcxx-debug-flags='-O1'
 dnl is a general method for passing flags to be used when
 dnl building debug libraries with --enable-debug.
 dnl
 dnl --disable-libstdcxx-debug-flags does nothing.
-dnl  +  Usage:  GLIBCPP_ENABLE_DEBUG_FLAGS(default flags)
+dnl  +  Usage:  GLIBCXX_ENABLE_DEBUG_FLAGS(default flags)
 dnl       If "default flags" is an empty string (or "none"), the effect is
 dnl       the same as --disable or --enable=no.
-AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl
-define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
+AC_DEFUN(GLIBCXX_ENABLE_DEBUG_FLAGS, [dnl
+define([GLIBCXX_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
 AC_ARG_ENABLE(libstdcxx_debug_flags,
 changequote(<<, >>)dnl
 <<  --enable-libstdcxx-debug-flags=FLAGS    pass compiler FLAGS when building 
                                             debug library;
-                                [default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT],
+                                [default=>>GLIBCXX_ENABLE_DEBUG_FLAGS_DEFAULT],
 changequote([, ])dnl
 [case "${enableval}" in
  none)  ;;
  -*) enable_libstdcxx_debug_flags="${enableval}" ;;
  *)   AC_MSG_ERROR([Unknown argument to extra debugging flags]) ;;
  esac],
-enable_libstdcxx_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
+enable_libstdcxx_debug_flags=GLIBCXX_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
 
 dnl Option parsed, now set things appropriately
 case x"$enable_libstdcxx_debug" in
@@ -1107,7 +1107,7 @@ AC_MSG_RESULT($DEBUG_FLAGS)
 dnl
 dnl Check for "unusual" flags to pass to the compiler while building.
 dnl
-dnl GLIBCPP_ENABLE_CXX_FLAGS
+dnl GLIBCXX_ENABLE_CXX_FLAGS
 dnl --enable-cxx-flags='-foo -bar -baz' is a general method for passing
 dnl     experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc.
 dnl     Somehow this same set of flags must be passed when [re]building
@@ -1116,16 +1116,16 @@ dnl --disable-cxx-flags passes nothing.
 dnl  +  See http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00131.html
 dnl         http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00284.html
 dnl         http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00035.html
-dnl  +  Usage:  GLIBCPP_ENABLE_CXX_FLAGS(default flags)
+dnl  +  Usage:  GLIBCXX_ENABLE_CXX_FLAGS(default flags)
 dnl       If "default flags" is an empty string (or "none"), the effect is
 dnl       the same as --disable or --enable=no.
-AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
-define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
+AC_DEFUN(GLIBCXX_ENABLE_CXX_FLAGS, [dnl
+define([GLIBCXX_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
 AC_MSG_CHECKING([for extra compiler flags for building])
 AC_ARG_ENABLE(cxx_flags,
 changequote(<<, >>)dnl
 <<  --enable-cxx-flags=FLAGS     pass compiler FLAGS when building library;
-                                  [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
+                                  [default=>>GLIBCXX_ENABLE_CXX_FLAGS_DEFAULT],
 changequote([, ])dnl
 [case "x$enable_cxx_flags" in
   xyes)
@@ -1135,7 +1135,7 @@ changequote([, ])dnl
   *)
     enable_cxx_flags="$enableval" ;;
 esac],
-enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT)
+enable_cxx_flags=GLIBCXX_ENABLE_CXX_FLAGS_DEFAULT)
 
 dnl Run through flags (either default or command-line) and set anything
 dnl extra (e.g., #defines) that must accompany particular g++ options.
@@ -1158,13 +1158,13 @@ AC_SUBST(EXTRA_CXX_FLAGS)
 dnl
 dnl Check for which locale library to use:  gnu or generic.
 dnl
-dnl GLIBCPP_ENABLE_CLOCALE
+dnl GLIBCXX_ENABLE_CLOCALE
 dnl --enable-clocale=gnu sets config/locale/c_locale_gnu.cc and friends
 dnl --enable-clocale=generic sets config/locale/c_locale_generic.cc and friends
 dnl
 dnl default is generic
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
+AC_DEFUN(GLIBCXX_ENABLE_CLOCALE, [
   AC_MSG_CHECKING([for clocale to use])
   AC_ARG_ENABLE(clocale,
   [  --enable-clocale        enable model for target locale package.
@@ -1182,10 +1182,10 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
   if test x$enable_clocale_flag = xno; then
     case x${target_os} in
       xlinux* | xgnu*)
-	AC_EGREP_CPP([_GLIBCPP_ok], [
+	AC_EGREP_CPP([_GLIBCXX_ok], [
         #include <features.h>
         #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-          _GLIBCPP_ok
+          _GLIBCXX_ok
         #endif
         ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
 
@@ -1267,11 +1267,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
       fi
       # Export the build objects.
       for ling in $ALL_LINGUAS; do \
-        glibcpp_MOFILES="$glibcpp_MOFILES $ling.mo"; \
-        glibcpp_POFILES="$glibcpp_POFILES $ling.po"; \
+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
       done
-      AC_SUBST(glibcpp_MOFILES)
-      AC_SUBST(glibcpp_POFILES)
+      AC_SUBST(glibcxx_MOFILES)
+      AC_SUBST(glibcxx_POFILES)
 
       CLOCALE_H=config/locale/gnu/c_locale.h
       CLOCALE_CC=config/locale/gnu/c_locale.cc
@@ -1312,8 +1312,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 
   # This is where the testsuite looks for locale catalogs, using the
   # -DLOCALEDIR define during testsuite compilation.
-  glibcpp_localedir=${glibcpp_builddir}/po/share/locale
-  AC_SUBST(glibcpp_localedir)
+  glibcxx_localedir=${glibcxx_builddir}/po/share/locale
+  AC_SUBST(glibcxx_localedir)
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
   if test $USE_NLS = yes; then
@@ -1321,7 +1321,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
     AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
   fi
   if test $USE_NLS = yes; then
-    AC_DEFINE(_GLIBCPP_USE_NLS)
+    AC_DEFINE(_GLIBCXX_USE_NLS)
   fi
 
   AC_SUBST(USE_NLS)
@@ -1344,11 +1344,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 dnl
 dnl Check for which I/O library to use:  stdio, or something specific.
 dnl
-dnl GLIBCPP_ENABLE_CSTDIO
+dnl GLIBCXX_ENABLE_CSTDIO
 dnl
 dnl default is stdio
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
+AC_DEFUN(GLIBCXX_ENABLE_CSTDIO, [
   AC_MSG_CHECKING([for cstdio to use])
   AC_ARG_ENABLE(cstdio,
   [  --enable-cstdio         enable stdio for target io package.
@@ -1389,7 +1389,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
 dnl
 dnl Check to see if building and using a C++ precompiled header can be done.
 dnl
-dnl GLIBCPP_ENABLE_PCH
+dnl GLIBCXX_ENABLE_PCH
 dnl
 dnl --enable-libstdcxx-pch=yes
 dnl default, this shows intent to use stdc++.h.gch If it looks like it
@@ -1399,18 +1399,18 @@ dnl
 dnl --disable-libstdcxx-pch
 dnl turns off attempts to use or build stdc++.h.gch.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_PCH, [dnl
-define([GLIBCPP_ENABLE_PCH_DEFAULT], ifelse($1,,, $1))dnl
+AC_DEFUN(GLIBCXX_ENABLE_PCH, [dnl
+define([GLIBCXX_ENABLE_PCH_DEFAULT], ifelse($1,,, $1))dnl
 AC_ARG_ENABLE(libstdcxx_pch,
 changequote(<<, >>)dnl
-<<  --enable-libstdcxx-pch     build pre-compiled libstdc++ includes [default=>>GLIBCPP_ENABLE_PCH_DEFAULT],
+<<  --enable-libstdcxx-pch     build pre-compiled libstdc++ includes [default=>>GLIBCXX_ENABLE_PCH_DEFAULT],
 changequote([, ])dnl
 [case "${enableval}" in
  yes) enable_libstdcxx_pch=yes ;;
  no)  enable_libstdcxx_pch=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable PCH]) ;;
  esac],
-enable_libstdcxx_pch=GLIBCPP_ENABLE_PCH_DEFAULT)dnl
+enable_libstdcxx_pch=GLIBCXX_ENABLE_PCH_DEFAULT)dnl
 
   if test x$enable_libstdcxx_pch = xyes; then
     ac_test_CXXFLAGS="${CXXFLAGS+set}"
@@ -1439,13 +1439,13 @@ enable_libstdcxx_pch=GLIBCPP_ENABLE_PCH_DEFAULT)dnl
   AC_MSG_CHECKING([for enabled PCH])
   AC_MSG_RESULT([$enable_libstdcxx_pch])
 
-  AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$enable_libstdcxx_pch" = yes)
+  AM_CONDITIONAL(GLIBCXX_BUILD_PCH, test "$enable_libstdcxx_pch" = yes)
   if test "$enable_libstdcxx_pch" = yes; then
-	glibcpp_PCHFLAGS="-include bits/stdc++.h"
+	glibcxx_PCHFLAGS="-include bits/stdc++.h"
   else
-	glibcpp_PCHFLAGS=""
+	glibcxx_PCHFLAGS=""
   fi
-  AC_SUBST(glibcpp_PCHFLAGS)
+  AC_SUBST(glibcxx_PCHFLAGS)
 ])
 
 dnl
@@ -1460,18 +1460,18 @@ dnl having to write complex code (the sed commands to clean the macro
 dnl namespace are complex and fragile enough as it is).  We must also
 dnl add a relative path so that -I- is supported properly.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
+AC_DEFUN(GLIBCXX_ENABLE_THREADS, [
   AC_MSG_CHECKING([for thread model used by GCC])
   target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
   AC_MSG_RESULT([$target_thread_file])
 
   if test $target_thread_file != single; then
     AC_DEFINE(HAVE_GTHR_DEFAULT)
-    AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
+    AC_DEFINE(_GLIBCXX_SUPPORTS_WEAK, __GXX_WEAK__)
   fi
 
-  glibcpp_thread_h=gthr-$target_thread_file.h
-  AC_SUBST(glibcpp_thread_h)
+  glibcxx_thread_h=gthr-$target_thread_file.h
+  AC_SUBST(glibcxx_thread_h)
 ])
 
 
@@ -1480,13 +1480,13 @@ dnl Check for exception handling support.  If an explicit enable/disable
 dnl sjlj exceptions is given, we don't have to detect.  Otherwise the
 dnl target may or may not support call frame exceptions.
 dnl
-dnl GLIBCPP_ENABLE_SJLJ_EXCEPTIONS
+dnl GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
 dnl --enable-sjlj-exceptions forces the use of builtin setjmp.
 dnl --disable-sjlj-exceptions forces the use of call frame unwinding.
 dnl
-dnl Define _GLIBCPP_SJLJ_EXCEPTIONS if the compiler is configured for it.
+dnl Define _GLIBCXX_SJLJ_EXCEPTIONS if the compiler is configured for it.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_SJLJ_EXCEPTIONS, [
+AC_DEFUN(GLIBCXX_ENABLE_SJLJ_EXCEPTIONS, [
   AC_MSG_CHECKING([for exception model to use])
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -1522,7 +1522,7 @@ EOF
    CXXFLAGS="$old_CXXFLAGS"
    rm -f conftest*])
    if test x$enable_sjlj_exceptions = xyes; then
-     AC_DEFINE(_GLIBCPP_SJLJ_EXCEPTIONS, 1,
+     AC_DEFINE(_GLIBCXX_SJLJ_EXCEPTIONS, 1,
         [Define if the compiler is configured for setjmp/longjmp exceptions.])
      ac_exception_model_name=sjlj
    elif test x$enable_sjlj_exceptions = xno; then
@@ -1542,13 +1542,13 @@ dnl (_Unwind_RaiseException, _Unwind_Resume, etc.) are defined by
 dnl libunwind instead of libgcc and that libstdc++ has a dependency
 dnl on libunwind as well as libgcc.
 dnl
-dnl GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS
+dnl GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS
 dnl --enable-libunwind-exceptions forces the use of libunwind.
 dnl --disable-libunwind-exceptions assumes there is no libunwind.
 dnl
-dnl Define _GLIBCPP_LIBUNWIND_EXCEPTIONS if requested.
+dnl Define _GLIBCXX_LIBUNWIND_EXCEPTIONS if requested.
 dnl
-AC_DEFUN(GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS, [
+AC_DEFUN(GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS, [
   AC_MSG_CHECKING([for use of libunwind])
   AC_ARG_ENABLE(libunwind-exceptions,
   [  --enable-libunwind-exceptions  force use of libunwind for exceptions],
@@ -1567,28 +1567,28 @@ AC_DEFUN(GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS, [
 dnl
 dnl Check for ISO/IEC 9899:1999 "C99" support.
 dnl
-dnl GLIBCPP_ENABLE_C99
-dnl --enable-c99 defines _GLIBCPP_USE_C99
-dnl --disable-c99 leaves _GLIBCPP_USE_C99 undefined
-dnl  +  Usage:  GLIBCPP_ENABLE_C99[(DEFAULT)]
+dnl GLIBCXX_ENABLE_C99
+dnl --enable-c99 defines _GLIBCXX_USE_C99
+dnl --disable-c99 leaves _GLIBCXX_USE_C99 undefined
+dnl  +  Usage:  GLIBCXX_ENABLE_C99[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If omitted, it
 dnl       defaults to `no'.
 dnl  +  If 'C99' stuff is not available, ignores DEFAULT and sets `no'.
 dnl
-dnl GLIBCPP_ENABLE_C99
-AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
-  define([GLIBCPP_ENABLE_C99_DEFAULT], ifelse($1, yes, yes, no))dnl
+dnl GLIBCXX_ENABLE_C99
+AC_DEFUN(GLIBCXX_ENABLE_C99, [dnl
+  define([GLIBCXX_ENABLE_C99_DEFAULT], ifelse($1, yes, yes, no))dnl
 
   AC_ARG_ENABLE(c99,
   changequote(<<, >>)dnl
-  <<--enable-c99            turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCPP_ENABLE_C99_DEFAULT],
+  <<--enable-c99            turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCXX_ENABLE_C99_DEFAULT],
   changequote([, ])dnl
   [case "$enableval" in
    yes) enable_c99=yes ;;
    no)  enable_c99=no ;;
    *)   AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;;
    esac],
-  enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl
+  enable_c99=GLIBCXX_ENABLE_C99_DEFAULT)dnl
 
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -1691,7 +1691,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
 
   # Option parsed, now set things appropriately
   if test x"$enable_c99" = x"yes"; then
-    AC_DEFINE(_GLIBCPP_USE_C99)
+    AC_DEFINE(_GLIBCXX_USE_C99)
   fi
 
   AC_LANG_RESTORE
@@ -1703,28 +1703,28 @@ dnl Check for template specializations for the 'long long' type extension.
 dnl The result determines only whether 'long long' I/O is enabled; things
 dnl like numeric_limits<> specializations are always available.
 dnl
-dnl GLIBCPP_ENABLE_LONG_LONG
-dnl --enable-long-long defines _GLIBCPP_USE_LONG_LONG
-dnl --disable-long-long leaves _GLIBCPP_USE_LONG_LONG undefined
-dnl  +  Usage:  GLIBCPP_ENABLE_LONG_LONG[(DEFAULT)]
+dnl GLIBCXX_ENABLE_LONG_LONG
+dnl --enable-long-long defines _GLIBCXX_USE_LONG_LONG
+dnl --disable-long-long leaves _GLIBCXX_USE_LONG_LONG undefined
+dnl  +  Usage:  GLIBCXX_ENABLE_LONG_LONG[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If omitted, it
 dnl       defaults to `no'.
 dnl  +  If 'long long' stuff is not available, ignores DEFAULT and sets `no'.
 dnl
-dnl GLIBCPP_ENABLE_LONG_LONG
-AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
-  define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
+dnl GLIBCXX_ENABLE_LONG_LONG
+AC_DEFUN(GLIBCXX_ENABLE_LONG_LONG, [dnl
+  define([GLIBCXX_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
 
   AC_ARG_ENABLE(long-long,
   changequote(<<, >>)dnl
-  <<--enable-long-long      turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
+  <<--enable-long-long      turns on 'long long' [default=>>GLIBCXX_ENABLE_LONG_LONG_DEFAULT],
   changequote([, ])dnl
   [case "$enableval" in
    yes) enable_long_long=yes ;;
    no)  enable_long_long=no ;;
    *)   AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;;
    esac],
-  enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl
+  enable_long_long=GLIBCXX_ENABLE_LONG_LONG_DEFAULT)dnl
 
   AC_LANG_SAVE
   AC_LANG_CPLUSPLUS
@@ -1738,7 +1738,7 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
 
   # Option parsed, now set things appropriately
   if test x"$enable_long_long" = xyes; then
-    AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
+    AC_DEFINE(_GLIBCXX_USE_LONG_LONG)
   fi
   AC_MSG_RESULT($enable_long_long)
 
@@ -1749,18 +1749,18 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
 dnl
 dnl Check for what type of C headers to use.
 dnl
-dnl GLIBCPP_ENABLE_CHEADERS
+dnl GLIBCXX_ENABLE_CHEADERS
 dnl --enable-cheaders= [does stuff].
 dnl --disable-cheaders [does not do anything, really].
-dnl  +  Usage:  GLIBCPP_ENABLE_CHEADERS[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_CHEADERS[(DEFAULT)]
 dnl       Where DEFAULT is either `c' or `c_std'.
 dnl       If ommitted, it defaults to `c_std'.
-AC_DEFUN(GLIBCPP_ENABLE_CHEADERS, [dnl
-define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
+AC_DEFUN(GLIBCXX_ENABLE_CHEADERS, [dnl
+define([GLIBCXX_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
 AC_MSG_CHECKING([for c header strategy to use])
 AC_ARG_ENABLE(cheaders,
 changequote(<<, >>)dnl
-<<  --enable-cheaders=MODEL       construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
+<<  --enable-cheaders=MODEL       construct "C" header files for g++ [default=>>GLIBCXX_ENABLE_CHEADERS_DEFAULT],
 changequote([, ])
   [case "$enableval" in
    c)
@@ -1772,23 +1772,23 @@ changequote([, ])
    *)   AC_MSG_ERROR([Unknown argument to enable/disable "C" headers])
         ;;
   esac],
-  enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
+  enable_cheaders=GLIBCXX_ENABLE_CHEADERS_DEFAULT)
   AC_MSG_RESULT($enable_cheaders)
 
   dnl Option parsed, now set things appropriately
   case "$enable_cheaders" in
     c_std)
-        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
+        C_INCLUDE_DIR='${glibcxx_srcdir}/include/c_std'
         ;;
     c)
-        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
+        C_INCLUDE_DIR='${glibcxx_srcdir}/include/c'
         ;;
   esac
 
   AC_SUBST(C_INCLUDE_DIR)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_C, test "$enable_cheaders" = c)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_C_STD, test "$enable_cheaders" = c_std)
-  AM_CONDITIONAL(GLIBCPP_C_HEADERS_COMPATIBILITY, test "$c_compatibility" = yes)
+  AM_CONDITIONAL(GLIBCXX_C_HEADERS_C, test "$enable_cheaders" = c)
+  AM_CONDITIONAL(GLIBCXX_C_HEADERS_C_STD, test "$enable_cheaders" = c_std)
+  AM_CONDITIONAL(GLIBCXX_C_HEADERS_COMPATIBILITY, test "$c_compatibility" = yes)
 ])
 
 
@@ -1796,24 +1796,24 @@ dnl
 dnl Check for wide character support.  Has the same effect as the option
 dnl in gcc's configure, but in a form that autoconf can mess with.
 dnl
-dnl GLIBCPP_ENABLE_C_MBCHAR
+dnl GLIBCXX_ENABLE_C_MBCHAR
 dnl --enable-c-mbchar requests all the wchar_t stuff.
 dnl --disable-c-mbchar doesn't.
-dnl  +  Usage:  GLIBCPP_ENABLE_C_MBCHAR[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_C_MBCHAR[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_C_MBCHAR, [dnl
-define([GLIBCPP_ENABLE_C_MBCHAR_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_C_MBCHAR, [dnl
+define([GLIBCXX_ENABLE_C_MBCHAR_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(c-mbchar,
 changequote(<<, >>)dnl
-<<  --enable-c-mbchar       enable multibyte (wide) characters [default=>>GLIBCPP_ENABLE_C_MBCHAR_DEFAULT],
+<<  --enable-c-mbchar       enable multibyte (wide) characters [default=>>GLIBCXX_ENABLE_C_MBCHAR_DEFAULT],
 changequote([, ])dnl
 [case "$enableval" in
  yes) enable_c_mbchar=yes ;;
  no)  enable_c_mbchar=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable c-mbchar]) ;;
  esac],
-enable_c_mbchar=GLIBCPP_ENABLE_C_MBCHAR_DEFAULT)dnl
+enable_c_mbchar=GLIBCXX_ENABLE_C_MBCHAR_DEFAULT)dnl
 dnl Option parsed, now other scripts can test enable_c_mbchar for yes/no.
 ])
 
@@ -1825,10 +1825,10 @@ dnl TOPLEVEL_INCLUDES
 dnl LIBMATH_INCLUDES
 dnl LIBSUPCXX_INCLUDES
 dnl
-dnl GLIBCPP_EXPORT_INCLUDES
-AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
+dnl GLIBCXX_EXPORT_INCLUDES
+AC_DEFUN(GLIBCXX_EXPORT_INCLUDES, [
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
+  GLIBCXX_INCLUDES="-I${glibcxx_builddir}/include/${target_alias} -I${glibcxx_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then
@@ -1840,7 +1840,7 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
   LIBSUPCXX_INCLUDES='-I$(top_srcdir)/libsupc++'
 
   # Now, export this to all the little Makefiles....
-  AC_SUBST(GLIBCPP_INCLUDES)
+  AC_SUBST(GLIBCXX_INCLUDES)
   AC_SUBST(TOPLEVEL_INCLUDES)
   AC_SUBST(LIBMATH_INCLUDES)
   AC_SUBST(LIBSUPCXX_INCLUDES)
@@ -1850,7 +1850,7 @@ AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
 dnl
 dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
 dnl
-AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
+AC_DEFUN(GLIBCXX_EXPORT_FLAGS, [
   # Optimization flags that are probably a good idea for thrill-seekers. Just
   # uncomment the lines below and make, everything else is ready to go...
   # OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
@@ -1862,22 +1862,22 @@ AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
 ])
 
 dnl
-dnl  GLIBCPP_EXPORT_INSTALL_INFO
+dnl  GLIBCXX_EXPORT_INSTALL_INFO
 dnl  calculates gxx_install_dir
-dnl  exports glibcpp_toolexecdir
-dnl  exports glibcpp_toolexeclibdir
-dnl  exports glibcpp_prefixdir
+dnl  exports glibcxx_toolexecdir
+dnl  exports glibcxx_toolexeclibdir
+dnl  exports glibcxx_prefixdir
 dnl
 dnl Assumes cross_compiling bits already done, and with_cross_host in
 dnl particular
 dnl
-dnl GLIBCPP_EXPORT_INSTALL_INFO
-AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [
-# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and
-# exported correctly in GLIBCPP_CONFIGURE.
-glibcpp_toolexecdir=no
-glibcpp_toolexeclibdir=no
-glibcpp_prefixdir=${prefix}
+dnl GLIBCXX_EXPORT_INSTALL_INFO
+AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
+# Assumes glibcxx_builddir, glibcxx_srcdir are alreay set up and
+# exported correctly in GLIBCXX_CONFIGURE.
+glibcxx_toolexecdir=no
+glibcxx_toolexeclibdir=no
+glibcxx_prefixdir=${prefix}
 
 # Process the option --with-gxx-include-dir=<path to include-files directory>
 AC_MSG_CHECKING([for --with-gxx-include-dir])
@@ -1923,35 +1923,35 @@ if test $version_specific_libs = yes; then
   if test x"$gxx_include_dir" = x"no"; then
     gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/c++
   fi
-  glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-  glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
+  glibcxx_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  glibcxx_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
 fi
 
-# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
+# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
-if test x"$glibcpp_toolexecdir" = x"no"; then
+if test x"$glibcxx_toolexecdir" = x"no"; then
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
-    glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
-    glibcpp_toolexeclibdir='$(toolexecdir)/lib'
+    glibcxx_toolexecdir='$(exec_prefix)/$(target_alias)'
+    glibcxx_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-    glibcpp_toolexeclibdir='$(libdir)'
+    glibcxx_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+    glibcxx_toolexeclibdir='$(libdir)'
   fi
   multi_os_directory=`$CC -print-multi-os-directory`
   case $multi_os_directory in
   .) ;; # Avoid trailing /.
-  *) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
+  *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
   esac
 fi
 
 AC_MSG_CHECKING([for install location])
 AC_MSG_RESULT($gxx_include_dir)
 
-AC_SUBST(glibcpp_prefixdir)
+AC_SUBST(glibcxx_prefixdir)
 AC_SUBST(gxx_include_dir)
-AC_SUBST(glibcpp_toolexecdir)
-AC_SUBST(glibcpp_toolexeclibdir)
+AC_SUBST(glibcxx_toolexecdir)
+AC_SUBST(glibcxx_toolexeclibdir)
 ])
 
 
@@ -2010,7 +2010,7 @@ dnl @author John Darrington <j.darrington@elvis.murdoch.edu.au>
 dnl @version 1.1 #### replaced Id string now that Id is for lib-v3; pme
 dnl
 dnl #### Changes for libstdc++-v3:  reformatting and linewrapping; prepending
-dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the
+dnl #### GLIBCXX_ to the macro name; adding the :-make fallback in the
 dnl #### conditional's subshell (" --version" is not a command), using a
 dnl #### different option to grep(1).
 dnl #### -pme
@@ -2018,7 +2018,7 @@ dnl #### Fixed Bourne shell portability bug (use ${MAKE-make}, not
 dnl #### ${MAKE:-make}).
 dnl #### -msokolov
 AC_DEFUN(
-  GLIBCPP_CHECK_GNU_MAKE, [AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
+  GLIBCXX_CHECK_GNU_MAKE, [AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
           _cv_gnu_make_command='' ;
 dnl Search all the common names for GNU make
           for a in "${MAKE-make}" make gmake gnumake ; do
@@ -2042,16 +2042,16 @@ dnl string, '#' otherwise
 
 dnl Check for headers for, and arguments to, the setrlimit() function.
 dnl Used only in testsuite_hooks.h.
-AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT_ancilliary, [
+AC_DEFUN(GLIBCXX_CHECK_SETRLIMIT_ancilliary, [
   AC_TRY_COMPILE([#include <unistd.h>
                   #include <sys/time.h>
                   #include <sys/resource.h>
                  ], [ int f = RLIMIT_$1 ; ],
-                 [glibcpp_mresult=1], [glibcpp_mresult=0])
-  AC_DEFINE_UNQUOTED(HAVE_MEMLIMIT_$1, $glibcpp_mresult,
+                 [glibcxx_mresult=1], [glibcxx_mresult=0])
+  AC_DEFINE_UNQUOTED(HAVE_MEMLIMIT_$1, $glibcxx_mresult,
                      [Only used in build directory testsuite_hooks.h.])
 ])
-AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
+AC_DEFUN(GLIBCXX_CHECK_SETRLIMIT, [
   setrlimit_have_headers=yes
   AC_CHECK_HEADERS(unistd.h sys/time.h sys/resource.h,
                    [],
@@ -2060,10 +2060,10 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
   # won't be seeing any of these during testsuite compilation.
   if test $setrlimit_have_headers = yes; then
     # Can't do these in a loop, else the resulting syntax is wrong.
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(DATA)
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(RSS)
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(VMEM)
-    GLIBCPP_CHECK_SETRLIMIT_ancilliary(AS)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(DATA)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(RSS)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(VMEM)
+    GLIBCXX_CHECK_SETRLIMIT_ancilliary(AS)
 
     # Check for rlimit, setrlimit.
     AC_CACHE_VAL(ac_setrlimit, [
@@ -2079,7 +2079,7 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
   AC_MSG_CHECKING([for testsuite memory limit support])
   if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
     ac_mem_limits=yes
-    AC_DEFINE(_GLIBCPP_MEM_LIMITS)
+    AC_DEFINE(_GLIBCXX_MEM_LIMITS)
   else
     ac_mem_limits=no
   fi
@@ -2091,19 +2091,19 @@ dnl
 dnl Does any necessary configuration of the testsuite directory.  Generates
 dnl the testsuite_hooks.h header.
 dnl
-dnl GLIBCPP_CONFIGURE_TESTSUITE  [no args]
-AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
+dnl GLIBCXX_CONFIGURE_TESTSUITE  [no args]
+AC_DEFUN(GLIBCXX_CONFIGURE_TESTSUITE, [
 
-  if test  x"$GLIBCPP_IS_CROSS_COMPILING" = xfalse; then
+  if test  x"$GLIBCXX_IS_CROSS_COMPILING" = xfalse; then
     # Do checks for memory limit functions.
-    GLIBCPP_CHECK_SETRLIMIT
+    GLIBCXX_CHECK_SETRLIMIT
 
     # Look for setenv, so that extended locale tests can be performed.
-    GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
+    GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
   fi
 
   # Export file names for ABI checking.
-  baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
+  baseline_dir="${glibcxx_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
   AC_SUBST(baseline_dir)
 
   # Determine if checking the ABI is desirable.
@@ -2118,8 +2118,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
     esac
   fi
 
-  AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes)	
-  AM_CONDITIONAL(GLIBCPP_TEST_ABI, test "$enable_abi_check" = yes)
+  AM_CONDITIONAL(GLIBCXX_TEST_WCHAR_T, test "$enable_wchar_t" = yes)	
+  AM_CONDITIONAL(GLIBCXX_TEST_ABI, test "$enable_abi_check" = yes)
 ])
 
 
@@ -2137,22 +2137,22 @@ dnl
 dnl Check whether S_ISREG (Posix) or S_IFREG is available in <sys/stat.h>.
 dnl
 
-AC_DEFUN(GLIBCPP_CHECK_S_ISREG_OR_S_IFREG, [
-  AC_CACHE_VAL(glibcpp_cv_S_ISREG, [
+AC_DEFUN(GLIBCXX_CHECK_S_ISREG_OR_S_IFREG, [
+  AC_CACHE_VAL(glibcxx_cv_S_ISREG, [
     AC_TRY_LINK([#include <sys/stat.h>],
                 [struct stat buffer; fstat(0, &buffer); S_ISREG(buffer.st_mode); ],
-                [glibcpp_cv_S_ISREG=yes],
-                [glibcpp_cv_S_ISREG=no])
+                [glibcxx_cv_S_ISREG=yes],
+                [glibcxx_cv_S_ISREG=no])
   ])
-  AC_CACHE_VAL(glibcpp_cv_S_IFREG, [
+  AC_CACHE_VAL(glibcxx_cv_S_IFREG, [
     AC_TRY_LINK([#include <sys/stat.h>],
                 [struct stat buffer; fstat(0, &buffer); S_IFREG & buffer.st_mode; ],
-                [glibcpp_cv_S_IFREG=yes],
-                [glibcpp_cv_S_IFREG=no])
+                [glibcxx_cv_S_IFREG=yes],
+                [glibcxx_cv_S_IFREG=no])
   ])
-  if test x$glibcpp_cv_S_ISREG = xyes; then
+  if test x$glibcxx_cv_S_ISREG = xyes; then
     AC_DEFINE(HAVE_S_ISREG)
-  elif test x$glibcpp_cv_S_IFREG = xyes; then
+  elif test x$glibcxx_cv_S_IFREG = xyes; then
     AC_DEFINE(HAVE_S_IFREG)
   fi
 ])
@@ -2161,14 +2161,14 @@ dnl
 dnl Check whether poll is available in <poll.h>.
 dnl
 
-AC_DEFUN(GLIBCPP_CHECK_POLL, [
-  AC_CACHE_VAL(glibcpp_cv_POLL, [
+AC_DEFUN(GLIBCXX_CHECK_POLL, [
+  AC_CACHE_VAL(glibcxx_cv_POLL, [
     AC_TRY_COMPILE([#include <poll.h>],
                 [struct pollfd pfd[1]; pfd[0].events = POLLIN; poll(pfd, 1, 0); ],
-                [glibcpp_cv_POLL=yes],
-                [glibcpp_cv_POLL=no])
+                [glibcxx_cv_POLL=yes],
+                [glibcxx_cv_POLL=no])
   ])
-  if test x$glibcpp_cv_POLL = xyes; then
+  if test x$glibcxx_cv_POLL = xyes; then
     AC_DEFINE(HAVE_POLL)
   fi
 ])
@@ -2198,27 +2198,27 @@ AC_DEFUN(AC_LC_MESSAGES, [
 dnl
 dnl Check for whether the Boost-derived checks should be turned on.
 dnl
-dnl GLIBCPP_ENABLE_CONCEPT_CHECKS
+dnl GLIBCXX_ENABLE_CONCEPT_CHECKS
 dnl --enable-concept-checks turns them on.
 dnl --disable-concept-checks leaves them off.
-dnl  +  Usage:  GLIBCPP_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.
-AC_DEFUN(GLIBCPP_ENABLE_CONCEPT_CHECKS, [dnl
-define([GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_CONCEPT_CHECKS, [dnl
+define([GLIBCXX_ENABLE_CONCEPT_CHECKS_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(concept-checks,
 changequote(<<, >>)dnl
-<<  --enable-concept-checks use Boost-derived template checks [default=>>GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT],
+<<  --enable-concept-checks use Boost-derived template checks [default=>>GLIBCXX_ENABLE_CONCEPT_CHECKS_DEFAULT],
 changequote([, ])dnl
 [case "$enableval" in
  yes) enable_concept_checks=yes ;;
  no)  enable_concept_checks=no ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable concept checks]) ;;
  esac],
-enable_concept_checks=GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT)dnl
+enable_concept_checks=GLIBCXX_ENABLE_CONCEPT_CHECKS_DEFAULT)dnl
 dnl Option parsed, now set things appropriately
 if test x"$enable_concept_checks" = xyes; then
-  AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS)
+  AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS)
 fi
 ])
 
@@ -2227,20 +2227,20 @@ dnl
 dnl Add version tags to symbols in shared library (or not), additionally
 dnl marking other symbols as private/local (or not).
 dnl
-dnl GLIBCPP_ENABLE_SYMVERS
+dnl GLIBCXX_ENABLE_SYMVERS
 dnl --enable-symvers=style adds a version script to the linker call when
 dnl       creating the shared library.  The choice of version script is
 dnl       controlled by 'style'.
 dnl --disable-symvers does not.
-dnl  +  Usage:  GLIBCPP_ENABLE_SYMVERS[(DEFAULT)]
+dnl  +  Usage:  GLIBCXX_ENABLE_SYMVERS[(DEFAULT)]
 dnl       Where DEFAULT is either `yes' or `no'.  If ommitted, it
 dnl       defaults to `no'.  Passing `yes' tries to choose a default style
 dnl       based on linker characteristics.  Passing 'no' disables versioning.
-AC_DEFUN(GLIBCPP_ENABLE_SYMVERS, [dnl
-define([GLIBCPP_ENABLE_SYMVERS_DEFAULT], ifelse($1, yes, yes, no))dnl
+AC_DEFUN(GLIBCXX_ENABLE_SYMVERS, [dnl
+define([GLIBCXX_ENABLE_SYMVERS_DEFAULT], ifelse($1, yes, yes, no))dnl
 AC_ARG_ENABLE(symvers,
 changequote(<<, >>)dnl
-<<  --enable-symvers=style  enables symbol versioning of the shared library [default=>>GLIBCPP_ENABLE_SYMVERS_DEFAULT],
+<<  --enable-symvers=style  enables symbol versioning of the shared library [default=>>GLIBCXX_ENABLE_SYMVERS_DEFAULT],
 changequote([, ])dnl
 [case "$enableval" in
  yes) enable_symvers=yes ;;
@@ -2250,13 +2250,13 @@ changequote([, ])dnl
  gnu) enable_symvers=$enableval ;;
  *)   AC_MSG_ERROR([Unknown argument to enable/disable symvers]) ;;
  esac],
-enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl
+enable_symvers=GLIBCXX_ENABLE_SYMVERS_DEFAULT)dnl
 
-# If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we
+# If we never went through the GLIBCXX_CHECK_LINKER_FEATURES macro, then we
 # don't know enough about $LD to do tricks...
 if test x$enable_shared = xno ||
 	test "x$LD" = x ||
-	test x$glibcpp_gnu_ld_version = x; then
+	test x$glibcxx_gnu_ld_version = x; then
   enable_symvers=no
 fi
 
@@ -2265,22 +2265,22 @@ if test $enable_symvers != no; then
   AC_MSG_CHECKING([for shared libgcc])
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=' -lgcc_s'
-  AC_TRY_LINK(, [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no)
+  AC_TRY_LINK(, [return 0], glibcxx_shared_libgcc=yes, glibcxx_shared_libgcc=no)
   CFLAGS="$ac_save_CFLAGS"
-  AC_MSG_RESULT($glibcpp_shared_libgcc)
+  AC_MSG_RESULT($glibcxx_shared_libgcc)
 fi
 
 # For GNU ld, we need at least this version.  It's 2.12 in the same format
-# as the tested-for version.  See GLIBCPP_CHECK_LINKER_FEATURES for more.
-glibcpp_min_gnu_ld_version=21200
+# as the tested-for version.  See GLIBCXX_CHECK_LINKER_FEATURES for more.
+glibcxx_min_gnu_ld_version=21200
 
 # Check to see if unspecified "yes" value can win, given results
 # above.
 if test $enable_symvers = yes ; then
   if test $with_gnu_ld = yes &&
-    test $glibcpp_shared_libgcc = yes ;
+    test $glibcxx_shared_libgcc = yes ;
   then
-    if test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version ; then
+    if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
         enable_symvers=gnu
     else
       ac_test_CFLAGS="${CFLAGS+set}"
@@ -2312,12 +2312,12 @@ case $enable_symvers in
       ;;
   gnu)
       SYMVER_MAP=config/linker-map.gnu
-      AC_DEFINE(_GLIBCPP_SYMVER)
+      AC_DEFINE(_GLIBCXX_SYMVER)
       ;;
 esac
 
 AC_SUBST(SYMVER_MAP)
-AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
+AM_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
 AC_MSG_CHECKING([versioning on shared library symbols])
 AC_MSG_RESULT($enable_symvers)
 ])
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 3ec05679ab1..81e994dd597 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -4,35 +4,35 @@
 #undef HAVE_MMAP
 
 // Define if GCC supports weak symbols.
-#undef _GLIBCPP_SUPPORTS_WEAK
+#undef _GLIBCXX_SUPPORTS_WEAK
 
 // Include I/O support for 'long long' and 'unsigned long long'.
-#undef _GLIBCPP_USE_LONG_LONG
+#undef _GLIBCXX_USE_LONG_LONG
 
 // Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
-#undef _GLIBCPP_USE_C99
+#undef _GLIBCXX_USE_C99
 
 // Define if code specialized for wchar_t should be used.
-#undef _GLIBCPP_USE_WCHAR_T
+#undef _GLIBCXX_USE_WCHAR_T
 
 // Define if using setrlimit to limit memory usage during 'make check'.
-#undef _GLIBCPP_MEM_LIMITS
+#undef _GLIBCXX_MEM_LIMITS
 
 // 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 gthr-default.h exists (meaning that threading support is enabled).
@@ -126,7 +126,7 @@
 #undef HAVE_LC_MESSAGES
 
 // Define if NLS translations are to be used.
-#undef _GLIBCPP_USE_NLS
+#undef _GLIBCXX_USE_NLS
 
 /* Define if you have the __signbit function.  */
 #undef HAVE___SIGNBIT
@@ -795,7 +795,7 @@
 #undef VERSION
 
 /* Define if the compiler is configured for setjmp/longjmp exceptions. */
-#undef _GLIBCPP_SJLJ_EXCEPTIONS
+#undef _GLIBCXX_SJLJ_EXCEPTIONS
 
 /* Define if sigsetjmp is available.   */
 #undef HAVE_SIGSETJMP
diff --git a/libstdc++-v3/config/cpu/alpha/atomicity.h b/libstdc++-v3/config/cpu/alpha/atomicity.h
index 895d87ae6ee..8969a328e9a 100644
--- a/libstdc++-v3/config/cpu/alpha/atomicity.h
+++ b/libstdc++-v3/config/cpu/alpha/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 /* @@@ With gas we can play nice .subsection games to get the
    non-predicted branch pointing forward.  But Digital assemblers
diff --git a/libstdc++-v3/config/cpu/cris/atomicity.h b/libstdc++-v3/config/cpu/cris/atomicity.h
index 55c374f3ed7..ed93b5d64d4 100644
--- a/libstdc++-v3/config/cpu/cris/atomicity.h
+++ b/libstdc++-v3/config/cpu/cris/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 // This entity must not cross a page boundary.
 typedef int _Atomic_word __attribute__ ((__aligned__ (4)));
diff --git a/libstdc++-v3/config/cpu/generic/atomicity.h b/libstdc++-v3/config/cpu/generic/atomicity.h
index 829a77c52cb..f2340d62512 100644
--- a/libstdc++-v3/config/cpu/generic/atomicity.h
+++ b/libstdc++-v3/config/cpu/generic/atomicity.h
@@ -27,12 +27,12 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 #include <bits/gthr.h>
 
-#define _GLIBCPP_NEED_GENERIC_MUTEX
+#define _GLIBCXX_NEED_GENERIC_MUTEX
 
 typedef int _Atomic_word;
 
diff --git a/libstdc++-v3/config/cpu/hppa/atomicity.h b/libstdc++-v3/config/cpu/hppa/atomicity.h
index d99ac34d0b3..7e527ef6c5f 100644
--- a/libstdc++-v3/config/cpu/hppa/atomicity.h
+++ b/libstdc++-v3/config/cpu/hppa/atomicity.h
@@ -17,8 +17,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 typedef int _Atomic_word;
 
@@ -34,9 +34,9 @@ __Atomicity_lock<__inst>::_S_atomicity_lock __attribute__ ((aligned (16))) = 1;
 
 /* Because of the lack of weak support when using the hpux
    som linker, we explicitly instantiate the atomicity lock
-   in src/misc-inst.cc when _GLIBCPP_INST_ATOMICITY_LOCK
+   in src/misc-inst.cc when _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK
    is defined.  */
-#ifndef _GLIBCPP_INST_ATOMICITY_LOCK
+#ifndef _GLIBCXX_INST_GLIBCXX_ATOMICITY_LOCK
 template volatile int __Atomicity_lock<0>::_S_atomicity_lock;
 #endif
 
diff --git a/libstdc++-v3/config/cpu/i386/atomicity.h b/libstdc++-v3/config/cpu/i386/atomicity.h
index d619dbb99ce..a370e752caf 100644
--- a/libstdc++-v3/config/cpu/i386/atomicity.h
+++ b/libstdc++-v3/config/cpu/i386/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 typedef int _Atomic_word;
 
diff --git a/libstdc++-v3/config/cpu/i486/atomicity.h b/libstdc++-v3/config/cpu/i486/atomicity.h
index 7c65fab678e..51ba5410c85 100644
--- a/libstdc++-v3/config/cpu/i486/atomicity.h
+++ b/libstdc++-v3/config/cpu/i486/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 typedef int _Atomic_word;
 
diff --git a/libstdc++-v3/config/cpu/ia64/atomicity.h b/libstdc++-v3/config/cpu/ia64/atomicity.h
index e28e1490ba5..40fbc55d066 100644
--- a/libstdc++-v3/config/cpu/ia64/atomicity.h
+++ b/libstdc++-v3/config/cpu/ia64/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H       1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H       1
 
 #include <ia64intrin.h>
 
diff --git a/libstdc++-v3/config/cpu/m68k/atomicity.h b/libstdc++-v3/config/cpu/m68k/atomicity.h
index 5a2dda3228c..01c64dadc1c 100644
--- a/libstdc++-v3/config/cpu/m68k/atomicity.h
+++ b/libstdc++-v3/config/cpu/m68k/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 typedef int _Atomic_word;
 
diff --git a/libstdc++-v3/config/cpu/mips/atomicity.h b/libstdc++-v3/config/cpu/mips/atomicity.h
index e0016b0a06e..51f3e864462 100644
--- a/libstdc++-v3/config/cpu/mips/atomicity.h
+++ b/libstdc++-v3/config/cpu/mips/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H 1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H 1
 
 typedef int _Atomic_word;
 
diff --git a/libstdc++-v3/config/cpu/powerpc/atomicity.h b/libstdc++-v3/config/cpu/powerpc/atomicity.h
index b5370fcc642..d32add0d95a 100644
--- a/libstdc++-v3/config/cpu/powerpc/atomicity.h
+++ b/libstdc++-v3/config/cpu/powerpc/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 #ifdef __PPC405__
 #define _STWCX "sync \n\tstwcx. "
diff --git a/libstdc++-v3/config/cpu/s390/atomicity.h b/libstdc++-v3/config/cpu/s390/atomicity.h
index 331c29a570a..2bb6f523cf1 100644
--- a/libstdc++-v3/config/cpu/s390/atomicity.h
+++ b/libstdc++-v3/config/cpu/s390/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 typedef int _Atomic_word;
 
diff --git a/libstdc++-v3/config/cpu/sparc/atomicity.h b/libstdc++-v3/config/cpu/sparc/atomicity.h
index 23804db00b7..4c9dbf6345d 100644
--- a/libstdc++-v3/config/cpu/sparc/atomicity.h
+++ b/libstdc++-v3/config/cpu/sparc/atomicity.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _BITS_ATOMICITY_H
-#define _BITS_ATOMICITY_H	1
+#ifndef _GLIBCXX_ATOMICITY_H
+#define _GLIBCXX_ATOMICITY_H	1
 
 #ifdef __arch64__
 
diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc
index 8e6695b9f17..2c099d3a279 100644
--- a/libstdc++-v3/config/io/basic_file_stdio.cc
+++ b/libstdc++-v3/config/io/basic_file_stdio.cc
@@ -36,26 +36,26 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifdef _GLIBCPP_HAVE_SYS_IOCTL_H
+#ifdef _GLIBCXX_HAVE_SYS_IOCTL_H
 #define BSD_COMP /* Get FIONREAD on Solaris2. */
 #include <sys/ioctl.h>
 #endif
 
 // Pick up FIONREAD on Solaris 2.5.
-#ifdef _GLIBCPP_HAVE_SYS_FILIO_H
+#ifdef _GLIBCXX_HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
 
-#ifdef _GLIBCPP_HAVE_POLL
+#ifdef _GLIBCXX_HAVE_POLL
 #include <poll.h>
 #endif
 
-#if defined(_GLIBCPP_HAVE_S_ISREG) || defined(_GLIBCPP_HAVE_S_IFREG)
+#if defined(_GLIBCXX_HAVE_S_ISREG) || defined(_GLIBCXX_HAVE_S_IFREG)
 # include <sys/stat.h>
-# ifdef _GLIBCPP_HAVE_S_ISREG
-#  define _GLIBCPP_ISREG(x) S_ISREG(x)
+# ifdef _GLIBCXX_HAVE_S_ISREG
+#  define _GLIBCXX_ISREG(x) S_ISREG(x)
 # else
-#  define _GLIBCPP_ISREG(x) (((x) & S_IFMT) == S_IFREG)
+#  define _GLIBCXX_ISREG(x) (((x) & S_IFMT) == S_IFREG)
 # endif
 #endif
 
@@ -249,7 +249,7 @@ namespace std
       return __num; 
 #endif    
 
-#ifdef _GLIBCPP_HAVE_POLL
+#ifdef _GLIBCXX_HAVE_POLL
     // Cheap test.
     struct pollfd __pfd[1];
     __pfd[0].fd = this->fd();
@@ -258,11 +258,11 @@ namespace std
       return 0;
 #endif   
 
-#if defined(_GLIBCPP_HAVE_S_ISREG) || defined(_GLIBCPP_HAVE_S_IFREG)
+#if defined(_GLIBCXX_HAVE_S_ISREG) || defined(_GLIBCXX_HAVE_S_IFREG)
     // Regular files.
     struct stat __buffer;
     int __ret = fstat(this->fd(), &__buffer);
-    if (!__ret && _GLIBCPP_ISREG(__buffer.st_mode))
+    if (!__ret && _GLIBCXX_ISREG(__buffer.st_mode))
 	return __buffer.st_size - lseek(this->fd(), 0, ios_base::cur);
 #endif
     return 0;
diff --git a/libstdc++-v3/config/io/basic_file_stdio.h b/libstdc++-v3/config/io/basic_file_stdio.h
index 0b984ebb2a9..7c0ffbf4837 100644
--- a/libstdc++-v3/config/io/basic_file_stdio.h
+++ b/libstdc++-v3/config/io/basic_file_stdio.h
@@ -36,8 +36,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BASIC_FILE
-#define _CPP_BASIC_FILE 1
+#ifndef _BASIC_FILE_STDIO_H
+#define _BASIC_FILE_STDIO_H 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/config/io/c_io_stdio.h b/libstdc++-v3/config/io/c_io_stdio.h
index 7eb1828e482..592abb6052b 100644
--- a/libstdc++-v3/config/io/c_io_stdio.h
+++ b/libstdc++-v3/config/io/c_io_stdio.h
@@ -29,8 +29,8 @@
 
 // c_io_stdio.h - Defines for using "C" stdio.h
 
-#ifndef _CPP_IO_STDIO_H
-#define _CPP_IO_STDIO_H 1
+#ifndef _C_IO_STDIO_H
+#define _C_IO_STDIO_H 1
 
 #include <cstdio>
 #include <cstddef>
@@ -41,7 +41,7 @@ namespace std
   // for fpos.h
   typedef long  	streamoff;
   typedef ptrdiff_t	streamsize; // Signed integral type
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
   typedef ptrdiff_t	wstreamsize;
 #endif
 
diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu
index 7cacdd90dbd..34470c4233b 100644
--- a/libstdc++-v3/config/linker-map.gnu
+++ b/libstdc++-v3/config/linker-map.gnu
@@ -20,7 +20,7 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-GLIBCPP_3.4 {
+GLIBCXX_3.4 {
 
   global:
 
diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
index d8873ec2133..5a211a187df 100644
--- a/libstdc++-v3/config/locale/generic/c_locale.cc
+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
@@ -35,7 +35,7 @@
 
 #include <locale>
 
-#ifdef _GLIBCPP_HAVE_IEEEFP_H
+#ifdef _GLIBCXX_HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
 
@@ -76,7 +76,7 @@ namespace std
 	}
     }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<>
     void
     __convert_to_v(const char* __s, long long& __v, ios_base::iostate& __err, 
@@ -124,18 +124,18 @@ namespace std
 	  setlocale(LC_ALL, "C");
 	  char* __sanity;
 	  errno = 0;
-#if defined(_GLIBCPP_USE_C99)
+#if defined(_GLIBCXX_USE_C99)
 	  float __f = strtof(__s, &__sanity);
 #else
 	  double __d = strtod(__s, &__sanity);
 	  float __f = static_cast<float>(__d);
-#ifdef _GLIBCPP_HAVE_FINITEF
+#ifdef _GLIBCXX_HAVE_FINITEF
 	  if (!finitef (__f))
 	    errno = ERANGE;
-#elif defined (_GLIBCPP_HAVE_FINITE)
+#elif defined (_GLIBCXX_HAVE_FINITE)
 	  if (!finite (static_cast<double> (__f)))
 	    errno = ERANGE;
-#elif defined (_GLIBCPP_HAVE_ISINF)
+#elif defined (_GLIBCXX_HAVE_ISINF)
 	  if (isinf (static_cast<double> (__f)))
 	    errno = ERANGE;
 #else
@@ -184,7 +184,7 @@ namespace std
 	  // Assumes __s formatted for "C" locale.
 	  char* __old = strdup(setlocale(LC_ALL, NULL));
 	  setlocale(LC_ALL, "C");
-#if defined(_GLIBCPP_USE_C99)
+#if defined(_GLIBCXX_USE_C99)
 	  char* __sanity;
 	  errno = 0;
 	  long double __ld = strtold(__s, &__sanity);
@@ -197,7 +197,7 @@ namespace std
 	  int __p = sscanf(__s, "%Lf", &__ld);
 	  if (errno == ERANGE)
 	    __p = 0;
-#ifdef _GLIBCPP_HAVE_FINITEL
+#ifdef _GLIBCXX_HAVE_FINITEL
 	  if ((__p == 1) && !finitel (__ld))
 	    __p = 0;
 #endif
@@ -234,7 +234,7 @@ namespace std
 
 namespace __gnu_cxx
 {
-  const char* category_names[6 + _GLIBCPP_NUM_CATEGORIES] =
+  const char* category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
     {
       "LC_CTYPE", 
       "LC_NUMERIC",
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h
index 0fa425c5957..0819a5cbe9c 100644
--- a/libstdc++-v3/config/locale/generic/c_locale.h
+++ b/libstdc++-v3/config/locale/generic/c_locale.h
@@ -33,14 +33,14 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
-#ifndef _CPP_BITS_C_LOCALE_H
-#define _CPP_BITS_C_LOCALE_H 1
+#ifndef _C_LOCALE_H
+#define _C_LOCALE_H 1
 
 #pragma GCC system_header
 
 #include <clocale>
 
-#define _GLIBCPP_NUM_CATEGORIES 0
+#define _GLIBCXX_NUM_CATEGORIES 0
 
 namespace std
 {
@@ -64,7 +64,7 @@ namespace std
       setlocale(LC_ALL, "C");
 
       int __ret;
-#ifdef _GLIBCPP_USE_C99
+#ifdef _GLIBCXX_USE_C99
       if (__prec >= 0)
         __ret = snprintf(__out, __size, __fmt, __prec, __v);
       else
diff --git a/libstdc++-v3/config/locale/generic/codecvt_members.cc b/libstdc++-v3/config/locale/generic/codecvt_members.cc
index bd685107533..183439de4f3 100644
--- a/libstdc++-v3/config/locale/generic/codecvt_members.cc
+++ b/libstdc++-v3/config/locale/generic/codecvt_members.cc
@@ -38,7 +38,7 @@
 namespace std
 {
   // Specializations.
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   codecvt_base::result
   codecvt<wchar_t, char, mbstate_t>::
   do_out(state_type& __state, const intern_type* __from, 
diff --git a/libstdc++-v3/config/locale/generic/collate_members.cc b/libstdc++-v3/config/locale/generic/collate_members.cc
index 93767d93e3b..9547f71cf77 100644
--- a/libstdc++-v3/config/locale/generic/collate_members.cc
+++ b/libstdc++-v3/config/locale/generic/collate_members.cc
@@ -53,7 +53,7 @@ namespace std
 				size_t __n) const
     { return strxfrm(__to, __from, __n); }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     int 
     collate<wchar_t>::_M_compare(const wchar_t* __one, 
diff --git a/libstdc++-v3/config/locale/generic/ctype_members.cc b/libstdc++-v3/config/locale/generic/ctype_members.cc
index 6b5a603583f..2035cd8c4f4 100644
--- a/libstdc++-v3/config/locale/generic/ctype_members.cc
+++ b/libstdc++-v3/config/locale/generic/ctype_members.cc
@@ -47,7 +47,7 @@ namespace std
       _S_create_c_locale(_M_c_locale_ctype, __s); 
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T  
+#ifdef _GLIBCXX_USE_WCHAR_T  
   ctype<wchar_t>::__wmask_type
   ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
   {
@@ -195,5 +195,5 @@ namespace std
       }
     return __hi;
   }
-#endif //  _GLIBCPP_USE_WCHAR_T
+#endif //  _GLIBCXX_USE_WCHAR_T
 }
diff --git a/libstdc++-v3/config/locale/generic/messages_members.cc b/libstdc++-v3/config/locale/generic/messages_members.cc
index f38f82beed2..6edca38e753 100644
--- a/libstdc++-v3/config/locale/generic/messages_members.cc
+++ b/libstdc++-v3/config/locale/generic/messages_members.cc
@@ -43,7 +43,7 @@ namespace std
     messages<char>::do_get(catalog, int, int, const string& __dfault) const
     { return __dfault; }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     wstring
     messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
diff --git a/libstdc++-v3/config/locale/generic/monetary_members.cc b/libstdc++-v3/config/locale/generic/monetary_members.cc
index 1921f46e98c..1ee08444f5a 100644
--- a/libstdc++-v3/config/locale/generic/monetary_members.cc
+++ b/libstdc++-v3/config/locale/generic/monetary_members.cc
@@ -83,7 +83,7 @@ namespace std
     moneypunct<char, false>::~moneypunct()
     { }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     void
     moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale, 
diff --git a/libstdc++-v3/config/locale/generic/numeric_members.cc b/libstdc++-v3/config/locale/generic/numeric_members.cc
index 320f0ff4ba1..4ab80c22b87 100644
--- a/libstdc++-v3/config/locale/generic/numeric_members.cc
+++ b/libstdc++-v3/config/locale/generic/numeric_members.cc
@@ -67,7 +67,7 @@ namespace std
     numpunct<char>::~numpunct()
     { delete _M_data; }
       
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     void
     numpunct<wchar_t>::_M_initialize_numpunct(__c_locale)
diff --git a/libstdc++-v3/config/locale/generic/time_members.cc b/libstdc++-v3/config/locale/generic/time_members.cc
index df43f03a53d..f6913fe3294 100644
--- a/libstdc++-v3/config/locale/generic/time_members.cc
+++ b/libstdc++-v3/config/locale/generic/time_members.cc
@@ -113,7 +113,7 @@ namespace std
       _M_month_a12 = "Dec";
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     void
     __timepunct<wchar_t>::
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc
index 4dd50d4f376..1309c0308eb 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.cc
+++ b/libstdc++-v3/config/locale/gnu/c_locale.cc
@@ -75,7 +75,7 @@ namespace std
 	}
     }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<>
     void
     __convert_to_v(const char* __s, long long& __v, ios_base::iostate& __err, 
@@ -191,7 +191,7 @@ namespace std
 
 namespace __gnu_cxx
 {
-  const char* category_names[6 + _GLIBCPP_NUM_CATEGORIES] =
+  const char* category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
     {
       "LC_CTYPE", 
       "LC_NUMERIC",
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h
index 37df3fa3a3a..6bc4c39577e 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.h
+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
@@ -33,8 +33,8 @@
 
 // Written by Benjamin Kosnik <bkoz@redhat.com>
 
-#ifndef _CPP_BITS_C_LOCALE_H
-#define _CPP_BITS_C_LOCALE_H 1
+#ifndef _C_LOCALE_H
+#define _C_LOCALE_H 1
 
 #pragma GCC system_header
 
@@ -43,9 +43,9 @@
 #include <iconv.h>		// For codecvt using iconv, iconv_t
 #include <libintl.h> 		// For messages
 
-#define _GLIBCPP_C_LOCALE_GNU 1
+#define _GLIBCXX_C_LOCALE_GNU 1
 
-#define _GLIBCPP_NUM_CATEGORIES 6
+#define _GLIBCXX_NUM_CATEGORIES 6
 
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
 namespace __gnu_cxx
@@ -80,7 +80,7 @@ namespace std
 #endif
 
       int __ret;
-#ifdef _GLIBCPP_USE_C99
+#ifdef _GLIBCXX_USE_C99
       if (__prec >= 0)
         __ret = snprintf(__out, __size, __fmt, __prec, __v);
       else
diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc
index b093385a586..7d800765359 100644
--- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc
+++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc
@@ -39,7 +39,7 @@
 namespace std
 {
   // Specializations.
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   codecvt_base::result
   codecvt<wchar_t, char, mbstate_t>::
   do_out(state_type& __state, const intern_type* __from, 
diff --git a/libstdc++-v3/config/locale/gnu/collate_members.cc b/libstdc++-v3/config/locale/gnu/collate_members.cc
index 1ac209467d8..573aa651f79 100644
--- a/libstdc++-v3/config/locale/gnu/collate_members.cc
+++ b/libstdc++-v3/config/locale/gnu/collate_members.cc
@@ -54,7 +54,7 @@ namespace std
 				size_t __n) const 
     { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     int 
     collate<wchar_t>::_M_compare(const wchar_t* __one, 
diff --git a/libstdc++-v3/config/locale/gnu/ctype_members.cc b/libstdc++-v3/config/locale/gnu/ctype_members.cc
index 34c79be0ca3..142040c9d12 100644
--- a/libstdc++-v3/config/locale/gnu/ctype_members.cc
+++ b/libstdc++-v3/config/locale/gnu/ctype_members.cc
@@ -51,7 +51,7 @@ namespace std
       _M_table = _M_c_locale_ctype->__ctype_b;
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T  
+#ifdef _GLIBCXX_USE_WCHAR_T  
   ctype<wchar_t>::__wmask_type
   ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
   {
@@ -229,5 +229,5 @@ namespace std
 #endif
     return __hi;
   }
-#endif //  _GLIBCPP_USE_WCHAR_T
+#endif //  _GLIBCXX_USE_WCHAR_T
 }
diff --git a/libstdc++-v3/config/locale/gnu/messages_members.cc b/libstdc++-v3/config/locale/gnu/messages_members.cc
index fad01dfabfc..1aa9c068e7f 100644
--- a/libstdc++-v3/config/locale/gnu/messages_members.cc
+++ b/libstdc++-v3/config/locale/gnu/messages_members.cc
@@ -58,7 +58,7 @@ namespace std
 #endif
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     wstring
     messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
diff --git a/libstdc++-v3/config/locale/gnu/monetary_members.cc b/libstdc++-v3/config/locale/gnu/monetary_members.cc
index 91080da0d37..3ad7d34c17c 100644
--- a/libstdc++-v3/config/locale/gnu/monetary_members.cc
+++ b/libstdc++-v3/config/locale/gnu/monetary_members.cc
@@ -313,7 +313,7 @@ namespace std
     moneypunct<char, false>::~moneypunct()
     { }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     void
     moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, 
diff --git a/libstdc++-v3/config/locale/gnu/numeric_members.cc b/libstdc++-v3/config/locale/gnu/numeric_members.cc
index dd8c76b38f3..337fa14fa90 100644
--- a/libstdc++-v3/config/locale/gnu/numeric_members.cc
+++ b/libstdc++-v3/config/locale/gnu/numeric_members.cc
@@ -85,7 +85,7 @@ namespace std
     numpunct<char>::~numpunct()
     { delete _M_data; }
    
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     void
     numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
diff --git a/libstdc++-v3/config/locale/gnu/time_members.cc b/libstdc++-v3/config/locale/gnu/time_members.cc
index db590efbb9c..1dcdfd5c43e 100644
--- a/libstdc++-v3/config/locale/gnu/time_members.cc
+++ b/libstdc++-v3/config/locale/gnu/time_members.cc
@@ -183,7 +183,7 @@ namespace std
 	}
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     void
     __timepunct<wchar_t>::
diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc b/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc
index 0a89aeea034..3419355f605 100644
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/c_locale.cc
@@ -61,7 +61,7 @@ namespace std
       _M_falsename = "false";
     }
       
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     void
     numpunct<wchar_t>::_M_initialize_numpunct(__c_locale)
@@ -91,7 +91,7 @@ namespace std
       _M_neg_format = money_base::_S_default_pattern;
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     void
     moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale)
diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
index 38b57b5a960..5b0a90884c4 100644
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
@@ -37,7 +37,7 @@
 
   // XXX
   // Define this here so codecvt.cc can have _S_max_size definition.
-#define _GLIBCPP_USE___ENC_TRAITS 1
+#define _GLIBCXX_USE___ENC_TRAITS 1
 
   // Extension to use icov for dealing with character encodings,
   // including conversions and comparisons between various character
@@ -453,7 +453,7 @@
 	      const extern_type* __end, size_t __max) const
     { return std::min(__max, static_cast<size_t>(__end - __from)); }
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 74.  Garbled text for codecvt::do_max_length
   template<typename _InternT, typename _ExternT>
     int 
diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc
index aaf07a2342e..b37209f89dc 100644
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/messages_members.cc
@@ -47,7 +47,7 @@ namespace std
       return string(catgets(__nlc, __setid, __msgid, __dfault.c_str())); 
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     wstring
     messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
diff --git a/libstdc++-v3/config/os/aix/os_defines.h b/libstdc++-v3/config/os/aix/os_defines.h
index 6e4dbda3256..7888fa7c7c2 100644
--- a/libstdc++-v3/config/os/aix/os_defines.h
+++ b/libstdc++-v3/config/os/aix/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/bsd/freebsd/os_defines.h b/libstdc++-v3/config/os/bsd/freebsd/os_defines.h
index 55040a7ac4b..1e467129025 100644
--- a/libstdc++-v3/config/os/bsd/freebsd/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/freebsd/os_defines.h
@@ -28,17 +28,17 @@
 // the GNU General Public License.
 
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
 
-#define _GLIBCPP_USE_C99_CHECK 1
-#define _GLIBCPP_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999))
-#define _GLIBCPP_USE_C99_LONG_LONG_CHECK 1
-#define _GLIBCPP_USE_C99_LONG_LONG_DYNAMIC (_GLIBCPP_USE_C99_DYNAMIC || !defined __LONG_LONG_SUPPORTED)
-#define _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1
-#define _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE
+#define _GLIBCXX_USE_C99_CHECK 1
+#define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999))
+#define _GLIBCXX_USE_C99_LONG_LONG_CHECK 1
+#define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC (_GLIBCXX_USE_C99_DYNAMIC || !defined __LONG_LONG_SUPPORTED)
+#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1
+#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE
 
 #endif
diff --git a/libstdc++-v3/config/os/bsd/netbsd/os_defines.h b/libstdc++-v3/config/os/bsd/netbsd/os_defines.h
index 03f760fdcad..a7f25303be2 100644
--- a/libstdc++-v3/config/os/bsd/netbsd/os_defines.h
+++ b/libstdc++-v3/config/os/bsd/netbsd/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/djgpp/os_defines.h b/libstdc++-v3/config/os/djgpp/os_defines.h
index ce0bf243b0e..5a43c061239 100644
--- a/libstdc++-v3/config/os/djgpp/os_defines.h
+++ b/libstdc++-v3/config/os/djgpp/os_defines.h
@@ -28,8 +28,8 @@
 // the GNU General Public License.
 
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/generic/fpos.h b/libstdc++-v3/config/os/generic/fpos.h
index baaeb62f264..869749088f5 100644
--- a/libstdc++-v3/config/os/generic/fpos.h
+++ b/libstdc++-v3/config/os/generic/fpos.h
@@ -109,7 +109,7 @@ namespace std
 
   /// 27.2, paragraph 10 about fpos/char_traits circularity
   typedef fpos<mbstate_t> 		streampos;
-#  ifdef _GLIBCPP_USE_WCHAR_T
+#  ifdef _GLIBCXX_USE_WCHAR_T
   /// 27.2, paragraph 10 about fpos/char_traits circularity
   typedef fpos<mbstate_t> 		wstreampos;
 #  endif
diff --git a/libstdc++-v3/config/os/generic/os_defines.h b/libstdc++-v3/config/os/generic/os_defines.h
index 143c07e6803..303049bfab2 100644
--- a/libstdc++-v3/config/os/generic/os_defines.h
+++ b/libstdc++-v3/config/os/generic/os_defines.h
@@ -28,8 +28,8 @@
 // the GNU General Public License.
 
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/gnu-linux/ctype_noninline.h b/libstdc++-v3/config/os/gnu-linux/ctype_noninline.h
index 8f06d1397ee..01ef01f4065 100644
--- a/libstdc++-v3/config/os/gnu-linux/ctype_noninline.h
+++ b/libstdc++-v3/config/os/gnu-linux/ctype_noninline.h
@@ -34,7 +34,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
 
-#if _GLIBCPP_C_LOCALE_GNU
+#if _GLIBCXX_C_LOCALE_GNU
   const ctype_base::mask*
   ctype<char>::classic_table() throw()
   {
@@ -59,7 +59,7 @@
   }
 #endif
 
-#if _GLIBCPP_C_LOCALE_GNU
+#if _GLIBCXX_C_LOCALE_GNU
   ctype<char>::ctype(__c_locale __cloc, const mask* __table, bool __del, 
 		     size_t __refs) 
   : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del)
@@ -91,7 +91,7 @@
   }
 #endif
 
-#if _GLIBCPP_C_LOCALE_GNU
+#if _GLIBCXX_C_LOCALE_GNU
   ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) : 
   __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del)
   {
diff --git a/libstdc++-v3/config/os/gnu-linux/fpos.h b/libstdc++-v3/config/os/gnu-linux/fpos.h
index 1a3e4747238..3f7900686dc 100644
--- a/libstdc++-v3/config/os/gnu-linux/fpos.h
+++ b/libstdc++-v3/config/os/gnu-linux/fpos.h
@@ -135,7 +135,7 @@ namespace std
 
   /// 27.2, paragraph 10 about fpos/char_traits circularity
   typedef fpos<mbstate_t> 		streampos;
-#  ifdef _GLIBCPP_USE_WCHAR_T
+#  ifdef _GLIBCXX_USE_WCHAR_T
   /// 27.2, paragraph 10 about fpos/char_traits circularity
   typedef fpos<mbstate_t> 		wstreampos;
 #  endif
diff --git a/libstdc++-v3/config/os/gnu-linux/os_defines.h b/libstdc++-v3/config/os/gnu-linux/os_defines.h
index e917ced9f89..0e0194aea75 100644
--- a/libstdc++-v3/config/os/gnu-linux/os_defines.h
+++ b/libstdc++-v3/config/os/gnu-linux/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h
index 27951c199cb..ba0445a4cb6 100644
--- a/libstdc++-v3/config/os/hpux/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
@@ -58,7 +58,7 @@
    unconditionally, which makes intmax_t and uintmax_t long long
    types.
 
-   We also force _GLIBCPP_USE_LONG_LONG here so that we don't have
+   We also force _GLIBCXX_USE_LONG_LONG here so that we don't have
    to bastardize configure to deal with this sillyness.  */
 namespace std 
 {
@@ -75,12 +75,12 @@ namespace std
 #endif
 }
 
-#define _GLIBCPP_USE_LONG_LONG 1
+#define _GLIBCXX_USE_LONG_LONG 1
 
 // HPUX on IA64 requires vtable to be 64 bit aligned even at 32 bit
 // mode.  We need to pad the vtable structure to achieve this.  
 #if !defined(_LP64) && defined (__ia64__)
-#define _GLIBCPP_VTABLE_PADDING 8
+#define _GLIBCXX_VTABLE_PADDING 8
 typedef long int __padding_type;
 #endif
 
@@ -93,12 +93,12 @@ typedef long int __padding_type;
 
 /* We need explicit instantiation of the atomicity lock on HPPA if
    there is no weak support.  */
-#if !defined(_GLIBCPP_SUPPORTS_WEAK) && defined (__hppa__)
-#define _GLIBCPP_INST_ATOMICITY_LOCK 1
+#if !defined(_GLIBCXX_SUPPORTS_WEAK) && defined (__hppa__)
+#define _GLIBCXX_INST_ATOMICITY_LOCK 1
 #endif
 
 /* Don't use pragma weak in gthread headers.  */
 #ifdef __hppa__
-#define _GLIBCPP_GTHREAD_USE_WEAK 0
+#define _GLIBCXX_GTHREAD_USE_WEAK 0
 #endif
 #endif
diff --git a/libstdc++-v3/config/os/irix/irix5.2/os_defines.h b/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
index 1d7f96848ee..87556f8b742 100644
--- a/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix5.2/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
index 838b747e2ab..41ce7edbc5d 100644
--- a/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
+++ b/libstdc++-v3/config/os/irix/irix6.5/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/mingw32/os_defines.h b/libstdc++-v3/config/os/mingw32/os_defines.h
index b93ad27d881..38fd3c711ac 100644
--- a/libstdc++-v3/config/os/mingw32/os_defines.h
+++ b/libstdc++-v3/config/os/mingw32/os_defines.h
@@ -28,8 +28,8 @@
 // the GNU General Public License.
 
 
-#ifndef _GLIBCPP_OS_DEFINES
-#  define _GLIBCPP_OS_DEFINES
+#ifndef _GLIBCXX_OS_DEFINES
+#  define _GLIBCXX_OS_DEFINES
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/newlib/os_defines.h b/libstdc++-v3/config/os/newlib/os_defines.h
index 12776611b88..3b19787929f 100644
--- a/libstdc++-v3/config/os/newlib/os_defines.h
+++ b/libstdc++-v3/config/os/newlib/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/qnx/qnx6.1/os_defines.h b/libstdc++-v3/config/os/qnx/qnx6.1/os_defines.h
index 23cf0976c08..929331cbdfc 100644
--- a/libstdc++-v3/config/os/qnx/qnx6.1/os_defines.h
+++ b/libstdc++-v3/config/os/qnx/qnx6.1/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h
index a9be0bf90b4..7e5a14ea41d 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.5/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h
index aa9ecd687a7..29d6cf5fd87 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.6/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h b/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
index cf53fa46908..9131aa67e75 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.7/os_defines.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/config/os/windiss/os_defines.h b/libstdc++-v3/config/os/windiss/os_defines.h
index dd8b0087311..b7aa2a1ff4d 100644
--- a/libstdc++-v3/config/os/windiss/os_defines.h
+++ b/libstdc++-v3/config/os/windiss/os_defines.h
@@ -28,8 +28,8 @@
 // the GNU General Public License.
 
 
-#ifndef _GLIBCPP_OS_DEFINES
-#define _GLIBCPP_OS_DEFINES 1
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
 
 // System-specific #define, typedefs, corrections, etc, go here.  This
 // file will come before all others.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index c5cf70f8a2c..9e9d38f087c 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -757,7 +757,7 @@ test "$host_alias" != "$target_alias" &&
 
 
 # Runs configure.host, finds CC, CXX and assorted other critical bits.
-# Must run this before the GLIBCPP_ENABLE_* macros below.
+# Must run this before the GLIBCXX_ENABLE_* macros below.
 if test $host != $build; then
   ac_tool_prefix=${host_alias}-
 else
@@ -831,10 +831,10 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
   # These need to be absolute paths, yet at the same time need to
   # canonicalize only relative paths, because then amd will not unmount
   # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
-  glibcpp_builddir=`${PWDCMD-pwd}`
+  glibcxx_builddir=`${PWDCMD-pwd}`
   case $srcdir in
-  \\/$* | ?:\\/*) glibcpp_srcdir=${srcdir} ;;
-  *) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
+  \\/$* | ?:\\/*) glibcxx_srcdir=${srcdir} ;;
+  *) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
   esac
   
   
@@ -922,7 +922,7 @@ if test "${with_newlib+set}" = set; then
 fi
 
 
-  glibcpp_basedir=$srcdir/$toprel/./libstdc++-v3
+  glibcxx_basedir=$srcdir/$toprel/./libstdc++-v3
   
 
   # Never versions of autoconf add an underscore to these functions.
@@ -1080,49 +1080,49 @@ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
   
 
       
-  # Use glibcpp_CXX so that we do not cause CXX to be cached with the
+  # Use glibcxx_CXX so that we do not cause CXX to be cached with the
   # flags that come in CXX while configuring libstdc++.  They're different
   # from those used for all other target libraries.  If CXX is set in
   # the environment, respect that here.
-  glibcpp_CXX=$CXX
+  glibcxx_CXX=$CXX
   for ac_prog in $CCC c++ g++ gcc CC cxx cc++
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:1094: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_glibcpp_CXX'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'ac_cv_prog_glibcxx_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$glibcpp_CXX"; then
-  ac_cv_prog_glibcpp_CXX="$glibcpp_CXX" # Let the user override the test.
+  if test -n "$glibcxx_CXX"; then
+  ac_cv_prog_glibcxx_CXX="$glibcxx_CXX" # Let the user override the test.
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_glibcpp_CXX="$ac_prog"
+      ac_cv_prog_glibcxx_CXX="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
 fi
-glibcpp_CXX="$ac_cv_prog_glibcpp_CXX"
-if test -n "$glibcpp_CXX"; then
-  echo "$ac_t""$glibcpp_CXX" 1>&6
+glibcxx_CXX="$ac_cv_prog_glibcxx_CXX"
+if test -n "$glibcxx_CXX"; then
+  echo "$ac_t""$glibcxx_CXX" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-test -n "$glibcpp_CXX" && break
+test -n "$glibcxx_CXX" && break
 done
-test -n "$glibcpp_CXX" || glibcpp_CXX="gcc"
+test -n "$glibcxx_CXX" || glibcxx_CXX="gcc"
 
   
-  CXX=$glibcpp_CXX
-  test -z "$glibcpp_CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; }
+  CXX=$glibcxx_CXX
+  test -z "$glibcxx_CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; }
 
   echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
 echo "configure:1129: checking whether we are using GNU C++" >&5
@@ -1180,7 +1180,7 @@ echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
   # For directory versioning (e.g., headers) and other variables.
   echo $ac_n "checking for GCC version number""... $ac_c" 1>&6
 echo "configure:1183: checking for GCC version number" >&5
-  gcc_version=`$glibcpp_CXX -dumpversion`
+  gcc_version=`$glibcxx_CXX -dumpversion`
   echo "$ac_t""$gcc_version" 1>&6
 
   # For some reason, gettext needs this.
@@ -1495,16 +1495,16 @@ ac_exeext=$EXEEXT
 
   fi
 
-  case ${glibcpp_basedir} in
-    /* | A-Za-z:\\/*) libgcj_flagbasedir=${glibcpp_basedir} ;;
-    *) glibcpp_flagbasedir='$(top_builddir)/'${glibcpp_basedir} ;;
+  case ${glibcxx_basedir} in
+    /* | A-Za-z:\\/*) libgcj_flagbasedir=${glibcxx_basedir} ;;
+    *) glibcxx_flagbasedir='$(top_builddir)/'${glibcxx_basedir} ;;
   esac
 
   # Set up safe default values for all subsequent AM_CONDITIONAL tests.
   need_libmath=no
   enable_wchar_t=no
   #enable_debug=no
-  #glibcpp_pch_comp=no
+  #glibcxx_pch_comp=no
   #enable_cheaders=c
   #c_compatibility=no
   #enable_abi_check=no
@@ -1513,7 +1513,7 @@ ac_exeext=$EXEEXT
   # Find platform-specific directories containing configuration info.  In
   # addition to possibly modifying the same flags, it also sets up symlinks.
   
-  . ${glibcpp_basedir}/configure.host
+  . ${glibcxx_basedir}/configure.host
   echo "$ac_t""CPU config directory is $cpu_include_dir" 1>&6
   echo "$ac_t""OS config directory is $os_include_dir" 1>&6
 
@@ -2734,7 +2734,7 @@ echo "$ac_t""$_cv_gnu_make_command" 1>&6 ;
   fi
   
 
-#GLIBCPP_CHECK_COMPILER_VERSION
+#GLIBCXX_CHECK_COMPILER_VERSION
 
   echo $ac_n "checking for exception model to use""... $ac_c" 1>&6
 echo "configure:2741: checking for exception model to use" >&5
@@ -2776,7 +2776,7 @@ fi
 
    if test x$enable_sjlj_exceptions = xyes; then
      cat >> confdefs.h <<\EOF
-#define _GLIBCPP_SJLJ_EXCEPTIONS 1
+#define _GLIBCXX_SJLJ_EXCEPTIONS 1
 EOF
 
      ac_exception_model_name=sjlj
@@ -2890,16 +2890,16 @@ echo "configure:2888: checking for enabled PCH" >&5
   
 
 if test "$enable_libstdcxx_pch" = yes; then
-  GLIBCPP_BUILD_PCH_TRUE=
-  GLIBCPP_BUILD_PCH_FALSE='#'
+  GLIBCXX_BUILD_PCH_TRUE=
+  GLIBCXX_BUILD_PCH_FALSE='#'
 else
-  GLIBCPP_BUILD_PCH_TRUE='#'
-  GLIBCPP_BUILD_PCH_FALSE=
+  GLIBCXX_BUILD_PCH_TRUE='#'
+  GLIBCXX_BUILD_PCH_FALSE=
 fi
   if test "$enable_libstdcxx_pch" = yes; then
-	glibcpp_PCHFLAGS="-include bits/stdc++.h"
+	glibcxx_PCHFLAGS="-include bits/stdc++.h"
   else
-	glibcpp_PCHFLAGS=""
+	glibcxx_PCHFLAGS=""
   fi
   
 
@@ -3048,12 +3048,12 @@ fi
 
         #include <features.h>
         #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
-          _GLIBCPP_ok
+          _GLIBCXX_ok
         #endif
         
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "_GLIBCPP_ok" >/dev/null 2>&1; then
+  egrep "_GLIBCXX_ok" >/dev/null 2>&1; then
   rm -rf conftest*
   enable_clocale_flag=gnu
 else
@@ -3190,8 +3190,8 @@ fi
       fi
       # Export the build objects.
       for ling in $ALL_LINGUAS; do \
-        glibcpp_MOFILES="$glibcpp_MOFILES $ling.mo"; \
-        glibcpp_POFILES="$glibcpp_POFILES $ling.po"; \
+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
       done
       
       
@@ -3235,7 +3235,7 @@ fi
 
   # This is where the testsuite looks for locale catalogs, using the
   # -DLOCALEDIR define during testsuite compilation.
-  glibcpp_localedir=${glibcpp_builddir}/po/share/locale
+  glibcxx_localedir=${glibcxx_builddir}/po/share/locale
   
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
@@ -3346,7 +3346,7 @@ fi
   fi
   if test $USE_NLS = yes; then
     cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_NLS 1
+#define _GLIBCXX_USE_NLS 1
 EOF
 
   fi
@@ -3390,10 +3390,10 @@ fi
 
     case "$enable_cheaders" in
     c_std)
-        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
+        C_INCLUDE_DIR='${glibcxx_srcdir}/include/c_std'
         ;;
     c)
-        C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
+        C_INCLUDE_DIR='${glibcxx_srcdir}/include/c'
         ;;
   esac
 
@@ -3401,29 +3401,29 @@ fi
   
 
 if test "$enable_cheaders" = c; then
-  GLIBCPP_C_HEADERS_C_TRUE=
-  GLIBCPP_C_HEADERS_C_FALSE='#'
+  GLIBCXX_C_HEADERS_C_TRUE=
+  GLIBCXX_C_HEADERS_C_FALSE='#'
 else
-  GLIBCPP_C_HEADERS_C_TRUE='#'
-  GLIBCPP_C_HEADERS_C_FALSE=
+  GLIBCXX_C_HEADERS_C_TRUE='#'
+  GLIBCXX_C_HEADERS_C_FALSE=
 fi
   
 
 if test "$enable_cheaders" = c_std; then
-  GLIBCPP_C_HEADERS_C_STD_TRUE=
-  GLIBCPP_C_HEADERS_C_STD_FALSE='#'
+  GLIBCXX_C_HEADERS_C_STD_TRUE=
+  GLIBCXX_C_HEADERS_C_STD_FALSE='#'
 else
-  GLIBCPP_C_HEADERS_C_STD_TRUE='#'
-  GLIBCPP_C_HEADERS_C_STD_FALSE=
+  GLIBCXX_C_HEADERS_C_STD_TRUE='#'
+  GLIBCXX_C_HEADERS_C_STD_FALSE=
 fi
   
 
 if test "$c_compatibility" = yes; then
-  GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE=
-  GLIBCPP_C_HEADERS_COMPATIBILITY_FALSE='#'
+  GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE=
+  GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE='#'
 else
-  GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE='#'
-  GLIBCPP_C_HEADERS_COMPATIBILITY_FALSE=
+  GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE='#'
+  GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE=
 fi
 
 # Check whether --enable-c-mbchar or --disable-c-mbchar was given.
@@ -3988,7 +3988,7 @@ echo "configure:3980: checking for enabled ISO C99 support" >&5
   # Option parsed, now set things appropriately
   if test x"$enable_c99" = x"yes"; then
     cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_C99 1
+#define _GLIBCXX_USE_C99 1
 EOF
 
   fi
@@ -4064,7 +4064,7 @@ rm -f conftest*
   # Option parsed, now set things appropriately
   if test x"$enable_long_long" = xyes; then
     cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_LONG_LONG 1
+#define _GLIBCXX_USE_LONG_LONG 1
 EOF
 
   fi
@@ -4090,12 +4090,12 @@ echo "configure:4084: checking for thread model used by GCC" >&5
 EOF
 
     cat >> confdefs.h <<\EOF
-#define _GLIBCPP_SUPPORTS_WEAK __GXX_WEAK__
+#define _GLIBCXX_SUPPORTS_WEAK __GXX_WEAK__
 EOF
 
   fi
 
-  glibcpp_thread_h=gthr-$target_thread_file.h
+  glibcxx_thread_h=gthr-$target_thread_file.h
   
 
 # Check whether --enable-concept-checks or --disable-concept-checks was given.
@@ -4111,7 +4111,7 @@ else
 fi
 if test x"$enable_concept_checks" = xyes; then
   cat >> confdefs.h <<\EOF
-#define _GLIBCPP_CONCEPT_CHECKS 1
+#define _GLIBCXX_CONCEPT_CHECKS 1
 EOF
 
 fi
@@ -4165,11 +4165,11 @@ echo "$ac_t""$enable_libstdcxx_debug" 1>&6
 
 
 if test "$enable_libstdcxx_debug" = yes; then
-  GLIBCPP_BUILD_DEBUG_TRUE=
-  GLIBCPP_BUILD_DEBUG_FALSE='#'
+  GLIBCXX_BUILD_DEBUG_TRUE=
+  GLIBCXX_BUILD_DEBUG_FALSE='#'
 else
-  GLIBCPP_BUILD_DEBUG_TRUE='#'
-  GLIBCPP_BUILD_DEBUG_FALSE=
+  GLIBCXX_BUILD_DEBUG_TRUE='#'
+  GLIBCXX_BUILD_DEBUG_FALSE=
 fi
 
 # Check whether --enable-libstdcxx_debug_flags or --disable-libstdcxx_debug_flags was given.
@@ -4220,13 +4220,13 @@ fi
 if test x"$build" != x"$host"; then
 
   # We are being configured with some form of cross compiler.
-  GLIBCPP_IS_CROSS_COMPILING=true
+  GLIBCXX_IS_CROSS_COMPILING=true
 
   # This lets us hard-code the functionality we know we'll have in the cross
   # target environment.  "Let" is a sugar-coated word placed on an especially
   # dull and tedious hack, actually.
   #
-  # Here's why GLIBCPP_CHECK_MATH_SUPPORT, and other autoconf macros
+  # Here's why GLIBCXX_CHECK_MATH_SUPPORT, and other autoconf macros
   # that involve linking, can't be used:
   #    "cannot open sim-crt0.o"
   #    "cannot open crt0.o"
@@ -4237,7 +4237,7 @@ if test x"$build" != x"$host"; then
   # crosses can be removed.
 
   # If Canadian cross, then don't pick up tools from the build directory.
-  # Used in GLIBCPP_EXPORT_INCLUDES (and nowhere else?).
+  # Used in GLIBCXX_EXPORT_INCLUDES (and nowhere else?).
   if test -n "$with_cross_host" && test x"$build" != x"$with_cross_host" \
     && test x"$build" != x"$target"; then
     CANADIAN=yes
@@ -4246,9 +4246,9 @@ if test x"$build" != x"$host"; then
   fi
 
   # Construct crosses by hand, eliminating bits that need ld...
-  # GLIBCPP_CHECK_COMPILER_FEATURES
-  # GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
-  # GLIBCPP_CHECK_MATH_SUPPORT
+  # GLIBCXX_CHECK_COMPILER_FEATURES
+  # GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
+  # GLIBCXX_CHECK_MATH_SUPPORT
 
   case "${host}" in
     *-freebsd*)
@@ -4327,7 +4327,7 @@ done
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -5156,7 +5156,7 @@ echo "configure:5147: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -5417,7 +5417,7 @@ done
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -6246,7 +6246,7 @@ echo "configure:6237: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -6376,7 +6376,7 @@ done
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -7205,7 +7205,7 @@ echo "configure:7196: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -7353,7 +7353,7 @@ done
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -8182,7 +8182,7 @@ echo "configure:8173: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -8268,7 +8268,7 @@ done
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -9097,7 +9097,7 @@ echo "configure:9088: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -9195,7 +9195,7 @@ EOF
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -10024,7 +10024,7 @@ echo "configure:10015: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -10235,7 +10235,7 @@ EOF
 EOF
 
 
-        # GLIBCPP_CHECK_STDLIB_SUPPORT
+        # GLIBCXX_CHECK_STDLIB_SUPPORT
         cat >> confdefs.h <<\EOF
 #define HAVE_STRTOF 1
 EOF
@@ -10459,7 +10459,7 @@ else
   # We are being configured natively. We can do more elaborate tests
   # that include AC_TRY_COMPILE now, as the linker is assumed to be
   # working.
-  GLIBCPP_IS_CROSS_COMPILING=false
+  GLIBCXX_IS_CROSS_COMPILING=false
   CANADIAN=no
 
   # Check for available headers.
@@ -10509,7 +10509,7 @@ done
   
   # All these tests are for C++; save the language and the compiler flags.
   # The CXXFLAGS thing is suspicious, but based on similar bits previously
-  # found in GLIBCPP_CONFIGURE.
+  # found in GLIBCXX_CONFIGURE.
   
   ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -10601,7 +10601,7 @@ cross_compiling=$ac_cv_prog_cc_cross
   ldver=`$LD --version 2>/dev/null | head -1 | \
          sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
   
-  glibcpp_gnu_ld_version=`echo $ldver | \
+  glibcxx_gnu_ld_version=`echo $ldver | \
          $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
 
   # Set --gc-sections.
@@ -10722,8 +10722,8 @@ fi
   
   echo $ac_n "checking for isinf declaration""... $ac_c" 1>&6
 echo "configure:10725: checking for isinf declaration" >&5
-  if test x${glibcpp_cv_func_isinf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_isinf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_isinf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_isinf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -10749,12 +10749,12 @@ int main() {
 EOF
 if { (eval echo configure:10751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_isinf_use=yes
+  glibcxx_cv_func_isinf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_isinf_use=no
+  glibcxx_cv_func_isinf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -10768,9 +10768,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_isinf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_isinf_use" 1>&6
 
-  if test x$glibcpp_cv_func_isinf_use = x"yes"; then
+  if test x$glibcxx_cv_func_isinf_use = x"yes"; then
     for ac_func in isinf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -10830,8 +10830,8 @@ done
     
   echo $ac_n "checking for _isinf declaration""... $ac_c" 1>&6
 echo "configure:10833: checking for _isinf declaration" >&5
-  if test x${glibcpp_cv_func__isinf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__isinf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__isinf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__isinf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -10857,12 +10857,12 @@ int main() {
 EOF
 if { (eval echo configure:10859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__isinf_use=yes
+  glibcxx_cv_func__isinf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__isinf_use=no
+  glibcxx_cv_func__isinf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -10876,9 +10876,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__isinf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__isinf_use" 1>&6
 
-    if test x$glibcpp_cv_func__isinf_use = x"yes"; then
+    if test x$glibcxx_cv_func__isinf_use = x"yes"; then
       for ac_func in _isinf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -10941,8 +10941,8 @@ done
   
   echo $ac_n "checking for isnan declaration""... $ac_c" 1>&6
 echo "configure:10944: checking for isnan declaration" >&5
-  if test x${glibcpp_cv_func_isnan_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_isnan_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_isnan_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_isnan_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -10968,12 +10968,12 @@ int main() {
 EOF
 if { (eval echo configure:10970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_isnan_use=yes
+  glibcxx_cv_func_isnan_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_isnan_use=no
+  glibcxx_cv_func_isnan_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -10987,9 +10987,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_isnan_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_isnan_use" 1>&6
 
-  if test x$glibcpp_cv_func_isnan_use = x"yes"; then
+  if test x$glibcxx_cv_func_isnan_use = x"yes"; then
     for ac_func in isnan
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11049,8 +11049,8 @@ done
     
   echo $ac_n "checking for _isnan declaration""... $ac_c" 1>&6
 echo "configure:11052: checking for _isnan declaration" >&5
-  if test x${glibcpp_cv_func__isnan_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__isnan_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__isnan_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__isnan_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11076,12 +11076,12 @@ int main() {
 EOF
 if { (eval echo configure:11078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__isnan_use=yes
+  glibcxx_cv_func__isnan_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__isnan_use=no
+  glibcxx_cv_func__isnan_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11095,9 +11095,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__isnan_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__isnan_use" 1>&6
 
-    if test x$glibcpp_cv_func__isnan_use = x"yes"; then
+    if test x$glibcxx_cv_func__isnan_use = x"yes"; then
       for ac_func in _isnan
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11160,8 +11160,8 @@ done
   
   echo $ac_n "checking for finite declaration""... $ac_c" 1>&6
 echo "configure:11163: checking for finite declaration" >&5
-  if test x${glibcpp_cv_func_finite_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_finite_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_finite_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_finite_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11187,12 +11187,12 @@ int main() {
 EOF
 if { (eval echo configure:11189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_finite_use=yes
+  glibcxx_cv_func_finite_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_finite_use=no
+  glibcxx_cv_func_finite_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11206,9 +11206,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_finite_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_finite_use" 1>&6
 
-  if test x$glibcpp_cv_func_finite_use = x"yes"; then
+  if test x$glibcxx_cv_func_finite_use = x"yes"; then
     for ac_func in finite
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11268,8 +11268,8 @@ done
     
   echo $ac_n "checking for _finite declaration""... $ac_c" 1>&6
 echo "configure:11271: checking for _finite declaration" >&5
-  if test x${glibcpp_cv_func__finite_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__finite_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__finite_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__finite_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11295,12 +11295,12 @@ int main() {
 EOF
 if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__finite_use=yes
+  glibcxx_cv_func__finite_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__finite_use=no
+  glibcxx_cv_func__finite_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11314,9 +11314,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__finite_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__finite_use" 1>&6
 
-    if test x$glibcpp_cv_func__finite_use = x"yes"; then
+    if test x$glibcxx_cv_func__finite_use = x"yes"; then
       for ac_func in _finite
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11379,8 +11379,8 @@ done
   
   echo $ac_n "checking for copysign declaration""... $ac_c" 1>&6
 echo "configure:11382: checking for copysign declaration" >&5
-  if test x${glibcpp_cv_func_copysign_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_copysign_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_copysign_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_copysign_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11402,12 +11402,12 @@ int main() {
 EOF
 if { (eval echo configure:11404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_copysign_use=yes
+  glibcxx_cv_func_copysign_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_copysign_use=no
+  glibcxx_cv_func_copysign_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11421,9 +11421,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_copysign_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_copysign_use" 1>&6
 
-  if test x$glibcpp_cv_func_copysign_use = x"yes"; then
+  if test x$glibcxx_cv_func_copysign_use = x"yes"; then
     for ac_func in copysign
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11483,8 +11483,8 @@ done
     
   echo $ac_n "checking for _copysign declaration""... $ac_c" 1>&6
 echo "configure:11486: checking for _copysign declaration" >&5
-  if test x${glibcpp_cv_func__copysign_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__copysign_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__copysign_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__copysign_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11506,12 +11506,12 @@ int main() {
 EOF
 if { (eval echo configure:11508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__copysign_use=yes
+  glibcxx_cv_func__copysign_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__copysign_use=no
+  glibcxx_cv_func__copysign_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11525,9 +11525,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__copysign_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__copysign_use" 1>&6
 
-    if test x$glibcpp_cv_func__copysign_use = x"yes"; then
+    if test x$glibcxx_cv_func__copysign_use = x"yes"; then
       for ac_func in _copysign
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11590,8 +11590,8 @@ done
   
   echo $ac_n "checking for sincos declaration""... $ac_c" 1>&6
 echo "configure:11593: checking for sincos declaration" >&5
-  if test x${glibcpp_cv_func_sincos_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_sincos_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_sincos_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_sincos_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11613,12 +11613,12 @@ int main() {
 EOF
 if { (eval echo configure:11615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_sincos_use=yes
+  glibcxx_cv_func_sincos_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_sincos_use=no
+  glibcxx_cv_func_sincos_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11632,9 +11632,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_sincos_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_sincos_use" 1>&6
 
-  if test x$glibcpp_cv_func_sincos_use = x"yes"; then
+  if test x$glibcxx_cv_func_sincos_use = x"yes"; then
     for ac_func in sincos
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11694,8 +11694,8 @@ done
     
   echo $ac_n "checking for _sincos declaration""... $ac_c" 1>&6
 echo "configure:11697: checking for _sincos declaration" >&5
-  if test x${glibcpp_cv_func__sincos_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__sincos_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__sincos_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__sincos_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11717,12 +11717,12 @@ int main() {
 EOF
 if { (eval echo configure:11719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__sincos_use=yes
+  glibcxx_cv_func__sincos_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__sincos_use=no
+  glibcxx_cv_func__sincos_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11736,9 +11736,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__sincos_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__sincos_use" 1>&6
 
-    if test x$glibcpp_cv_func__sincos_use = x"yes"; then
+    if test x$glibcxx_cv_func__sincos_use = x"yes"; then
       for ac_func in _sincos
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11801,8 +11801,8 @@ done
   
   echo $ac_n "checking for fpclass declaration""... $ac_c" 1>&6
 echo "configure:11804: checking for fpclass declaration" >&5
-  if test x${glibcpp_cv_func_fpclass_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_fpclass_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_fpclass_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_fpclass_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11828,12 +11828,12 @@ int main() {
 EOF
 if { (eval echo configure:11830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_fpclass_use=yes
+  glibcxx_cv_func_fpclass_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_fpclass_use=no
+  glibcxx_cv_func_fpclass_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11847,9 +11847,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_fpclass_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_fpclass_use" 1>&6
 
-  if test x$glibcpp_cv_func_fpclass_use = x"yes"; then
+  if test x$glibcxx_cv_func_fpclass_use = x"yes"; then
     for ac_func in fpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -11909,8 +11909,8 @@ done
     
   echo $ac_n "checking for _fpclass declaration""... $ac_c" 1>&6
 echo "configure:11912: checking for _fpclass declaration" >&5
-  if test x${glibcpp_cv_func__fpclass_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__fpclass_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__fpclass_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__fpclass_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -11936,12 +11936,12 @@ int main() {
 EOF
 if { (eval echo configure:11938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__fpclass_use=yes
+  glibcxx_cv_func__fpclass_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__fpclass_use=no
+  glibcxx_cv_func__fpclass_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -11955,9 +11955,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__fpclass_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__fpclass_use" 1>&6
 
-    if test x$glibcpp_cv_func__fpclass_use = x"yes"; then
+    if test x$glibcxx_cv_func__fpclass_use = x"yes"; then
       for ac_func in _fpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12020,8 +12020,8 @@ done
   
   echo $ac_n "checking for qfpclass declaration""... $ac_c" 1>&6
 echo "configure:12023: checking for qfpclass declaration" >&5
-  if test x${glibcpp_cv_func_qfpclass_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_qfpclass_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_qfpclass_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_qfpclass_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12047,12 +12047,12 @@ int main() {
 EOF
 if { (eval echo configure:12049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_qfpclass_use=yes
+  glibcxx_cv_func_qfpclass_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_qfpclass_use=no
+  glibcxx_cv_func_qfpclass_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12066,9 +12066,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_qfpclass_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_qfpclass_use" 1>&6
 
-  if test x$glibcpp_cv_func_qfpclass_use = x"yes"; then
+  if test x$glibcxx_cv_func_qfpclass_use = x"yes"; then
     for ac_func in qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12128,8 +12128,8 @@ done
     
   echo $ac_n "checking for _qfpclass declaration""... $ac_c" 1>&6
 echo "configure:12131: checking for _qfpclass declaration" >&5
-  if test x${glibcpp_cv_func__qfpclass_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__qfpclass_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__qfpclass_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__qfpclass_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12155,12 +12155,12 @@ int main() {
 EOF
 if { (eval echo configure:12157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__qfpclass_use=yes
+  glibcxx_cv_func__qfpclass_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__qfpclass_use=no
+  glibcxx_cv_func__qfpclass_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12174,9 +12174,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__qfpclass_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__qfpclass_use" 1>&6
 
-    if test x$glibcpp_cv_func__qfpclass_use = x"yes"; then
+    if test x$glibcxx_cv_func__qfpclass_use = x"yes"; then
       for ac_func in _qfpclass
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12239,8 +12239,8 @@ done
   
   echo $ac_n "checking for hypot declaration""... $ac_c" 1>&6
 echo "configure:12242: checking for hypot declaration" >&5
-  if test x${glibcpp_cv_func_hypot_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_hypot_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_hypot_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_hypot_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12262,12 +12262,12 @@ int main() {
 EOF
 if { (eval echo configure:12264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_hypot_use=yes
+  glibcxx_cv_func_hypot_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_hypot_use=no
+  glibcxx_cv_func_hypot_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12281,9 +12281,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_hypot_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_hypot_use" 1>&6
 
-  if test x$glibcpp_cv_func_hypot_use = x"yes"; then
+  if test x$glibcxx_cv_func_hypot_use = x"yes"; then
     for ac_func in hypot
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12343,8 +12343,8 @@ done
     
   echo $ac_n "checking for _hypot declaration""... $ac_c" 1>&6
 echo "configure:12346: checking for _hypot declaration" >&5
-  if test x${glibcpp_cv_func__hypot_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__hypot_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__hypot_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__hypot_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12366,12 +12366,12 @@ int main() {
 EOF
 if { (eval echo configure:12368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__hypot_use=yes
+  glibcxx_cv_func__hypot_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__hypot_use=no
+  glibcxx_cv_func__hypot_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12385,9 +12385,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__hypot_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__hypot_use" 1>&6
 
-    if test x$glibcpp_cv_func__hypot_use = x"yes"; then
+    if test x$glibcxx_cv_func__hypot_use = x"yes"; then
       for ac_func in _hypot
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12450,7 +12450,7 @@ done
     
   echo $ac_n "checking for float trig functions""... $ac_c" 1>&6
 echo "configure:12453: checking for float trig functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func_float_trig_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func_float_trig_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12474,12 +12474,12 @@ int main() {
 EOF
 if { (eval echo configure:12476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_float_trig_use=yes
+  glibcxx_cv_func_float_trig_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_float_trig_use=no
+  glibcxx_cv_func_float_trig_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -12491,8 +12491,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func_float_trig_use" 1>&6
-  if test x$glibcpp_cv_func_float_trig_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_float_trig_use" 1>&6
+  if test x$glibcxx_cv_func_float_trig_use = x"yes"; then
     for ac_func in acosf asinf atanf \
                                           cosf sinf tanf \
                                           coshf sinhf tanhf
@@ -12555,7 +12555,7 @@ done
   
   echo $ac_n "checking for float round functions""... $ac_c" 1>&6
 echo "configure:12558: checking for float round functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func_float_round_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func_float_round_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12577,12 +12577,12 @@ int main() {
 EOF
 if { (eval echo configure:12579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_float_round_use=yes
+  glibcxx_cv_func_float_round_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_float_round_use=no
+  glibcxx_cv_func_float_round_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -12594,8 +12594,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func_float_round_use" 1>&6
-  if test x$glibcpp_cv_func_float_round_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_float_round_use" 1>&6
+  if test x$glibcxx_cv_func_float_round_use = x"yes"; then
     for ac_func in ceilf floorf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12657,8 +12657,8 @@ done
   
   echo $ac_n "checking for expf declaration""... $ac_c" 1>&6
 echo "configure:12660: checking for expf declaration" >&5
-  if test x${glibcpp_cv_func_expf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_expf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_expf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_expf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12684,12 +12684,12 @@ int main() {
 EOF
 if { (eval echo configure:12686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_expf_use=yes
+  glibcxx_cv_func_expf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_expf_use=no
+  glibcxx_cv_func_expf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12703,9 +12703,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_expf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_expf_use" 1>&6
 
-  if test x$glibcpp_cv_func_expf_use = x"yes"; then
+  if test x$glibcxx_cv_func_expf_use = x"yes"; then
     for ac_func in expf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12765,8 +12765,8 @@ done
     
   echo $ac_n "checking for _expf declaration""... $ac_c" 1>&6
 echo "configure:12768: checking for _expf declaration" >&5
-  if test x${glibcpp_cv_func__expf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__expf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__expf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__expf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12792,12 +12792,12 @@ int main() {
 EOF
 if { (eval echo configure:12794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__expf_use=yes
+  glibcxx_cv_func__expf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__expf_use=no
+  glibcxx_cv_func__expf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12811,9 +12811,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__expf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__expf_use" 1>&6
 
-    if test x$glibcpp_cv_func__expf_use = x"yes"; then
+    if test x$glibcxx_cv_func__expf_use = x"yes"; then
       for ac_func in _expf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12876,8 +12876,8 @@ done
   
   echo $ac_n "checking for isnanf declaration""... $ac_c" 1>&6
 echo "configure:12879: checking for isnanf declaration" >&5
-  if test x${glibcpp_cv_func_isnanf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_isnanf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_isnanf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_isnanf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -12903,12 +12903,12 @@ int main() {
 EOF
 if { (eval echo configure:12905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_isnanf_use=yes
+  glibcxx_cv_func_isnanf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_isnanf_use=no
+  glibcxx_cv_func_isnanf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -12922,9 +12922,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_isnanf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_isnanf_use" 1>&6
 
-  if test x$glibcpp_cv_func_isnanf_use = x"yes"; then
+  if test x$glibcxx_cv_func_isnanf_use = x"yes"; then
     for ac_func in isnanf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -12984,8 +12984,8 @@ done
     
   echo $ac_n "checking for _isnanf declaration""... $ac_c" 1>&6
 echo "configure:12987: checking for _isnanf declaration" >&5
-  if test x${glibcpp_cv_func__isnanf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__isnanf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__isnanf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__isnanf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13011,12 +13011,12 @@ int main() {
 EOF
 if { (eval echo configure:13013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__isnanf_use=yes
+  glibcxx_cv_func__isnanf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__isnanf_use=no
+  glibcxx_cv_func__isnanf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13030,9 +13030,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__isnanf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__isnanf_use" 1>&6
 
-    if test x$glibcpp_cv_func__isnanf_use = x"yes"; then
+    if test x$glibcxx_cv_func__isnanf_use = x"yes"; then
       for ac_func in _isnanf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13095,8 +13095,8 @@ done
   
   echo $ac_n "checking for isinff declaration""... $ac_c" 1>&6
 echo "configure:13098: checking for isinff declaration" >&5
-  if test x${glibcpp_cv_func_isinff_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_isinff_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_isinff_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_isinff_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13122,12 +13122,12 @@ int main() {
 EOF
 if { (eval echo configure:13124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_isinff_use=yes
+  glibcxx_cv_func_isinff_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_isinff_use=no
+  glibcxx_cv_func_isinff_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13141,9 +13141,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_isinff_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_isinff_use" 1>&6
 
-  if test x$glibcpp_cv_func_isinff_use = x"yes"; then
+  if test x$glibcxx_cv_func_isinff_use = x"yes"; then
     for ac_func in isinff
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13203,8 +13203,8 @@ done
     
   echo $ac_n "checking for _isinff declaration""... $ac_c" 1>&6
 echo "configure:13206: checking for _isinff declaration" >&5
-  if test x${glibcpp_cv_func__isinff_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__isinff_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__isinff_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__isinff_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13230,12 +13230,12 @@ int main() {
 EOF
 if { (eval echo configure:13232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__isinff_use=yes
+  glibcxx_cv_func__isinff_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__isinff_use=no
+  glibcxx_cv_func__isinff_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13249,9 +13249,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__isinff_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__isinff_use" 1>&6
 
-    if test x$glibcpp_cv_func__isinff_use = x"yes"; then
+    if test x$glibcxx_cv_func__isinff_use = x"yes"; then
       for ac_func in _isinff
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13314,8 +13314,8 @@ done
   
   echo $ac_n "checking for atan2f declaration""... $ac_c" 1>&6
 echo "configure:13317: checking for atan2f declaration" >&5
-  if test x${glibcpp_cv_func_atan2f_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_atan2f_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_atan2f_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_atan2f_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13337,12 +13337,12 @@ int main() {
 EOF
 if { (eval echo configure:13339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_atan2f_use=yes
+  glibcxx_cv_func_atan2f_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_atan2f_use=no
+  glibcxx_cv_func_atan2f_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13356,9 +13356,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_atan2f_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_atan2f_use" 1>&6
 
-  if test x$glibcpp_cv_func_atan2f_use = x"yes"; then
+  if test x$glibcxx_cv_func_atan2f_use = x"yes"; then
     for ac_func in atan2f
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13418,8 +13418,8 @@ done
     
   echo $ac_n "checking for _atan2f declaration""... $ac_c" 1>&6
 echo "configure:13421: checking for _atan2f declaration" >&5
-  if test x${glibcpp_cv_func__atan2f_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__atan2f_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__atan2f_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__atan2f_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13441,12 +13441,12 @@ int main() {
 EOF
 if { (eval echo configure:13443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__atan2f_use=yes
+  glibcxx_cv_func__atan2f_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__atan2f_use=no
+  glibcxx_cv_func__atan2f_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13460,9 +13460,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__atan2f_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__atan2f_use" 1>&6
 
-    if test x$glibcpp_cv_func__atan2f_use = x"yes"; then
+    if test x$glibcxx_cv_func__atan2f_use = x"yes"; then
       for ac_func in _atan2f
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13525,8 +13525,8 @@ done
   
   echo $ac_n "checking for fabsf declaration""... $ac_c" 1>&6
 echo "configure:13528: checking for fabsf declaration" >&5
-  if test x${glibcpp_cv_func_fabsf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_fabsf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_fabsf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_fabsf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13552,12 +13552,12 @@ int main() {
 EOF
 if { (eval echo configure:13554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_fabsf_use=yes
+  glibcxx_cv_func_fabsf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_fabsf_use=no
+  glibcxx_cv_func_fabsf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13571,9 +13571,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_fabsf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_fabsf_use" 1>&6
 
-  if test x$glibcpp_cv_func_fabsf_use = x"yes"; then
+  if test x$glibcxx_cv_func_fabsf_use = x"yes"; then
     for ac_func in fabsf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13633,8 +13633,8 @@ done
     
   echo $ac_n "checking for _fabsf declaration""... $ac_c" 1>&6
 echo "configure:13636: checking for _fabsf declaration" >&5
-  if test x${glibcpp_cv_func__fabsf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__fabsf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__fabsf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__fabsf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13660,12 +13660,12 @@ int main() {
 EOF
 if { (eval echo configure:13662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__fabsf_use=yes
+  glibcxx_cv_func__fabsf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__fabsf_use=no
+  glibcxx_cv_func__fabsf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13679,9 +13679,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__fabsf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__fabsf_use" 1>&6
 
-    if test x$glibcpp_cv_func__fabsf_use = x"yes"; then
+    if test x$glibcxx_cv_func__fabsf_use = x"yes"; then
       for ac_func in _fabsf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13744,8 +13744,8 @@ done
   
   echo $ac_n "checking for fmodf declaration""... $ac_c" 1>&6
 echo "configure:13747: checking for fmodf declaration" >&5
-  if test x${glibcpp_cv_func_fmodf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_fmodf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_fmodf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_fmodf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13767,12 +13767,12 @@ int main() {
 EOF
 if { (eval echo configure:13769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_fmodf_use=yes
+  glibcxx_cv_func_fmodf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_fmodf_use=no
+  glibcxx_cv_func_fmodf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13786,9 +13786,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_fmodf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_fmodf_use" 1>&6
 
-  if test x$glibcpp_cv_func_fmodf_use = x"yes"; then
+  if test x$glibcxx_cv_func_fmodf_use = x"yes"; then
     for ac_func in fmodf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13848,8 +13848,8 @@ done
     
   echo $ac_n "checking for _fmodf declaration""... $ac_c" 1>&6
 echo "configure:13851: checking for _fmodf declaration" >&5
-  if test x${glibcpp_cv_func__fmodf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__fmodf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__fmodf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__fmodf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13871,12 +13871,12 @@ int main() {
 EOF
 if { (eval echo configure:13873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__fmodf_use=yes
+  glibcxx_cv_func__fmodf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__fmodf_use=no
+  glibcxx_cv_func__fmodf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13890,9 +13890,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__fmodf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__fmodf_use" 1>&6
 
-    if test x$glibcpp_cv_func__fmodf_use = x"yes"; then
+    if test x$glibcxx_cv_func__fmodf_use = x"yes"; then
       for ac_func in _fmodf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -13955,8 +13955,8 @@ done
   
   echo $ac_n "checking for frexpf declaration""... $ac_c" 1>&6
 echo "configure:13958: checking for frexpf declaration" >&5
-  if test x${glibcpp_cv_func_frexpf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_frexpf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_frexpf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_frexpf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -13978,12 +13978,12 @@ int main() {
 EOF
 if { (eval echo configure:13980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_frexpf_use=yes
+  glibcxx_cv_func_frexpf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_frexpf_use=no
+  glibcxx_cv_func_frexpf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -13997,9 +13997,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_frexpf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_frexpf_use" 1>&6
 
-  if test x$glibcpp_cv_func_frexpf_use = x"yes"; then
+  if test x$glibcxx_cv_func_frexpf_use = x"yes"; then
     for ac_func in frexpf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14059,8 +14059,8 @@ done
     
   echo $ac_n "checking for _frexpf declaration""... $ac_c" 1>&6
 echo "configure:14062: checking for _frexpf declaration" >&5
-  if test x${glibcpp_cv_func__frexpf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__frexpf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__frexpf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__frexpf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14082,12 +14082,12 @@ int main() {
 EOF
 if { (eval echo configure:14084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__frexpf_use=yes
+  glibcxx_cv_func__frexpf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__frexpf_use=no
+  glibcxx_cv_func__frexpf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14101,9 +14101,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__frexpf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__frexpf_use" 1>&6
 
-    if test x$glibcpp_cv_func__frexpf_use = x"yes"; then
+    if test x$glibcxx_cv_func__frexpf_use = x"yes"; then
       for ac_func in _frexpf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14166,8 +14166,8 @@ done
   
   echo $ac_n "checking for hypotf declaration""... $ac_c" 1>&6
 echo "configure:14169: checking for hypotf declaration" >&5
-  if test x${glibcpp_cv_func_hypotf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_hypotf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_hypotf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_hypotf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14189,12 +14189,12 @@ int main() {
 EOF
 if { (eval echo configure:14191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_hypotf_use=yes
+  glibcxx_cv_func_hypotf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_hypotf_use=no
+  glibcxx_cv_func_hypotf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14208,9 +14208,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_hypotf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_hypotf_use" 1>&6
 
-  if test x$glibcpp_cv_func_hypotf_use = x"yes"; then
+  if test x$glibcxx_cv_func_hypotf_use = x"yes"; then
     for ac_func in hypotf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14270,8 +14270,8 @@ done
     
   echo $ac_n "checking for _hypotf declaration""... $ac_c" 1>&6
 echo "configure:14273: checking for _hypotf declaration" >&5
-  if test x${glibcpp_cv_func__hypotf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__hypotf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__hypotf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__hypotf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14293,12 +14293,12 @@ int main() {
 EOF
 if { (eval echo configure:14295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__hypotf_use=yes
+  glibcxx_cv_func__hypotf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__hypotf_use=no
+  glibcxx_cv_func__hypotf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14312,9 +14312,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__hypotf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__hypotf_use" 1>&6
 
-    if test x$glibcpp_cv_func__hypotf_use = x"yes"; then
+    if test x$glibcxx_cv_func__hypotf_use = x"yes"; then
       for ac_func in _hypotf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14377,8 +14377,8 @@ done
   
   echo $ac_n "checking for ldexpf declaration""... $ac_c" 1>&6
 echo "configure:14380: checking for ldexpf declaration" >&5
-  if test x${glibcpp_cv_func_ldexpf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_ldexpf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_ldexpf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_ldexpf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14400,12 +14400,12 @@ int main() {
 EOF
 if { (eval echo configure:14402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_ldexpf_use=yes
+  glibcxx_cv_func_ldexpf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_ldexpf_use=no
+  glibcxx_cv_func_ldexpf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14419,9 +14419,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_ldexpf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_ldexpf_use" 1>&6
 
-  if test x$glibcpp_cv_func_ldexpf_use = x"yes"; then
+  if test x$glibcxx_cv_func_ldexpf_use = x"yes"; then
     for ac_func in ldexpf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14481,8 +14481,8 @@ done
     
   echo $ac_n "checking for _ldexpf declaration""... $ac_c" 1>&6
 echo "configure:14484: checking for _ldexpf declaration" >&5
-  if test x${glibcpp_cv_func__ldexpf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__ldexpf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__ldexpf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__ldexpf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14504,12 +14504,12 @@ int main() {
 EOF
 if { (eval echo configure:14506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__ldexpf_use=yes
+  glibcxx_cv_func__ldexpf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__ldexpf_use=no
+  glibcxx_cv_func__ldexpf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14523,9 +14523,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__ldexpf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__ldexpf_use" 1>&6
 
-    if test x$glibcpp_cv_func__ldexpf_use = x"yes"; then
+    if test x$glibcxx_cv_func__ldexpf_use = x"yes"; then
       for ac_func in _ldexpf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14588,8 +14588,8 @@ done
   
   echo $ac_n "checking for logf declaration""... $ac_c" 1>&6
 echo "configure:14591: checking for logf declaration" >&5
-  if test x${glibcpp_cv_func_logf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_logf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_logf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_logf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14615,12 +14615,12 @@ int main() {
 EOF
 if { (eval echo configure:14617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_logf_use=yes
+  glibcxx_cv_func_logf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_logf_use=no
+  glibcxx_cv_func_logf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14634,9 +14634,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_logf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_logf_use" 1>&6
 
-  if test x$glibcpp_cv_func_logf_use = x"yes"; then
+  if test x$glibcxx_cv_func_logf_use = x"yes"; then
     for ac_func in logf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14696,8 +14696,8 @@ done
     
   echo $ac_n "checking for _logf declaration""... $ac_c" 1>&6
 echo "configure:14699: checking for _logf declaration" >&5
-  if test x${glibcpp_cv_func__logf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__logf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__logf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__logf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14723,12 +14723,12 @@ int main() {
 EOF
 if { (eval echo configure:14725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__logf_use=yes
+  glibcxx_cv_func__logf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__logf_use=no
+  glibcxx_cv_func__logf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14742,9 +14742,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__logf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__logf_use" 1>&6
 
-    if test x$glibcpp_cv_func__logf_use = x"yes"; then
+    if test x$glibcxx_cv_func__logf_use = x"yes"; then
       for ac_func in _logf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14807,8 +14807,8 @@ done
   
   echo $ac_n "checking for log10f declaration""... $ac_c" 1>&6
 echo "configure:14810: checking for log10f declaration" >&5
-  if test x${glibcpp_cv_func_log10f_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_log10f_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_log10f_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_log10f_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14834,12 +14834,12 @@ int main() {
 EOF
 if { (eval echo configure:14836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_log10f_use=yes
+  glibcxx_cv_func_log10f_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_log10f_use=no
+  glibcxx_cv_func_log10f_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14853,9 +14853,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_log10f_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_log10f_use" 1>&6
 
-  if test x$glibcpp_cv_func_log10f_use = x"yes"; then
+  if test x$glibcxx_cv_func_log10f_use = x"yes"; then
     for ac_func in log10f
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -14915,8 +14915,8 @@ done
     
   echo $ac_n "checking for _log10f declaration""... $ac_c" 1>&6
 echo "configure:14918: checking for _log10f declaration" >&5
-  if test x${glibcpp_cv_func__log10f_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__log10f_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__log10f_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__log10f_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -14942,12 +14942,12 @@ int main() {
 EOF
 if { (eval echo configure:14944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__log10f_use=yes
+  glibcxx_cv_func__log10f_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__log10f_use=no
+  glibcxx_cv_func__log10f_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -14961,9 +14961,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__log10f_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__log10f_use" 1>&6
 
-    if test x$glibcpp_cv_func__log10f_use = x"yes"; then
+    if test x$glibcxx_cv_func__log10f_use = x"yes"; then
       for ac_func in _log10f
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15026,8 +15026,8 @@ done
   
   echo $ac_n "checking for modff declaration""... $ac_c" 1>&6
 echo "configure:15029: checking for modff declaration" >&5
-  if test x${glibcpp_cv_func_modff_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_modff_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_modff_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_modff_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15049,12 +15049,12 @@ int main() {
 EOF
 if { (eval echo configure:15051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_modff_use=yes
+  glibcxx_cv_func_modff_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_modff_use=no
+  glibcxx_cv_func_modff_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15068,9 +15068,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_modff_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_modff_use" 1>&6
 
-  if test x$glibcpp_cv_func_modff_use = x"yes"; then
+  if test x$glibcxx_cv_func_modff_use = x"yes"; then
     for ac_func in modff
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15130,8 +15130,8 @@ done
     
   echo $ac_n "checking for _modff declaration""... $ac_c" 1>&6
 echo "configure:15133: checking for _modff declaration" >&5
-  if test x${glibcpp_cv_func__modff_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__modff_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__modff_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__modff_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15153,12 +15153,12 @@ int main() {
 EOF
 if { (eval echo configure:15155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__modff_use=yes
+  glibcxx_cv_func__modff_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__modff_use=no
+  glibcxx_cv_func__modff_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15172,9 +15172,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__modff_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__modff_use" 1>&6
 
-    if test x$glibcpp_cv_func__modff_use = x"yes"; then
+    if test x$glibcxx_cv_func__modff_use = x"yes"; then
       for ac_func in _modff
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15237,8 +15237,8 @@ done
   
   echo $ac_n "checking for powf declaration""... $ac_c" 1>&6
 echo "configure:15240: checking for powf declaration" >&5
-  if test x${glibcpp_cv_func_powf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_powf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_powf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_powf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15260,12 +15260,12 @@ int main() {
 EOF
 if { (eval echo configure:15262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_powf_use=yes
+  glibcxx_cv_func_powf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_powf_use=no
+  glibcxx_cv_func_powf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15279,9 +15279,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_powf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_powf_use" 1>&6
 
-  if test x$glibcpp_cv_func_powf_use = x"yes"; then
+  if test x$glibcxx_cv_func_powf_use = x"yes"; then
     for ac_func in powf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15341,8 +15341,8 @@ done
     
   echo $ac_n "checking for _powf declaration""... $ac_c" 1>&6
 echo "configure:15344: checking for _powf declaration" >&5
-  if test x${glibcpp_cv_func__powf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__powf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__powf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__powf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15364,12 +15364,12 @@ int main() {
 EOF
 if { (eval echo configure:15366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__powf_use=yes
+  glibcxx_cv_func__powf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__powf_use=no
+  glibcxx_cv_func__powf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15383,9 +15383,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__powf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__powf_use" 1>&6
 
-    if test x$glibcpp_cv_func__powf_use = x"yes"; then
+    if test x$glibcxx_cv_func__powf_use = x"yes"; then
       for ac_func in _powf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15448,8 +15448,8 @@ done
   
   echo $ac_n "checking for sqrtf declaration""... $ac_c" 1>&6
 echo "configure:15451: checking for sqrtf declaration" >&5
-  if test x${glibcpp_cv_func_sqrtf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_sqrtf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_sqrtf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_sqrtf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15475,12 +15475,12 @@ int main() {
 EOF
 if { (eval echo configure:15477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_sqrtf_use=yes
+  glibcxx_cv_func_sqrtf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_sqrtf_use=no
+  glibcxx_cv_func_sqrtf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15494,9 +15494,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_sqrtf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_sqrtf_use" 1>&6
 
-  if test x$glibcpp_cv_func_sqrtf_use = x"yes"; then
+  if test x$glibcxx_cv_func_sqrtf_use = x"yes"; then
     for ac_func in sqrtf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15556,8 +15556,8 @@ done
     
   echo $ac_n "checking for _sqrtf declaration""... $ac_c" 1>&6
 echo "configure:15559: checking for _sqrtf declaration" >&5
-  if test x${glibcpp_cv_func__sqrtf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__sqrtf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__sqrtf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__sqrtf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15583,12 +15583,12 @@ int main() {
 EOF
 if { (eval echo configure:15585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__sqrtf_use=yes
+  glibcxx_cv_func__sqrtf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__sqrtf_use=no
+  glibcxx_cv_func__sqrtf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15602,9 +15602,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__sqrtf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__sqrtf_use" 1>&6
 
-    if test x$glibcpp_cv_func__sqrtf_use = x"yes"; then
+    if test x$glibcxx_cv_func__sqrtf_use = x"yes"; then
       for ac_func in _sqrtf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15667,8 +15667,8 @@ done
   
   echo $ac_n "checking for sincosf declaration""... $ac_c" 1>&6
 echo "configure:15670: checking for sincosf declaration" >&5
-  if test x${glibcpp_cv_func_sincosf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_sincosf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_sincosf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_sincosf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15690,12 +15690,12 @@ int main() {
 EOF
 if { (eval echo configure:15692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_sincosf_use=yes
+  glibcxx_cv_func_sincosf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_sincosf_use=no
+  glibcxx_cv_func_sincosf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15709,9 +15709,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_sincosf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_sincosf_use" 1>&6
 
-  if test x$glibcpp_cv_func_sincosf_use = x"yes"; then
+  if test x$glibcxx_cv_func_sincosf_use = x"yes"; then
     for ac_func in sincosf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15771,8 +15771,8 @@ done
     
   echo $ac_n "checking for _sincosf declaration""... $ac_c" 1>&6
 echo "configure:15774: checking for _sincosf declaration" >&5
-  if test x${glibcpp_cv_func__sincosf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__sincosf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__sincosf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__sincosf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15794,12 +15794,12 @@ int main() {
 EOF
 if { (eval echo configure:15796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__sincosf_use=yes
+  glibcxx_cv_func__sincosf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__sincosf_use=no
+  glibcxx_cv_func__sincosf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15813,9 +15813,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__sincosf_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__sincosf_use" 1>&6
 
-    if test x$glibcpp_cv_func__sincosf_use = x"yes"; then
+    if test x$glibcxx_cv_func__sincosf_use = x"yes"; then
       for ac_func in _sincosf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15878,8 +15878,8 @@ done
   
   echo $ac_n "checking for finitef declaration""... $ac_c" 1>&6
 echo "configure:15881: checking for finitef declaration" >&5
-  if test x${glibcpp_cv_func_finitef_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_finitef_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_finitef_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_finitef_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -15905,12 +15905,12 @@ int main() {
 EOF
 if { (eval echo configure:15907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_finitef_use=yes
+  glibcxx_cv_func_finitef_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_finitef_use=no
+  glibcxx_cv_func_finitef_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -15924,9 +15924,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_finitef_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_finitef_use" 1>&6
 
-  if test x$glibcpp_cv_func_finitef_use = x"yes"; then
+  if test x$glibcxx_cv_func_finitef_use = x"yes"; then
     for ac_func in finitef
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -15986,8 +15986,8 @@ done
     
   echo $ac_n "checking for _finitef declaration""... $ac_c" 1>&6
 echo "configure:15989: checking for _finitef declaration" >&5
-  if test x${glibcpp_cv_func__finitef_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__finitef_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__finitef_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__finitef_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16013,12 +16013,12 @@ int main() {
 EOF
 if { (eval echo configure:16015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__finitef_use=yes
+  glibcxx_cv_func__finitef_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__finitef_use=no
+  glibcxx_cv_func__finitef_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16032,9 +16032,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__finitef_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__finitef_use" 1>&6
 
-    if test x$glibcpp_cv_func__finitef_use = x"yes"; then
+    if test x$glibcxx_cv_func__finitef_use = x"yes"; then
       for ac_func in _finitef
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16097,7 +16097,7 @@ done
     
   echo $ac_n "checking for long double trig functions""... $ac_c" 1>&6
 echo "configure:16100: checking for long double trig functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_trig_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func_long_double_trig_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16121,12 +16121,12 @@ int main() {
 EOF
 if { (eval echo configure:16123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_long_double_trig_use=yes
+  glibcxx_cv_func_long_double_trig_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_long_double_trig_use=no
+  glibcxx_cv_func_long_double_trig_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -16138,8 +16138,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func_long_double_trig_use" 1>&6
-  if test x$glibcpp_cv_func_long_double_trig_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_long_double_trig_use" 1>&6
+  if test x$glibcxx_cv_func_long_double_trig_use = x"yes"; then
     for ac_func in acosl asinl atanl \
                                           cosl sinl tanl \
                                           coshl sinhl tanhl
@@ -16202,7 +16202,7 @@ done
   
   echo $ac_n "checking for long double round functions""... $ac_c" 1>&6
 echo "configure:16205: checking for long double round functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_round_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func_long_double_round_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16224,12 +16224,12 @@ int main() {
 EOF
 if { (eval echo configure:16226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_long_double_round_use=yes
+  glibcxx_cv_func_long_double_round_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_long_double_round_use=no
+  glibcxx_cv_func_long_double_round_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -16241,8 +16241,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func_long_double_round_use" 1>&6
-  if test x$glibcpp_cv_func_long_double_round_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_long_double_round_use" 1>&6
+  if test x$glibcxx_cv_func_long_double_round_use = x"yes"; then
     for ac_func in ceill floorl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16304,8 +16304,8 @@ done
   
   echo $ac_n "checking for isnanl declaration""... $ac_c" 1>&6
 echo "configure:16307: checking for isnanl declaration" >&5
-  if test x${glibcpp_cv_func_isnanl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_isnanl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_isnanl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_isnanl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16331,12 +16331,12 @@ int main() {
 EOF
 if { (eval echo configure:16333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_isnanl_use=yes
+  glibcxx_cv_func_isnanl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_isnanl_use=no
+  glibcxx_cv_func_isnanl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16350,9 +16350,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_isnanl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_isnanl_use" 1>&6
 
-  if test x$glibcpp_cv_func_isnanl_use = x"yes"; then
+  if test x$glibcxx_cv_func_isnanl_use = x"yes"; then
     for ac_func in isnanl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16412,8 +16412,8 @@ done
     
   echo $ac_n "checking for _isnanl declaration""... $ac_c" 1>&6
 echo "configure:16415: checking for _isnanl declaration" >&5
-  if test x${glibcpp_cv_func__isnanl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__isnanl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__isnanl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__isnanl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16439,12 +16439,12 @@ int main() {
 EOF
 if { (eval echo configure:16441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__isnanl_use=yes
+  glibcxx_cv_func__isnanl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__isnanl_use=no
+  glibcxx_cv_func__isnanl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16458,9 +16458,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__isnanl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__isnanl_use" 1>&6
 
-    if test x$glibcpp_cv_func__isnanl_use = x"yes"; then
+    if test x$glibcxx_cv_func__isnanl_use = x"yes"; then
       for ac_func in _isnanl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16523,8 +16523,8 @@ done
   
   echo $ac_n "checking for isinfl declaration""... $ac_c" 1>&6
 echo "configure:16526: checking for isinfl declaration" >&5
-  if test x${glibcpp_cv_func_isinfl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_isinfl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_isinfl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_isinfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16550,12 +16550,12 @@ int main() {
 EOF
 if { (eval echo configure:16552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_isinfl_use=yes
+  glibcxx_cv_func_isinfl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_isinfl_use=no
+  glibcxx_cv_func_isinfl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16569,9 +16569,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_isinfl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_isinfl_use" 1>&6
 
-  if test x$glibcpp_cv_func_isinfl_use = x"yes"; then
+  if test x$glibcxx_cv_func_isinfl_use = x"yes"; then
     for ac_func in isinfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16631,8 +16631,8 @@ done
     
   echo $ac_n "checking for _isinfl declaration""... $ac_c" 1>&6
 echo "configure:16634: checking for _isinfl declaration" >&5
-  if test x${glibcpp_cv_func__isinfl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__isinfl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__isinfl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__isinfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16658,12 +16658,12 @@ int main() {
 EOF
 if { (eval echo configure:16660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__isinfl_use=yes
+  glibcxx_cv_func__isinfl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__isinfl_use=no
+  glibcxx_cv_func__isinfl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16677,9 +16677,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__isinfl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__isinfl_use" 1>&6
 
-    if test x$glibcpp_cv_func__isinfl_use = x"yes"; then
+    if test x$glibcxx_cv_func__isinfl_use = x"yes"; then
       for ac_func in _isinfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16742,8 +16742,8 @@ done
   
   echo $ac_n "checking for copysignl declaration""... $ac_c" 1>&6
 echo "configure:16745: checking for copysignl declaration" >&5
-  if test x${glibcpp_cv_func_copysignl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_copysignl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_copysignl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_copysignl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16765,12 +16765,12 @@ int main() {
 EOF
 if { (eval echo configure:16767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_copysignl_use=yes
+  glibcxx_cv_func_copysignl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_copysignl_use=no
+  glibcxx_cv_func_copysignl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16784,9 +16784,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_copysignl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_copysignl_use" 1>&6
 
-  if test x$glibcpp_cv_func_copysignl_use = x"yes"; then
+  if test x$glibcxx_cv_func_copysignl_use = x"yes"; then
     for ac_func in copysignl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16846,8 +16846,8 @@ done
     
   echo $ac_n "checking for _copysignl declaration""... $ac_c" 1>&6
 echo "configure:16849: checking for _copysignl declaration" >&5
-  if test x${glibcpp_cv_func__copysignl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__copysignl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__copysignl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__copysignl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16869,12 +16869,12 @@ int main() {
 EOF
 if { (eval echo configure:16871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__copysignl_use=yes
+  glibcxx_cv_func__copysignl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__copysignl_use=no
+  glibcxx_cv_func__copysignl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16888,9 +16888,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__copysignl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__copysignl_use" 1>&6
 
-    if test x$glibcpp_cv_func__copysignl_use = x"yes"; then
+    if test x$glibcxx_cv_func__copysignl_use = x"yes"; then
       for ac_func in _copysignl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -16953,8 +16953,8 @@ done
   
   echo $ac_n "checking for atan2l declaration""... $ac_c" 1>&6
 echo "configure:16956: checking for atan2l declaration" >&5
-  if test x${glibcpp_cv_func_atan2l_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_atan2l_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_atan2l_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_atan2l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -16976,12 +16976,12 @@ int main() {
 EOF
 if { (eval echo configure:16978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_atan2l_use=yes
+  glibcxx_cv_func_atan2l_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_atan2l_use=no
+  glibcxx_cv_func_atan2l_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -16995,9 +16995,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_atan2l_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_atan2l_use" 1>&6
 
-  if test x$glibcpp_cv_func_atan2l_use = x"yes"; then
+  if test x$glibcxx_cv_func_atan2l_use = x"yes"; then
     for ac_func in atan2l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17057,8 +17057,8 @@ done
     
   echo $ac_n "checking for _atan2l declaration""... $ac_c" 1>&6
 echo "configure:17060: checking for _atan2l declaration" >&5
-  if test x${glibcpp_cv_func__atan2l_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__atan2l_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__atan2l_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__atan2l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17080,12 +17080,12 @@ int main() {
 EOF
 if { (eval echo configure:17082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__atan2l_use=yes
+  glibcxx_cv_func__atan2l_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__atan2l_use=no
+  glibcxx_cv_func__atan2l_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17099,9 +17099,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__atan2l_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__atan2l_use" 1>&6
 
-    if test x$glibcpp_cv_func__atan2l_use = x"yes"; then
+    if test x$glibcxx_cv_func__atan2l_use = x"yes"; then
       for ac_func in _atan2l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17164,8 +17164,8 @@ done
   
   echo $ac_n "checking for expl declaration""... $ac_c" 1>&6
 echo "configure:17167: checking for expl declaration" >&5
-  if test x${glibcpp_cv_func_expl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_expl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_expl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_expl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17191,12 +17191,12 @@ int main() {
 EOF
 if { (eval echo configure:17193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_expl_use=yes
+  glibcxx_cv_func_expl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_expl_use=no
+  glibcxx_cv_func_expl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17210,9 +17210,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_expl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_expl_use" 1>&6
 
-  if test x$glibcpp_cv_func_expl_use = x"yes"; then
+  if test x$glibcxx_cv_func_expl_use = x"yes"; then
     for ac_func in expl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17272,8 +17272,8 @@ done
     
   echo $ac_n "checking for _expl declaration""... $ac_c" 1>&6
 echo "configure:17275: checking for _expl declaration" >&5
-  if test x${glibcpp_cv_func__expl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__expl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__expl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__expl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17299,12 +17299,12 @@ int main() {
 EOF
 if { (eval echo configure:17301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__expl_use=yes
+  glibcxx_cv_func__expl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__expl_use=no
+  glibcxx_cv_func__expl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17318,9 +17318,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__expl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__expl_use" 1>&6
 
-    if test x$glibcpp_cv_func__expl_use = x"yes"; then
+    if test x$glibcxx_cv_func__expl_use = x"yes"; then
       for ac_func in _expl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17383,8 +17383,8 @@ done
   
   echo $ac_n "checking for fabsl declaration""... $ac_c" 1>&6
 echo "configure:17386: checking for fabsl declaration" >&5
-  if test x${glibcpp_cv_func_fabsl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_fabsl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_fabsl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_fabsl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17410,12 +17410,12 @@ int main() {
 EOF
 if { (eval echo configure:17412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_fabsl_use=yes
+  glibcxx_cv_func_fabsl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_fabsl_use=no
+  glibcxx_cv_func_fabsl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17429,9 +17429,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_fabsl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_fabsl_use" 1>&6
 
-  if test x$glibcpp_cv_func_fabsl_use = x"yes"; then
+  if test x$glibcxx_cv_func_fabsl_use = x"yes"; then
     for ac_func in fabsl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17491,8 +17491,8 @@ done
     
   echo $ac_n "checking for _fabsl declaration""... $ac_c" 1>&6
 echo "configure:17494: checking for _fabsl declaration" >&5
-  if test x${glibcpp_cv_func__fabsl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__fabsl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__fabsl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__fabsl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17518,12 +17518,12 @@ int main() {
 EOF
 if { (eval echo configure:17520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__fabsl_use=yes
+  glibcxx_cv_func__fabsl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__fabsl_use=no
+  glibcxx_cv_func__fabsl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17537,9 +17537,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__fabsl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__fabsl_use" 1>&6
 
-    if test x$glibcpp_cv_func__fabsl_use = x"yes"; then
+    if test x$glibcxx_cv_func__fabsl_use = x"yes"; then
       for ac_func in _fabsl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17602,8 +17602,8 @@ done
   
   echo $ac_n "checking for fmodl declaration""... $ac_c" 1>&6
 echo "configure:17605: checking for fmodl declaration" >&5
-  if test x${glibcpp_cv_func_fmodl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_fmodl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_fmodl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_fmodl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17625,12 +17625,12 @@ int main() {
 EOF
 if { (eval echo configure:17627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_fmodl_use=yes
+  glibcxx_cv_func_fmodl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_fmodl_use=no
+  glibcxx_cv_func_fmodl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17644,9 +17644,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_fmodl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_fmodl_use" 1>&6
 
-  if test x$glibcpp_cv_func_fmodl_use = x"yes"; then
+  if test x$glibcxx_cv_func_fmodl_use = x"yes"; then
     for ac_func in fmodl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17706,8 +17706,8 @@ done
     
   echo $ac_n "checking for _fmodl declaration""... $ac_c" 1>&6
 echo "configure:17709: checking for _fmodl declaration" >&5
-  if test x${glibcpp_cv_func__fmodl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__fmodl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__fmodl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__fmodl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17729,12 +17729,12 @@ int main() {
 EOF
 if { (eval echo configure:17731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__fmodl_use=yes
+  glibcxx_cv_func__fmodl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__fmodl_use=no
+  glibcxx_cv_func__fmodl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17748,9 +17748,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__fmodl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__fmodl_use" 1>&6
 
-    if test x$glibcpp_cv_func__fmodl_use = x"yes"; then
+    if test x$glibcxx_cv_func__fmodl_use = x"yes"; then
       for ac_func in _fmodl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17813,8 +17813,8 @@ done
   
   echo $ac_n "checking for frexpl declaration""... $ac_c" 1>&6
 echo "configure:17816: checking for frexpl declaration" >&5
-  if test x${glibcpp_cv_func_frexpl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_frexpl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_frexpl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_frexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17836,12 +17836,12 @@ int main() {
 EOF
 if { (eval echo configure:17838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_frexpl_use=yes
+  glibcxx_cv_func_frexpl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_frexpl_use=no
+  glibcxx_cv_func_frexpl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17855,9 +17855,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_frexpl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_frexpl_use" 1>&6
 
-  if test x$glibcpp_cv_func_frexpl_use = x"yes"; then
+  if test x$glibcxx_cv_func_frexpl_use = x"yes"; then
     for ac_func in frexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -17917,8 +17917,8 @@ done
     
   echo $ac_n "checking for _frexpl declaration""... $ac_c" 1>&6
 echo "configure:17920: checking for _frexpl declaration" >&5
-  if test x${glibcpp_cv_func__frexpl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__frexpl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__frexpl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__frexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -17940,12 +17940,12 @@ int main() {
 EOF
 if { (eval echo configure:17942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__frexpl_use=yes
+  glibcxx_cv_func__frexpl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__frexpl_use=no
+  glibcxx_cv_func__frexpl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -17959,9 +17959,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__frexpl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__frexpl_use" 1>&6
 
-    if test x$glibcpp_cv_func__frexpl_use = x"yes"; then
+    if test x$glibcxx_cv_func__frexpl_use = x"yes"; then
       for ac_func in _frexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18024,8 +18024,8 @@ done
   
   echo $ac_n "checking for hypotl declaration""... $ac_c" 1>&6
 echo "configure:18027: checking for hypotl declaration" >&5
-  if test x${glibcpp_cv_func_hypotl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_hypotl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_hypotl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_hypotl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18047,12 +18047,12 @@ int main() {
 EOF
 if { (eval echo configure:18049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_hypotl_use=yes
+  glibcxx_cv_func_hypotl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_hypotl_use=no
+  glibcxx_cv_func_hypotl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18066,9 +18066,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_hypotl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_hypotl_use" 1>&6
 
-  if test x$glibcpp_cv_func_hypotl_use = x"yes"; then
+  if test x$glibcxx_cv_func_hypotl_use = x"yes"; then
     for ac_func in hypotl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18128,8 +18128,8 @@ done
     
   echo $ac_n "checking for _hypotl declaration""... $ac_c" 1>&6
 echo "configure:18131: checking for _hypotl declaration" >&5
-  if test x${glibcpp_cv_func__hypotl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__hypotl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__hypotl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__hypotl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18151,12 +18151,12 @@ int main() {
 EOF
 if { (eval echo configure:18153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__hypotl_use=yes
+  glibcxx_cv_func__hypotl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__hypotl_use=no
+  glibcxx_cv_func__hypotl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18170,9 +18170,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__hypotl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__hypotl_use" 1>&6
 
-    if test x$glibcpp_cv_func__hypotl_use = x"yes"; then
+    if test x$glibcxx_cv_func__hypotl_use = x"yes"; then
       for ac_func in _hypotl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18235,8 +18235,8 @@ done
   
   echo $ac_n "checking for ldexpl declaration""... $ac_c" 1>&6
 echo "configure:18238: checking for ldexpl declaration" >&5
-  if test x${glibcpp_cv_func_ldexpl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_ldexpl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_ldexpl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_ldexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18258,12 +18258,12 @@ int main() {
 EOF
 if { (eval echo configure:18260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_ldexpl_use=yes
+  glibcxx_cv_func_ldexpl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_ldexpl_use=no
+  glibcxx_cv_func_ldexpl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18277,9 +18277,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_ldexpl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_ldexpl_use" 1>&6
 
-  if test x$glibcpp_cv_func_ldexpl_use = x"yes"; then
+  if test x$glibcxx_cv_func_ldexpl_use = x"yes"; then
     for ac_func in ldexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18339,8 +18339,8 @@ done
     
   echo $ac_n "checking for _ldexpl declaration""... $ac_c" 1>&6
 echo "configure:18342: checking for _ldexpl declaration" >&5
-  if test x${glibcpp_cv_func__ldexpl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__ldexpl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__ldexpl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__ldexpl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18362,12 +18362,12 @@ int main() {
 EOF
 if { (eval echo configure:18364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__ldexpl_use=yes
+  glibcxx_cv_func__ldexpl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__ldexpl_use=no
+  glibcxx_cv_func__ldexpl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18381,9 +18381,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__ldexpl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__ldexpl_use" 1>&6
 
-    if test x$glibcpp_cv_func__ldexpl_use = x"yes"; then
+    if test x$glibcxx_cv_func__ldexpl_use = x"yes"; then
       for ac_func in _ldexpl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18446,8 +18446,8 @@ done
   
   echo $ac_n "checking for logl declaration""... $ac_c" 1>&6
 echo "configure:18449: checking for logl declaration" >&5
-  if test x${glibcpp_cv_func_logl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_logl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_logl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_logl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18473,12 +18473,12 @@ int main() {
 EOF
 if { (eval echo configure:18475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_logl_use=yes
+  glibcxx_cv_func_logl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_logl_use=no
+  glibcxx_cv_func_logl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18492,9 +18492,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_logl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_logl_use" 1>&6
 
-  if test x$glibcpp_cv_func_logl_use = x"yes"; then
+  if test x$glibcxx_cv_func_logl_use = x"yes"; then
     for ac_func in logl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18554,8 +18554,8 @@ done
     
   echo $ac_n "checking for _logl declaration""... $ac_c" 1>&6
 echo "configure:18557: checking for _logl declaration" >&5
-  if test x${glibcpp_cv_func__logl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__logl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__logl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__logl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18581,12 +18581,12 @@ int main() {
 EOF
 if { (eval echo configure:18583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__logl_use=yes
+  glibcxx_cv_func__logl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__logl_use=no
+  glibcxx_cv_func__logl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18600,9 +18600,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__logl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__logl_use" 1>&6
 
-    if test x$glibcpp_cv_func__logl_use = x"yes"; then
+    if test x$glibcxx_cv_func__logl_use = x"yes"; then
       for ac_func in _logl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18665,8 +18665,8 @@ done
   
   echo $ac_n "checking for log10l declaration""... $ac_c" 1>&6
 echo "configure:18668: checking for log10l declaration" >&5
-  if test x${glibcpp_cv_func_log10l_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_log10l_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_log10l_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_log10l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18692,12 +18692,12 @@ int main() {
 EOF
 if { (eval echo configure:18694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_log10l_use=yes
+  glibcxx_cv_func_log10l_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_log10l_use=no
+  glibcxx_cv_func_log10l_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18711,9 +18711,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_log10l_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_log10l_use" 1>&6
 
-  if test x$glibcpp_cv_func_log10l_use = x"yes"; then
+  if test x$glibcxx_cv_func_log10l_use = x"yes"; then
     for ac_func in log10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18773,8 +18773,8 @@ done
     
   echo $ac_n "checking for _log10l declaration""... $ac_c" 1>&6
 echo "configure:18776: checking for _log10l declaration" >&5
-  if test x${glibcpp_cv_func__log10l_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__log10l_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__log10l_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__log10l_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18800,12 +18800,12 @@ int main() {
 EOF
 if { (eval echo configure:18802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__log10l_use=yes
+  glibcxx_cv_func__log10l_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__log10l_use=no
+  glibcxx_cv_func__log10l_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18819,9 +18819,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__log10l_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__log10l_use" 1>&6
 
-    if test x$glibcpp_cv_func__log10l_use = x"yes"; then
+    if test x$glibcxx_cv_func__log10l_use = x"yes"; then
       for ac_func in _log10l
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18884,8 +18884,8 @@ done
   
   echo $ac_n "checking for modfl declaration""... $ac_c" 1>&6
 echo "configure:18887: checking for modfl declaration" >&5
-  if test x${glibcpp_cv_func_modfl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_modfl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_modfl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_modfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -18907,12 +18907,12 @@ int main() {
 EOF
 if { (eval echo configure:18909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_modfl_use=yes
+  glibcxx_cv_func_modfl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_modfl_use=no
+  glibcxx_cv_func_modfl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -18926,9 +18926,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_modfl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_modfl_use" 1>&6
 
-  if test x$glibcpp_cv_func_modfl_use = x"yes"; then
+  if test x$glibcxx_cv_func_modfl_use = x"yes"; then
     for ac_func in modfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -18988,8 +18988,8 @@ done
     
   echo $ac_n "checking for _modfl declaration""... $ac_c" 1>&6
 echo "configure:18991: checking for _modfl declaration" >&5
-  if test x${glibcpp_cv_func__modfl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__modfl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__modfl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__modfl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19011,12 +19011,12 @@ int main() {
 EOF
 if { (eval echo configure:19013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__modfl_use=yes
+  glibcxx_cv_func__modfl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__modfl_use=no
+  glibcxx_cv_func__modfl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19030,9 +19030,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__modfl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__modfl_use" 1>&6
 
-    if test x$glibcpp_cv_func__modfl_use = x"yes"; then
+    if test x$glibcxx_cv_func__modfl_use = x"yes"; then
       for ac_func in _modfl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19095,8 +19095,8 @@ done
   
   echo $ac_n "checking for powl declaration""... $ac_c" 1>&6
 echo "configure:19098: checking for powl declaration" >&5
-  if test x${glibcpp_cv_func_powl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_powl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_powl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_powl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19118,12 +19118,12 @@ int main() {
 EOF
 if { (eval echo configure:19120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_powl_use=yes
+  glibcxx_cv_func_powl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_powl_use=no
+  glibcxx_cv_func_powl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19137,9 +19137,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_powl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_powl_use" 1>&6
 
-  if test x$glibcpp_cv_func_powl_use = x"yes"; then
+  if test x$glibcxx_cv_func_powl_use = x"yes"; then
     for ac_func in powl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19199,8 +19199,8 @@ done
     
   echo $ac_n "checking for _powl declaration""... $ac_c" 1>&6
 echo "configure:19202: checking for _powl declaration" >&5
-  if test x${glibcpp_cv_func__powl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__powl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__powl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__powl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19222,12 +19222,12 @@ int main() {
 EOF
 if { (eval echo configure:19224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__powl_use=yes
+  glibcxx_cv_func__powl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__powl_use=no
+  glibcxx_cv_func__powl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19241,9 +19241,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__powl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__powl_use" 1>&6
 
-    if test x$glibcpp_cv_func__powl_use = x"yes"; then
+    if test x$glibcxx_cv_func__powl_use = x"yes"; then
       for ac_func in _powl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19306,8 +19306,8 @@ done
   
   echo $ac_n "checking for sqrtl declaration""... $ac_c" 1>&6
 echo "configure:19309: checking for sqrtl declaration" >&5
-  if test x${glibcpp_cv_func_sqrtl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_sqrtl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_sqrtl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_sqrtl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19333,12 +19333,12 @@ int main() {
 EOF
 if { (eval echo configure:19335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_sqrtl_use=yes
+  glibcxx_cv_func_sqrtl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_sqrtl_use=no
+  glibcxx_cv_func_sqrtl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19352,9 +19352,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_sqrtl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_sqrtl_use" 1>&6
 
-  if test x$glibcpp_cv_func_sqrtl_use = x"yes"; then
+  if test x$glibcxx_cv_func_sqrtl_use = x"yes"; then
     for ac_func in sqrtl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19414,8 +19414,8 @@ done
     
   echo $ac_n "checking for _sqrtl declaration""... $ac_c" 1>&6
 echo "configure:19417: checking for _sqrtl declaration" >&5
-  if test x${glibcpp_cv_func__sqrtl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__sqrtl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__sqrtl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__sqrtl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19441,12 +19441,12 @@ int main() {
 EOF
 if { (eval echo configure:19443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__sqrtl_use=yes
+  glibcxx_cv_func__sqrtl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__sqrtl_use=no
+  glibcxx_cv_func__sqrtl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19460,9 +19460,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__sqrtl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__sqrtl_use" 1>&6
 
-    if test x$glibcpp_cv_func__sqrtl_use = x"yes"; then
+    if test x$glibcxx_cv_func__sqrtl_use = x"yes"; then
       for ac_func in _sqrtl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19525,8 +19525,8 @@ done
   
   echo $ac_n "checking for sincosl declaration""... $ac_c" 1>&6
 echo "configure:19528: checking for sincosl declaration" >&5
-  if test x${glibcpp_cv_func_sincosl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_sincosl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_sincosl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_sincosl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19548,12 +19548,12 @@ int main() {
 EOF
 if { (eval echo configure:19550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_sincosl_use=yes
+  glibcxx_cv_func_sincosl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_sincosl_use=no
+  glibcxx_cv_func_sincosl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19567,9 +19567,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_sincosl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_sincosl_use" 1>&6
 
-  if test x$glibcpp_cv_func_sincosl_use = x"yes"; then
+  if test x$glibcxx_cv_func_sincosl_use = x"yes"; then
     for ac_func in sincosl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19629,8 +19629,8 @@ done
     
   echo $ac_n "checking for _sincosl declaration""... $ac_c" 1>&6
 echo "configure:19632: checking for _sincosl declaration" >&5
-  if test x${glibcpp_cv_func__sincosl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__sincosl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__sincosl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__sincosl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19652,12 +19652,12 @@ int main() {
 EOF
 if { (eval echo configure:19654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__sincosl_use=yes
+  glibcxx_cv_func__sincosl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__sincosl_use=no
+  glibcxx_cv_func__sincosl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19671,9 +19671,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__sincosl_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__sincosl_use" 1>&6
 
-    if test x$glibcpp_cv_func__sincosl_use = x"yes"; then
+    if test x$glibcxx_cv_func__sincosl_use = x"yes"; then
       for ac_func in _sincosl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19736,8 +19736,8 @@ done
   
   echo $ac_n "checking for finitel declaration""... $ac_c" 1>&6
 echo "configure:19739: checking for finitel declaration" >&5
-  if test x${glibcpp_cv_func_finitel_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_finitel_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_finitel_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_finitel_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19763,12 +19763,12 @@ int main() {
 EOF
 if { (eval echo configure:19765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_finitel_use=yes
+  glibcxx_cv_func_finitel_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_finitel_use=no
+  glibcxx_cv_func_finitel_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19782,9 +19782,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_finitel_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func_finitel_use" 1>&6
 
-  if test x$glibcpp_cv_func_finitel_use = x"yes"; then
+  if test x$glibcxx_cv_func_finitel_use = x"yes"; then
     for ac_func in finitel
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19844,8 +19844,8 @@ done
     
   echo $ac_n "checking for _finitel declaration""... $ac_c" 1>&6
 echo "configure:19847: checking for _finitel declaration" >&5
-  if test x${glibcpp_cv_func__finitel_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func__finitel_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func__finitel_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func__finitel_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19871,12 +19871,12 @@ int main() {
 EOF
 if { (eval echo configure:19873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__finitel_use=yes
+  glibcxx_cv_func__finitel_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__finitel_use=no
+  glibcxx_cv_func__finitel_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -19890,9 +19890,9 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func__finitel_use" 1>&6
+  echo "$ac_t""$glibcxx_cv_func__finitel_use" 1>&6
 
-    if test x$glibcpp_cv_func__finitel_use = x"yes"; then
+    if test x$glibcxx_cv_func__finitel_use = x"yes"; then
       for ac_func in _finitel
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -19956,7 +19956,7 @@ done
     
   echo $ac_n "checking for _float trig functions""... $ac_c" 1>&6
 echo "configure:19959: checking for _float trig functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func__float_trig_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func__float_trig_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -19980,12 +19980,12 @@ int main() {
 EOF
 if { (eval echo configure:19982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__float_trig_use=yes
+  glibcxx_cv_func__float_trig_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__float_trig_use=no
+  glibcxx_cv_func__float_trig_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -19997,8 +19997,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func__float_trig_use" 1>&6
-  if test x$glibcpp_cv_func__float_trig_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func__float_trig_use" 1>&6
+  if test x$glibcxx_cv_func__float_trig_use = x"yes"; then
     for ac_func in _acosf _asinf _atanf \
                                           _cosf _sinf _tanf \
                                           _coshf _sinhf _tanhf
@@ -20061,7 +20061,7 @@ done
   
   echo $ac_n "checking for _float round functions""... $ac_c" 1>&6
 echo "configure:20064: checking for _float round functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func__float_round_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func__float_round_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20083,12 +20083,12 @@ int main() {
 EOF
 if { (eval echo configure:20085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__float_round_use=yes
+  glibcxx_cv_func__float_round_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__float_round_use=no
+  glibcxx_cv_func__float_round_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -20100,8 +20100,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func__float_round_use" 1>&6
-  if test x$glibcpp_cv_func__float_round_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func__float_round_use" 1>&6
+  if test x$glibcxx_cv_func__float_round_use = x"yes"; then
     for ac_func in _ceilf _floorf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -20163,7 +20163,7 @@ done
     
   echo $ac_n "checking for _long double trig functions""... $ac_c" 1>&6
 echo "configure:20166: checking for _long double trig functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func__long_double_trig_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func__long_double_trig_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20187,12 +20187,12 @@ int main() {
 EOF
 if { (eval echo configure:20189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__long_double_trig_use=yes
+  glibcxx_cv_func__long_double_trig_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__long_double_trig_use=no
+  glibcxx_cv_func__long_double_trig_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -20204,8 +20204,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func__long_double_trig_use" 1>&6
-  if test x$glibcpp_cv_func__long_double_trig_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func__long_double_trig_use" 1>&6
+  if test x$glibcxx_cv_func__long_double_trig_use = x"yes"; then
     for ac_func in _acosl _asinl _atanl \
                                           _cosl _sinl _tanl \
                                           _coshl _sinhl _tanhl
@@ -20268,7 +20268,7 @@ done
   
   echo $ac_n "checking for _long double round functions""... $ac_c" 1>&6
 echo "configure:20271: checking for _long double round functions" >&5
-  if eval "test \"`echo '$''{'glibcpp_cv_func__long_double_round_use'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_func__long_double_round_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20290,12 +20290,12 @@ int main() {
 EOF
 if { (eval echo configure:20292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func__long_double_round_use=yes
+  glibcxx_cv_func__long_double_round_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func__long_double_round_use=no
+  glibcxx_cv_func__long_double_round_use=no
 fi
 rm -f conftest*
     ac_ext=c
@@ -20307,8 +20307,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
-  echo "$ac_t""$glibcpp_cv_func__long_double_round_use" 1>&6
-  if test x$glibcpp_cv_func__long_double_round_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func__long_double_round_use" 1>&6
+  if test x$glibcxx_cv_func__long_double_round_use = x"yes"; then
     for ac_func in _ceill _floorl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -20374,8 +20374,8 @@ done
       
   echo $ac_n "checking for __builtin_abs declaration""... $ac_c" 1>&6
 echo "configure:20377: checking for __builtin_abs declaration" >&5
-  if test x${glibcpp_cv_func___builtin_abs_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_abs_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_abs_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_abs_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20397,12 +20397,12 @@ int main() {
 EOF
 if { (eval echo configure:20399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_abs_use=yes
+  glibcxx_cv_func___builtin_abs_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_abs_use=no
+  glibcxx_cv_func___builtin_abs_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20416,12 +20416,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_abs_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_abs_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_abs_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_abs_use = x"yes"; then
     echo $ac_n "checking for __builtin_abs linkage""... $ac_c" 1>&6
 echo "configure:20423: checking for __builtin_abs linkage" >&5
-    if test x${glibcpp_cv_func___builtin_abs_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_abs_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_abs_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_abs_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20435,20 +20435,20 @@ int main() {
 EOF
 if { (eval echo configure:20437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_abs_link=yes
+  glibcxx_cv_func___builtin_abs_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_abs_link=no
+  glibcxx_cv_func___builtin_abs_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_abs_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_abs_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_abs_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_abs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_abs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20460,8 +20460,8 @@ EOF
   
   echo $ac_n "checking for __builtin_fabsf declaration""... $ac_c" 1>&6
 echo "configure:20463: checking for __builtin_fabsf declaration" >&5
-  if test x${glibcpp_cv_func___builtin_fabsf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_fabsf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_fabsf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20483,12 +20483,12 @@ int main() {
 EOF
 if { (eval echo configure:20485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsf_use=yes
+  glibcxx_cv_func___builtin_fabsf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsf_use=no
+  glibcxx_cv_func___builtin_fabsf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20502,12 +20502,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_fabsf_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_fabsf_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_fabsf_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_fabsf_use = x"yes"; then
     echo $ac_n "checking for __builtin_fabsf linkage""... $ac_c" 1>&6
 echo "configure:20509: checking for __builtin_fabsf linkage" >&5
-    if test x${glibcpp_cv_func___builtin_fabsf_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsf_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_fabsf_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_fabsf_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20521,20 +20521,20 @@ int main() {
 EOF
 if { (eval echo configure:20523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsf_link=yes
+  glibcxx_cv_func___builtin_fabsf_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsf_link=no
+  glibcxx_cv_func___builtin_fabsf_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_fabsf_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_fabsf_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_fabsf_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_fabsf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20546,8 +20546,8 @@ EOF
   
   echo $ac_n "checking for __builtin_fabs declaration""... $ac_c" 1>&6
 echo "configure:20549: checking for __builtin_fabs declaration" >&5
-  if test x${glibcpp_cv_func___builtin_fabs_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabs_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_fabs_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_fabs_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20569,12 +20569,12 @@ int main() {
 EOF
 if { (eval echo configure:20571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabs_use=yes
+  glibcxx_cv_func___builtin_fabs_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabs_use=no
+  glibcxx_cv_func___builtin_fabs_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20588,12 +20588,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_fabs_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_fabs_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_fabs_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_fabs_use = x"yes"; then
     echo $ac_n "checking for __builtin_fabs linkage""... $ac_c" 1>&6
 echo "configure:20595: checking for __builtin_fabs linkage" >&5
-    if test x${glibcpp_cv_func___builtin_fabs_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabs_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_fabs_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_fabs_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20607,20 +20607,20 @@ int main() {
 EOF
 if { (eval echo configure:20609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabs_link=yes
+  glibcxx_cv_func___builtin_fabs_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabs_link=no
+  glibcxx_cv_func___builtin_fabs_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_fabs_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_fabs_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_fabs_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_fabs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20632,8 +20632,8 @@ EOF
   
   echo $ac_n "checking for __builtin_fabsl declaration""... $ac_c" 1>&6
 echo "configure:20635: checking for __builtin_fabsl declaration" >&5
-  if test x${glibcpp_cv_func___builtin_fabsl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_fabsl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_fabsl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20655,12 +20655,12 @@ int main() {
 EOF
 if { (eval echo configure:20657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsl_use=yes
+  glibcxx_cv_func___builtin_fabsl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsl_use=no
+  glibcxx_cv_func___builtin_fabsl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20674,12 +20674,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_fabsl_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_fabsl_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_fabsl_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_fabsl_use = x"yes"; then
     echo $ac_n "checking for __builtin_fabsl linkage""... $ac_c" 1>&6
 echo "configure:20681: checking for __builtin_fabsl linkage" >&5
-    if test x${glibcpp_cv_func___builtin_fabsl_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsl_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_fabsl_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_fabsl_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20693,20 +20693,20 @@ int main() {
 EOF
 if { (eval echo configure:20695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsl_link=yes
+  glibcxx_cv_func___builtin_fabsl_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_fabsl_link=no
+  glibcxx_cv_func___builtin_fabsl_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_fabsl_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_fabsl_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_fabsl_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_fabsl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_fabsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20718,8 +20718,8 @@ EOF
   
   echo $ac_n "checking for __builtin_labs declaration""... $ac_c" 1>&6
 echo "configure:20721: checking for __builtin_labs declaration" >&5
-  if test x${glibcpp_cv_func___builtin_labs_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_labs_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_labs_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_labs_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20741,12 +20741,12 @@ int main() {
 EOF
 if { (eval echo configure:20743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_labs_use=yes
+  glibcxx_cv_func___builtin_labs_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_labs_use=no
+  glibcxx_cv_func___builtin_labs_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20760,12 +20760,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_labs_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_labs_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_labs_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_labs_use = x"yes"; then
     echo $ac_n "checking for __builtin_labs linkage""... $ac_c" 1>&6
 echo "configure:20767: checking for __builtin_labs linkage" >&5
-    if test x${glibcpp_cv_func___builtin_labs_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_labs_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_labs_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_labs_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20779,20 +20779,20 @@ int main() {
 EOF
 if { (eval echo configure:20781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_labs_link=yes
+  glibcxx_cv_func___builtin_labs_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_labs_link=no
+  glibcxx_cv_func___builtin_labs_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_labs_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_labs_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_labs_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_labs_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_labs | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20805,8 +20805,8 @@ EOF
   
   echo $ac_n "checking for __builtin_sqrtf declaration""... $ac_c" 1>&6
 echo "configure:20808: checking for __builtin_sqrtf declaration" >&5
-  if test x${glibcpp_cv_func___builtin_sqrtf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_sqrtf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sqrtf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20828,12 +20828,12 @@ int main() {
 EOF
 if { (eval echo configure:20830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtf_use=yes
+  glibcxx_cv_func___builtin_sqrtf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtf_use=no
+  glibcxx_cv_func___builtin_sqrtf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20847,12 +20847,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_sqrtf_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_sqrtf_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_sqrtf_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_sqrtf_use = x"yes"; then
     echo $ac_n "checking for __builtin_sqrtf linkage""... $ac_c" 1>&6
 echo "configure:20854: checking for __builtin_sqrtf linkage" >&5
-    if test x${glibcpp_cv_func___builtin_sqrtf_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtf_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_sqrtf_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sqrtf_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20866,20 +20866,20 @@ int main() {
 EOF
 if { (eval echo configure:20868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtf_link=yes
+  glibcxx_cv_func___builtin_sqrtf_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtf_link=no
+  glibcxx_cv_func___builtin_sqrtf_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_sqrtf_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_sqrtf_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_sqrtf_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_sqrtf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20891,8 +20891,8 @@ EOF
   
   echo $ac_n "checking for __builtin_sqrt declaration""... $ac_c" 1>&6
 echo "configure:20894: checking for __builtin_sqrt declaration" >&5
-  if test x${glibcpp_cv_func___builtin_sqrt_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrt_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_sqrt_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sqrt_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20914,12 +20914,12 @@ int main() {
 EOF
 if { (eval echo configure:20916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrt_use=yes
+  glibcxx_cv_func___builtin_sqrt_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrt_use=no
+  glibcxx_cv_func___builtin_sqrt_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -20933,12 +20933,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_sqrt_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_sqrt_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_sqrt_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_sqrt_use = x"yes"; then
     echo $ac_n "checking for __builtin_sqrt linkage""... $ac_c" 1>&6
 echo "configure:20940: checking for __builtin_sqrt linkage" >&5
-    if test x${glibcpp_cv_func___builtin_sqrt_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrt_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_sqrt_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sqrt_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -20952,20 +20952,20 @@ int main() {
 EOF
 if { (eval echo configure:20954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrt_link=yes
+  glibcxx_cv_func___builtin_sqrt_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrt_link=no
+  glibcxx_cv_func___builtin_sqrt_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_sqrt_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_sqrt_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_sqrt_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_sqrt_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrt | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -20977,8 +20977,8 @@ EOF
   
   echo $ac_n "checking for __builtin_sqrtl declaration""... $ac_c" 1>&6
 echo "configure:20980: checking for __builtin_sqrtl declaration" >&5
-  if test x${glibcpp_cv_func___builtin_sqrtl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_sqrtl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sqrtl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21000,12 +21000,12 @@ int main() {
 EOF
 if { (eval echo configure:21002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtl_use=yes
+  glibcxx_cv_func___builtin_sqrtl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtl_use=no
+  glibcxx_cv_func___builtin_sqrtl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21019,12 +21019,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_sqrtl_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_sqrtl_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_sqrtl_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_sqrtl_use = x"yes"; then
     echo $ac_n "checking for __builtin_sqrtl linkage""... $ac_c" 1>&6
 echo "configure:21026: checking for __builtin_sqrtl linkage" >&5
-    if test x${glibcpp_cv_func___builtin_sqrtl_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtl_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_sqrtl_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sqrtl_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21038,20 +21038,20 @@ int main() {
 EOF
 if { (eval echo configure:21040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtl_link=yes
+  glibcxx_cv_func___builtin_sqrtl_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sqrtl_link=no
+  glibcxx_cv_func___builtin_sqrtl_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_sqrtl_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_sqrtl_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_sqrtl_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_sqrtl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sqrtl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -21064,8 +21064,8 @@ EOF
   
   echo $ac_n "checking for __builtin_sinf declaration""... $ac_c" 1>&6
 echo "configure:21067: checking for __builtin_sinf declaration" >&5
-  if test x${glibcpp_cv_func___builtin_sinf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_sinf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sinf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21087,12 +21087,12 @@ int main() {
 EOF
 if { (eval echo configure:21089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinf_use=yes
+  glibcxx_cv_func___builtin_sinf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinf_use=no
+  glibcxx_cv_func___builtin_sinf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21106,12 +21106,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_sinf_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_sinf_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_sinf_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_sinf_use = x"yes"; then
     echo $ac_n "checking for __builtin_sinf linkage""... $ac_c" 1>&6
 echo "configure:21113: checking for __builtin_sinf linkage" >&5
-    if test x${glibcpp_cv_func___builtin_sinf_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinf_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_sinf_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sinf_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21125,20 +21125,20 @@ int main() {
 EOF
 if { (eval echo configure:21127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinf_link=yes
+  glibcxx_cv_func___builtin_sinf_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinf_link=no
+  glibcxx_cv_func___builtin_sinf_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_sinf_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_sinf_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_sinf_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_sinf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -21150,8 +21150,8 @@ EOF
   
   echo $ac_n "checking for __builtin_sin declaration""... $ac_c" 1>&6
 echo "configure:21153: checking for __builtin_sin declaration" >&5
-  if test x${glibcpp_cv_func___builtin_sin_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sin_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_sin_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sin_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21173,12 +21173,12 @@ int main() {
 EOF
 if { (eval echo configure:21175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sin_use=yes
+  glibcxx_cv_func___builtin_sin_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sin_use=no
+  glibcxx_cv_func___builtin_sin_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21192,12 +21192,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_sin_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_sin_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_sin_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_sin_use = x"yes"; then
     echo $ac_n "checking for __builtin_sin linkage""... $ac_c" 1>&6
 echo "configure:21199: checking for __builtin_sin linkage" >&5
-    if test x${glibcpp_cv_func___builtin_sin_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sin_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_sin_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sin_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21211,20 +21211,20 @@ int main() {
 EOF
 if { (eval echo configure:21213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sin_link=yes
+  glibcxx_cv_func___builtin_sin_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sin_link=no
+  glibcxx_cv_func___builtin_sin_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_sin_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_sin_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_sin_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_sin_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sin | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -21236,8 +21236,8 @@ EOF
   
   echo $ac_n "checking for __builtin_sinl declaration""... $ac_c" 1>&6
 echo "configure:21239: checking for __builtin_sinl declaration" >&5
-  if test x${glibcpp_cv_func___builtin_sinl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_sinl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sinl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21259,12 +21259,12 @@ int main() {
 EOF
 if { (eval echo configure:21261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinl_use=yes
+  glibcxx_cv_func___builtin_sinl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinl_use=no
+  glibcxx_cv_func___builtin_sinl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21278,12 +21278,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_sinl_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_sinl_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_sinl_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_sinl_use = x"yes"; then
     echo $ac_n "checking for __builtin_sinl linkage""... $ac_c" 1>&6
 echo "configure:21285: checking for __builtin_sinl linkage" >&5
-    if test x${glibcpp_cv_func___builtin_sinl_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinl_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_sinl_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_sinl_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21297,20 +21297,20 @@ int main() {
 EOF
 if { (eval echo configure:21299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinl_link=yes
+  glibcxx_cv_func___builtin_sinl_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_sinl_link=no
+  glibcxx_cv_func___builtin_sinl_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_sinl_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_sinl_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_sinl_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_sinl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_sinl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -21323,8 +21323,8 @@ EOF
   
   echo $ac_n "checking for __builtin_cosf declaration""... $ac_c" 1>&6
 echo "configure:21326: checking for __builtin_cosf declaration" >&5
-  if test x${glibcpp_cv_func___builtin_cosf_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosf_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_cosf_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_cosf_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21346,12 +21346,12 @@ int main() {
 EOF
 if { (eval echo configure:21348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosf_use=yes
+  glibcxx_cv_func___builtin_cosf_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosf_use=no
+  glibcxx_cv_func___builtin_cosf_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21365,12 +21365,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_cosf_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_cosf_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_cosf_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_cosf_use = x"yes"; then
     echo $ac_n "checking for __builtin_cosf linkage""... $ac_c" 1>&6
 echo "configure:21372: checking for __builtin_cosf linkage" >&5
-    if test x${glibcpp_cv_func___builtin_cosf_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosf_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_cosf_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_cosf_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21384,20 +21384,20 @@ int main() {
 EOF
 if { (eval echo configure:21386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosf_link=yes
+  glibcxx_cv_func___builtin_cosf_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosf_link=no
+  glibcxx_cv_func___builtin_cosf_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_cosf_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_cosf_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_cosf_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_cosf_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosf | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -21409,8 +21409,8 @@ EOF
   
   echo $ac_n "checking for __builtin_cos declaration""... $ac_c" 1>&6
 echo "configure:21412: checking for __builtin_cos declaration" >&5
-  if test x${glibcpp_cv_func___builtin_cos_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cos_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_cos_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_cos_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21432,12 +21432,12 @@ int main() {
 EOF
 if { (eval echo configure:21434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cos_use=yes
+  glibcxx_cv_func___builtin_cos_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cos_use=no
+  glibcxx_cv_func___builtin_cos_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21451,12 +21451,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_cos_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_cos_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_cos_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_cos_use = x"yes"; then
     echo $ac_n "checking for __builtin_cos linkage""... $ac_c" 1>&6
 echo "configure:21458: checking for __builtin_cos linkage" >&5
-    if test x${glibcpp_cv_func___builtin_cos_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cos_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_cos_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_cos_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21470,20 +21470,20 @@ int main() {
 EOF
 if { (eval echo configure:21472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cos_link=yes
+  glibcxx_cv_func___builtin_cos_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cos_link=no
+  glibcxx_cv_func___builtin_cos_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_cos_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_cos_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_cos_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_cos_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cos | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -21495,8 +21495,8 @@ EOF
   
   echo $ac_n "checking for __builtin_cosl declaration""... $ac_c" 1>&6
 echo "configure:21498: checking for __builtin_cosl declaration" >&5
-  if test x${glibcpp_cv_func___builtin_cosl_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosl_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func___builtin_cosl_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_cosl_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21518,12 +21518,12 @@ int main() {
 EOF
 if { (eval echo configure:21520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosl_use=yes
+  glibcxx_cv_func___builtin_cosl_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosl_use=no
+  glibcxx_cv_func___builtin_cosl_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -21537,12 +21537,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func___builtin_cosl_use" 1>&6
-  if test x$glibcpp_cv_func___builtin_cosl_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func___builtin_cosl_use" 1>&6
+  if test x$glibcxx_cv_func___builtin_cosl_use = x"yes"; then
     echo $ac_n "checking for __builtin_cosl linkage""... $ac_c" 1>&6
 echo "configure:21544: checking for __builtin_cosl linkage" >&5
-    if test x${glibcpp_cv_func___builtin_cosl_link+set} != xset; then
-      if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosl_link'+set}'`\" = set"; then
+    if test x${glibcxx_cv_func___builtin_cosl_link+set} != xset; then
+      if eval "test \"`echo '$''{'glibcxx_cv_func___builtin_cosl_link'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -21556,20 +21556,20 @@ int main() {
 EOF
 if { (eval echo configure:21558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosl_link=yes
+  glibcxx_cv_func___builtin_cosl_link=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func___builtin_cosl_link=no
+  glibcxx_cv_func___builtin_cosl_link=no
 fi
 rm -f conftest*
       
 fi
 
     fi
-    echo "$ac_t""$glibcpp_cv_func___builtin_cosl_link" 1>&6
-    if test x$glibcpp_cv_func___builtin_cosl_link = x"yes"; then
+    echo "$ac_t""$glibcxx_cv_func___builtin_cosl_link" 1>&6
+    if test x$glibcxx_cv_func___builtin_cosl_link = x"yes"; then
       ac_tr_func=HAVE_`echo __builtin_cosl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
       cat >> confdefs.h <<EOF
 #define ${ac_tr_func} 1
@@ -22399,7 +22399,7 @@ echo "configure:22390: checking for XPG2 wchar_t support" >&5
             if test x"$ac_isoC99_wchar_t" = xyes && 
 	test x"$ac_XPG2_wchar_t" = xyes; then
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_USE_WCHAR_T 1
+#define _GLIBCXX_USE_WCHAR_T 1
 EOF
 
       enable_wchar_t=yes
@@ -22417,8 +22417,8 @@ echo "configure:22410: checking for enabled wchar_t specializations" >&5
   
   echo $ac_n "checking for strtold declaration""... $ac_c" 1>&6
 echo "configure:22420: checking for strtold declaration" >&5
-  if test x${glibcpp_cv_func_strtold_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_strtold_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_strtold_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_strtold_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -22440,12 +22440,12 @@ int main() {
 EOF
 if { (eval echo configure:22442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_strtold_use=yes
+  glibcxx_cv_func_strtold_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_strtold_use=no
+  glibcxx_cv_func_strtold_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -22459,8 +22459,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_strtold_use" 1>&6
-  if test x$glibcpp_cv_func_strtold_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_strtold_use" 1>&6
+  if test x$glibcxx_cv_func_strtold_use = x"yes"; then
     for ac_func in strtold
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -22521,8 +22521,8 @@ done
   
   echo $ac_n "checking for strtof declaration""... $ac_c" 1>&6
 echo "configure:22524: checking for strtof declaration" >&5
-  if test x${glibcpp_cv_func_strtof_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_strtof_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_strtof_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_strtof_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -22544,12 +22544,12 @@ int main() {
 EOF
 if { (eval echo configure:22546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_strtof_use=yes
+  glibcxx_cv_func_strtof_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_strtof_use=no
+  glibcxx_cv_func_strtof_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -22563,8 +22563,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_strtof_use" 1>&6
-  if test x$glibcpp_cv_func_strtof_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_strtof_use" 1>&6
+  if test x$glibcxx_cv_func_strtof_use = x"yes"; then
     for ac_func in strtof
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -22723,7 +22723,7 @@ fi
 done
 
   
-  if eval "test \"`echo '$''{'glibcpp_cv_POLL'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_POLL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -22737,18 +22737,18 @@ struct pollfd pfd[1]; pfd[0].events = POLLIN; poll(pfd, 1, 0);
 EOF
 if { (eval echo configure:22739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_POLL=yes
+  glibcxx_cv_POLL=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_POLL=no
+  glibcxx_cv_POLL=no
 fi
 rm -f conftest*
   
 fi
 
-  if test x$glibcpp_cv_POLL = xyes; then
+  if test x$glibcxx_cv_POLL = xyes; then
     cat >> confdefs.h <<\EOF
 #define HAVE_POLL 1
 EOF
@@ -22756,7 +22756,7 @@ EOF
   fi
 
   
-  if eval "test \"`echo '$''{'glibcpp_cv_S_ISREG'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_S_ISREG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -22770,18 +22770,18 @@ struct stat buffer; fstat(0, &buffer); S_ISREG(buffer.st_mode);
 EOF
 if { (eval echo configure:22772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_S_ISREG=yes
+  glibcxx_cv_S_ISREG=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_S_ISREG=no
+  glibcxx_cv_S_ISREG=no
 fi
 rm -f conftest*
   
 fi
 
-  if eval "test \"`echo '$''{'glibcpp_cv_S_IFREG'+set}'`\" = set"; then
+  if eval "test \"`echo '$''{'glibcxx_cv_S_IFREG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -22795,23 +22795,23 @@ struct stat buffer; fstat(0, &buffer); S_IFREG & buffer.st_mode;
 EOF
 if { (eval echo configure:22797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_cv_S_IFREG=yes
+  glibcxx_cv_S_IFREG=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_S_IFREG=no
+  glibcxx_cv_S_IFREG=no
 fi
 rm -f conftest*
   
 fi
 
-  if test x$glibcpp_cv_S_ISREG = xyes; then
+  if test x$glibcxx_cv_S_ISREG = xyes; then
     cat >> confdefs.h <<\EOF
 #define HAVE_S_ISREG 1
 EOF
 
-  elif test x$glibcpp_cv_S_IFREG = xyes; then
+  elif test x$glibcxx_cv_S_IFREG = xyes; then
     cat >> confdefs.h <<\EOF
 #define HAVE_S_IFREG 1
 EOF
@@ -23192,7 +23192,7 @@ fi
 
 fi
 
-# This depends on GLIBCPP_CHECK_LINKER_FEATURES, but without it assumes no.
+# This depends on GLIBCXX_CHECK_LINKER_FEATURES, but without it assumes no.
 # Check whether --enable-symvers or --disable-symvers was given.
 if test "${enable_symvers+set}" = set; then
   enableval="$enable_symvers"
@@ -23208,11 +23208,11 @@ else
   enable_symvers=yes
 fi
 
-# If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we
+# If we never went through the GLIBCXX_CHECK_LINKER_FEATURES macro, then we
 # don't know enough about $LD to do tricks...
 if test x$enable_shared = xno ||
 	test "x$LD" = x ||
-	test x$glibcpp_gnu_ld_version = x; then
+	test x$glibcxx_gnu_ld_version = x; then
   enable_symvers=no
 fi
 
@@ -23232,29 +23232,29 @@ return 0
 EOF
 if { (eval echo configure:23234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  glibcpp_shared_libgcc=yes
+  glibcxx_shared_libgcc=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_shared_libgcc=no
+  glibcxx_shared_libgcc=no
 fi
 rm -f conftest*
   CFLAGS="$ac_save_CFLAGS"
-  echo "$ac_t""$glibcpp_shared_libgcc" 1>&6
+  echo "$ac_t""$glibcxx_shared_libgcc" 1>&6
 fi
 
 # For GNU ld, we need at least this version.  It's 2.12 in the same format
-# as the tested-for version.  See GLIBCPP_CHECK_LINKER_FEATURES for more.
-glibcpp_min_gnu_ld_version=21200
+# as the tested-for version.  See GLIBCXX_CHECK_LINKER_FEATURES for more.
+glibcxx_min_gnu_ld_version=21200
 
 # Check to see if unspecified "yes" value can win, given results
 # above.
 if test $enable_symvers = yes ; then
   if test $with_gnu_ld = yes &&
-    test $glibcpp_shared_libgcc = yes ;
+    test $glibcxx_shared_libgcc = yes ;
   then
-    if test $glibcpp_gnu_ld_version -ge $glibcpp_min_gnu_ld_version ; then
+    if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
         enable_symvers=gnu
     else
       ac_test_CFLAGS="${CFLAGS+set}"
@@ -23301,7 +23301,7 @@ case $enable_symvers in
   gnu)
       SYMVER_MAP=config/linker-map.gnu
       cat >> confdefs.h <<\EOF
-#define _GLIBCPP_SYMVER 1
+#define _GLIBCXX_SYMVER 1
 EOF
 
       ;;
@@ -23311,21 +23311,21 @@ esac
 
 
 if test $enable_symvers != no; then
-  GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE=
-  GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE='#'
+  GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE=
+  GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE='#'
 else
-  GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE='#'
-  GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE=
+  GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE='#'
+  GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE=
 fi
 echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
 echo "configure:23322: checking versioning on shared library symbols" >&5
 echo "$ac_t""$enable_symvers" 1>&6
 
 
-# This depends on GLIBCPP_ENABLE_SYMVERS and GLIBCPP_IS_CROSS_COMPILING.
+# This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_CROSS_COMPILING.
 
 
-  if test  x"$GLIBCPP_IS_CROSS_COMPILING" = xfalse; then
+  if test  x"$GLIBCXX_IS_CROSS_COMPILING" = xfalse; then
     # Do checks for memory limit functions.
     
   setrlimit_have_headers=yes
@@ -23388,16 +23388,16 @@ int main() {
 EOF
 if { (eval echo configure:23390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_mresult=1
+  glibcxx_mresult=1
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_mresult=0
+  glibcxx_mresult=0
 fi
 rm -f conftest*
   cat >> confdefs.h <<EOF
-#define HAVE_MEMLIMIT_DATA $glibcpp_mresult
+#define HAVE_MEMLIMIT_DATA $glibcxx_mresult
 EOF
 
 
@@ -23415,16 +23415,16 @@ int main() {
 EOF
 if { (eval echo configure:23417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_mresult=1
+  glibcxx_mresult=1
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_mresult=0
+  glibcxx_mresult=0
 fi
 rm -f conftest*
   cat >> confdefs.h <<EOF
-#define HAVE_MEMLIMIT_RSS $glibcpp_mresult
+#define HAVE_MEMLIMIT_RSS $glibcxx_mresult
 EOF
 
 
@@ -23442,16 +23442,16 @@ int main() {
 EOF
 if { (eval echo configure:23444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_mresult=1
+  glibcxx_mresult=1
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_mresult=0
+  glibcxx_mresult=0
 fi
 rm -f conftest*
   cat >> confdefs.h <<EOF
-#define HAVE_MEMLIMIT_VMEM $glibcpp_mresult
+#define HAVE_MEMLIMIT_VMEM $glibcxx_mresult
 EOF
 
 
@@ -23469,16 +23469,16 @@ int main() {
 EOF
 if { (eval echo configure:23471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_mresult=1
+  glibcxx_mresult=1
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_mresult=0
+  glibcxx_mresult=0
 fi
 rm -f conftest*
   cat >> confdefs.h <<EOF
-#define HAVE_MEMLIMIT_AS $glibcpp_mresult
+#define HAVE_MEMLIMIT_AS $glibcxx_mresult
 EOF
 
 
@@ -23519,7 +23519,7 @@ echo "configure:23519: checking for testsuite memory limit support" >&5
   if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
     ac_mem_limits=yes
     cat >> confdefs.h <<\EOF
-#define _GLIBCPP_MEM_LIMITS 1
+#define _GLIBCXX_MEM_LIMITS 1
 EOF
 
   else
@@ -23532,8 +23532,8 @@ EOF
     
   echo $ac_n "checking for setenv declaration""... $ac_c" 1>&6
 echo "configure:23535: checking for setenv declaration" >&5
-  if test x${glibcpp_cv_func_setenv_use+set} != xset; then
-    if eval "test \"`echo '$''{'glibcpp_cv_func_setenv_use'+set}'`\" = set"; then
+  if test x${glibcxx_cv_func_setenv_use+set} != xset; then
+    if eval "test \"`echo '$''{'glibcxx_cv_func_setenv_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -23555,12 +23555,12 @@ int main() {
 EOF
 if { (eval echo configure:23557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  glibcpp_cv_func_setenv_use=yes
+  glibcxx_cv_func_setenv_use=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  glibcpp_cv_func_setenv_use=no
+  glibcxx_cv_func_setenv_use=no
 fi
 rm -f conftest*
       ac_ext=c
@@ -23574,8 +23574,8 @@ cross_compiling=$ac_cv_prog_cc_cross
 fi
 
   fi
-  echo "$ac_t""$glibcpp_cv_func_setenv_use" 1>&6
-  if test x$glibcpp_cv_func_setenv_use = x"yes"; then
+  echo "$ac_t""$glibcxx_cv_func_setenv_use" 1>&6
+  if test x$glibcxx_cv_func_setenv_use = x"yes"; then
     for ac_func in setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -23636,7 +23636,7 @@ done
   fi
 
   # Export file names for ABI checking.
-  baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
+  baseline_dir="${glibcxx_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
   
 
   # Determine if checking the ABI is desirable.
@@ -23654,20 +23654,20 @@ done
   
 
 if test "$enable_wchar_t" = yes; then
-  GLIBCPP_TEST_WCHAR_T_TRUE=
-  GLIBCPP_TEST_WCHAR_T_FALSE='#'
+  GLIBCXX_TEST_WCHAR_T_TRUE=
+  GLIBCXX_TEST_WCHAR_T_FALSE='#'
 else
-  GLIBCPP_TEST_WCHAR_T_TRUE='#'
-  GLIBCPP_TEST_WCHAR_T_FALSE=
+  GLIBCXX_TEST_WCHAR_T_TRUE='#'
+  GLIBCXX_TEST_WCHAR_T_FALSE=
 fi	
   
 
 if test "$enable_abi_check" = yes; then
-  GLIBCPP_TEST_ABI_TRUE=
-  GLIBCPP_TEST_ABI_FALSE='#'
+  GLIBCXX_TEST_ABI_TRUE=
+  GLIBCXX_TEST_ABI_FALSE='#'
 else
-  GLIBCPP_TEST_ABI_TRUE='#'
-  GLIBCPP_TEST_ABI_FALSE=
+  GLIBCXX_TEST_ABI_TRUE='#'
+  GLIBCXX_TEST_ABI_FALSE=
 fi
 
 
@@ -23696,11 +23696,11 @@ fi
 
 
 if test "$need_libmath" = yes; then
-  GLIBCPP_BUILD_LIBMATH_TRUE=
-  GLIBCPP_BUILD_LIBMATH_FALSE='#'
+  GLIBCXX_BUILD_LIBMATH_TRUE=
+  GLIBCXX_BUILD_LIBMATH_FALSE='#'
 else
-  GLIBCPP_BUILD_LIBMATH_TRUE='#'
-  GLIBCPP_BUILD_LIBMATH_FALSE=
+  GLIBCXX_BUILD_LIBMATH_TRUE='#'
+  GLIBCXX_BUILD_LIBMATH_FALSE=
 fi
  
 cat > confcache <<\EOF
@@ -23759,11 +23759,11 @@ fi
 
 # Export all the install information
 
-# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and
-# exported correctly in GLIBCPP_CONFIGURE.
-glibcpp_toolexecdir=no
-glibcpp_toolexeclibdir=no
-glibcpp_prefixdir=${prefix}
+# Assumes glibcxx_builddir, glibcxx_srcdir are alreay set up and
+# exported correctly in GLIBCXX_CONFIGURE.
+glibcxx_toolexecdir=no
+glibcxx_toolexeclibdir=no
+glibcxx_prefixdir=${prefix}
 
 # Process the option --with-gxx-include-dir=<path to include-files directory>
 echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
@@ -23819,25 +23819,25 @@ if test $version_specific_libs = yes; then
   if test x"$gxx_include_dir" = x"no"; then
     gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/c++
   fi
-  glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-  glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
+  glibcxx_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+  glibcxx_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
 fi
 
-# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
+# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
 # Install a library built with a cross compiler in tooldir, not libdir.
-if test x"$glibcpp_toolexecdir" = x"no"; then
+if test x"$glibcxx_toolexecdir" = x"no"; then
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
-    glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
-    glibcpp_toolexeclibdir='$(toolexecdir)/lib'
+    glibcxx_toolexecdir='$(exec_prefix)/$(target_alias)'
+    glibcxx_toolexeclibdir='$(toolexecdir)/lib'
   else
-    glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-    glibcpp_toolexeclibdir='$(libdir)'
+    glibcxx_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+    glibcxx_toolexeclibdir='$(libdir)'
   fi
   multi_os_directory=`$CC -print-multi-os-directory`
   case $multi_os_directory in
   .) ;; # Avoid trailing /.
-  *) glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/$multi_os_directory ;;
+  *) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
   esac
 fi
 
@@ -23854,7 +23854,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
 # Export all the include and flag information to Makefiles.
 
   # Root level of the build directory include sources.
-  GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
+  GLIBCXX_INCLUDES="-I${glibcxx_builddir}/include/${target_alias} -I${glibcxx_builddir}/include"
 
   # Passed down for canadian crosses.
   if test x"$CANADIAN" = xyes; then
@@ -24050,13 +24050,13 @@ s%@build_alias@%$build_alias%g
 s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
-s%@glibcpp_builddir@%$glibcpp_builddir%g
-s%@glibcpp_srcdir@%$glibcpp_srcdir%g
+s%@glibcxx_builddir@%$glibcxx_builddir%g
+s%@glibcxx_srcdir@%$glibcxx_srcdir%g
 s%@AWK@%$AWK%g
 s%@LN_S@%$LN_S%g
-s%@glibcpp_basedir@%$glibcpp_basedir%g
+s%@glibcxx_basedir@%$glibcxx_basedir%g
 s%@CC@%$CC%g
-s%@glibcpp_CXX@%$glibcpp_CXX%g
+s%@glibcxx_CXX@%$glibcxx_CXX%g
 s%@AS@%$AS%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
@@ -24082,18 +24082,18 @@ s%@enable_shared@%$enable_shared%g
 s%@enable_static@%$enable_static%g
 s%@ifGNUmake@%$ifGNUmake%g
 s%@LIBUNWIND_FLAG@%$LIBUNWIND_FLAG%g
-s%@GLIBCPP_BUILD_PCH_TRUE@%$GLIBCPP_BUILD_PCH_TRUE%g
-s%@GLIBCPP_BUILD_PCH_FALSE@%$GLIBCPP_BUILD_PCH_FALSE%g
-s%@glibcpp_PCHFLAGS@%$glibcpp_PCHFLAGS%g
+s%@GLIBCXX_BUILD_PCH_TRUE@%$GLIBCXX_BUILD_PCH_TRUE%g
+s%@GLIBCXX_BUILD_PCH_FALSE@%$GLIBCXX_BUILD_PCH_FALSE%g
+s%@glibcxx_PCHFLAGS@%$glibcxx_PCHFLAGS%g
 s%@CSTDIO_H@%$CSTDIO_H%g
 s%@FPOS_H@%$FPOS_H%g
 s%@BASIC_FILE_H@%$BASIC_FILE_H%g
 s%@BASIC_FILE_CC@%$BASIC_FILE_CC%g
 s%@CPP@%$CPP%g
 s%@check_msgfmt@%$check_msgfmt%g
-s%@glibcpp_MOFILES@%$glibcpp_MOFILES%g
-s%@glibcpp_POFILES@%$glibcpp_POFILES%g
-s%@glibcpp_localedir@%$glibcpp_localedir%g
+s%@glibcxx_MOFILES@%$glibcxx_MOFILES%g
+s%@glibcxx_POFILES@%$glibcxx_POFILES%g
+s%@glibcxx_localedir@%$glibcxx_localedir%g
 s%@USE_NLS@%$USE_NLS%g
 s%@CLOCALE_H@%$CLOCALE_H%g
 s%@CCODECVT_H@%$CCODECVT_H%g
@@ -24109,16 +24109,16 @@ s%@CTIME_CC@%$CTIME_CC%g
 s%@CLOCALE_CC@%$CLOCALE_CC%g
 s%@CLOCALE_INTERNAL_H@%$CLOCALE_INTERNAL_H%g
 s%@C_INCLUDE_DIR@%$C_INCLUDE_DIR%g
-s%@GLIBCPP_C_HEADERS_C_TRUE@%$GLIBCPP_C_HEADERS_C_TRUE%g
-s%@GLIBCPP_C_HEADERS_C_FALSE@%$GLIBCPP_C_HEADERS_C_FALSE%g
-s%@GLIBCPP_C_HEADERS_C_STD_TRUE@%$GLIBCPP_C_HEADERS_C_STD_TRUE%g
-s%@GLIBCPP_C_HEADERS_C_STD_FALSE@%$GLIBCPP_C_HEADERS_C_STD_FALSE%g
-s%@GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE@%$GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE%g
-s%@GLIBCPP_C_HEADERS_COMPATIBILITY_FALSE@%$GLIBCPP_C_HEADERS_COMPATIBILITY_FALSE%g
-s%@glibcpp_thread_h@%$glibcpp_thread_h%g
+s%@GLIBCXX_C_HEADERS_C_TRUE@%$GLIBCXX_C_HEADERS_C_TRUE%g
+s%@GLIBCXX_C_HEADERS_C_FALSE@%$GLIBCXX_C_HEADERS_C_FALSE%g
+s%@GLIBCXX_C_HEADERS_C_STD_TRUE@%$GLIBCXX_C_HEADERS_C_STD_TRUE%g
+s%@GLIBCXX_C_HEADERS_C_STD_FALSE@%$GLIBCXX_C_HEADERS_C_STD_FALSE%g
+s%@GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@%$GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE%g
+s%@GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE@%$GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE%g
+s%@glibcxx_thread_h@%$glibcxx_thread_h%g
 s%@EXTRA_CXX_FLAGS@%$EXTRA_CXX_FLAGS%g
-s%@GLIBCPP_BUILD_DEBUG_TRUE@%$GLIBCPP_BUILD_DEBUG_TRUE%g
-s%@GLIBCPP_BUILD_DEBUG_FALSE@%$GLIBCPP_BUILD_DEBUG_FALSE%g
+s%@GLIBCXX_BUILD_DEBUG_TRUE@%$GLIBCXX_BUILD_DEBUG_TRUE%g
+s%@GLIBCXX_BUILD_DEBUG_FALSE@%$GLIBCXX_BUILD_DEBUG_FALSE%g
 s%@DEBUG_FLAGS@%$DEBUG_FLAGS%g
 s%@SECTION_FLAGS@%$SECTION_FLAGS%g
 s%@SECTION_LDFLAGS@%$SECTION_LDFLAGS%g
@@ -24126,26 +24126,26 @@ s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g
 s%@LIBMATHOBJS@%$LIBMATHOBJS%g
 s%@WERROR@%$WERROR%g
 s%@SYMVER_MAP@%$SYMVER_MAP%g
-s%@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE%g
-s%@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE%g
+s%@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@%$GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE%g
+s%@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@%$GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE%g
 s%@baseline_dir@%$baseline_dir%g
-s%@GLIBCPP_TEST_WCHAR_T_TRUE@%$GLIBCPP_TEST_WCHAR_T_TRUE%g
-s%@GLIBCPP_TEST_WCHAR_T_FALSE@%$GLIBCPP_TEST_WCHAR_T_FALSE%g
-s%@GLIBCPP_TEST_ABI_TRUE@%$GLIBCPP_TEST_ABI_TRUE%g
-s%@GLIBCPP_TEST_ABI_FALSE@%$GLIBCPP_TEST_ABI_FALSE%g
+s%@GLIBCXX_TEST_WCHAR_T_TRUE@%$GLIBCXX_TEST_WCHAR_T_TRUE%g
+s%@GLIBCXX_TEST_WCHAR_T_FALSE@%$GLIBCXX_TEST_WCHAR_T_FALSE%g
+s%@GLIBCXX_TEST_ABI_TRUE@%$GLIBCXX_TEST_ABI_TRUE%g
+s%@GLIBCXX_TEST_ABI_FALSE@%$GLIBCXX_TEST_ABI_FALSE%g
 s%@ATOMICITY_INC_SRCDIR@%$ATOMICITY_INC_SRCDIR%g
 s%@FPOS_INC_SRCDIR@%$FPOS_INC_SRCDIR%g
 s%@OS_INC_SRCDIR@%$OS_INC_SRCDIR%g
-s%@GLIBCPP_IS_CROSS_COMPILING@%$GLIBCPP_IS_CROSS_COMPILING%g
+s%@GLIBCXX_IS_CROSS_COMPILING@%$GLIBCXX_IS_CROSS_COMPILING%g
 s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
 s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
-s%@GLIBCPP_BUILD_LIBMATH_TRUE@%$GLIBCPP_BUILD_LIBMATH_TRUE%g
-s%@GLIBCPP_BUILD_LIBMATH_FALSE@%$GLIBCPP_BUILD_LIBMATH_FALSE%g
-s%@glibcpp_prefixdir@%$glibcpp_prefixdir%g
+s%@GLIBCXX_BUILD_LIBMATH_TRUE@%$GLIBCXX_BUILD_LIBMATH_TRUE%g
+s%@GLIBCXX_BUILD_LIBMATH_FALSE@%$GLIBCXX_BUILD_LIBMATH_FALSE%g
+s%@glibcxx_prefixdir@%$glibcxx_prefixdir%g
 s%@gxx_include_dir@%$gxx_include_dir%g
-s%@glibcpp_toolexecdir@%$glibcpp_toolexecdir%g
-s%@glibcpp_toolexeclibdir@%$glibcpp_toolexeclibdir%g
-s%@GLIBCPP_INCLUDES@%$GLIBCPP_INCLUDES%g
+s%@glibcxx_toolexecdir@%$glibcxx_toolexecdir%g
+s%@glibcxx_toolexeclibdir@%$glibcxx_toolexeclibdir%g
+s%@GLIBCXX_INCLUDES@%$GLIBCXX_INCLUDES%g
 s%@TOPLEVEL_INCLUDES@%$TOPLEVEL_INCLUDES%g
 s%@LIBMATH_INCLUDES@%$LIBMATH_INCLUDES%g
 s%@LIBSUPCXX_INCLUDES@%$LIBSUPCXX_INCLUDES%g
@@ -24373,7 +24373,7 @@ with_build_subdir=${with_build_subdir}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${multilib_arg} ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-glibcpp_basedir=${glibcpp_basedir}
+glibcxx_basedir=${glibcxx_basedir}
 CC="${CC}"
 CXX="${CXX}"
 ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
@@ -24388,7 +24388,7 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
      # Ony modify Makefiles that are just being created.
      case " $CONFIG_FILES" in
        *" Makefile"*)
-	 ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+	 ac_file=Makefile . ${glibcxx_basedir}/../config-ml.in
 	 ;;
      esac
      case $CONFIG_FILES in
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 0ca0760d59d..a9619ea4d89 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -92,7 +92,7 @@ case "${host_cpu}" in
     try_cpu=sparc
     ;;
   *)
-    if test -d ${glibcpp_srcdir}/config/cpu/${host_cpu}; then
+    if test -d ${glibcxx_srcdir}/config/cpu/${host_cpu}; then
       try_cpu=${host_cpu}
     else
       try_cpu=generic
diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 160a7fec199..4d02007caad 100644
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -16,7 +16,7 @@ AC_SUBST(PACKAGE)
 libtool_VERSION=6:0:0
 AC_SUBST(libtool_VERSION)
 
-GLIBCPP_TOPREL_CONFIGURE
+GLIBCXX_TOPREL_CONFIGURE
 
 # Gets build, host, target, *_vendor, *_cpu, *_os, etc.
 #
@@ -34,8 +34,8 @@ GLIBCPP_TOPREL_CONFIGURE
 AC_CANONICAL_SYSTEM
 
 # Runs configure.host, finds CC, CXX and assorted other critical bits.
-# Must run this before the GLIBCPP_ENABLE_* macros below.
-GLIBCPP_CONFIGURE(.)
+# Must run this before the GLIBCXX_ENABLE_* macros below.
+GLIBCXX_CONFIGURE(.)
 
 AM_INIT_AUTOMAKE($PACKAGE, $gcc_version)
 AM_CONFIG_HEADER(config.h)
@@ -46,25 +46,25 @@ AC_SUBST(enable_shared)
 AC_SUBST(enable_static)
 
 # Check for support bits and g++ features that don't require linking.
-GLIBCPP_CHECK_GNU_MAKE
-#GLIBCPP_CHECK_COMPILER_VERSION
-GLIBCPP_ENABLE_SJLJ_EXCEPTIONS
-GLIBCPP_ENABLE_LIBUNWIND_EXCEPTIONS
-GLIBCPP_ENABLE_PCH([yes])
+GLIBCXX_CHECK_GNU_MAKE
+#GLIBCXX_CHECK_COMPILER_VERSION
+GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
+GLIBCXX_ENABLE_LIBUNWIND_EXCEPTIONS
+GLIBCXX_ENABLE_PCH([yes])
 
 # Enable all the variable C++ runtime options.  
 # NB: C_MBCHAR must come early.
-GLIBCPP_ENABLE_CSTDIO
-GLIBCPP_ENABLE_CLOCALE
-GLIBCPP_ENABLE_CHEADERS([$c_model])
-GLIBCPP_ENABLE_C_MBCHAR([yes])
-GLIBCPP_ENABLE_C99([yes])
-GLIBCPP_ENABLE_LONG_LONG([yes])
-GLIBCPP_ENABLE_THREADS
-GLIBCPP_ENABLE_CONCEPT_CHECKS
-GLIBCPP_ENABLE_CXX_FLAGS
-GLIBCPP_ENABLE_DEBUG([no])
-GLIBCPP_ENABLE_DEBUG_FLAGS([none])
+GLIBCXX_ENABLE_CSTDIO
+GLIBCXX_ENABLE_CLOCALE
+GLIBCXX_ENABLE_CHEADERS([$c_model])
+GLIBCXX_ENABLE_C_MBCHAR([yes])
+GLIBCXX_ENABLE_C99([yes])
+GLIBCXX_ENABLE_LONG_LONG([yes])
+GLIBCXX_ENABLE_THREADS
+GLIBCXX_ENABLE_CONCEPT_CHECKS
+GLIBCXX_ENABLE_CXX_FLAGS
+GLIBCXX_ENABLE_DEBUG([no])
+GLIBCXX_ENABLE_DEBUG_FLAGS([none])
 
 # No surprises, no surprises...
 if test $ATOMICITYH = cpu/generic ; then
@@ -82,13 +82,13 @@ fi
 if test x"$build" != x"$host"; then
 
   # We are being configured with some form of cross compiler.
-  GLIBCPP_IS_CROSS_COMPILING=true
+  GLIBCXX_IS_CROSS_COMPILING=true
 
   # This lets us hard-code the functionality we know we'll have in the cross
   # target environment.  "Let" is a sugar-coated word placed on an especially
   # dull and tedious hack, actually.
   #
-  # Here's why GLIBCPP_CHECK_MATH_SUPPORT, and other autoconf macros
+  # Here's why GLIBCXX_CHECK_MATH_SUPPORT, and other autoconf macros
   # that involve linking, can't be used:
   #    "cannot open sim-crt0.o"
   #    "cannot open crt0.o"
@@ -99,7 +99,7 @@ if test x"$build" != x"$host"; then
   # crosses can be removed.
 
   # If Canadian cross, then don't pick up tools from the build directory.
-  # Used in GLIBCPP_EXPORT_INCLUDES (and nowhere else?).
+  # Used in GLIBCXX_EXPORT_INCLUDES (and nowhere else?).
   if test -n "$with_cross_host" && test x"$build" != x"$with_cross_host" \
     && test x"$build" != x"$target"; then
     CANADIAN=yes
@@ -108,9 +108,9 @@ if test x"$build" != x"$host"; then
   fi
 
   # Construct crosses by hand, eliminating bits that need ld...
-  # GLIBCPP_CHECK_COMPILER_FEATURES
-  # GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
-  # GLIBCPP_CHECK_MATH_SUPPORT
+  # GLIBCXX_CHECK_COMPILER_FEATURES
+  # GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
+  # GLIBCXX_CHECK_MATH_SUPPORT
 
   case "${host}" in
     *-freebsd*)
@@ -121,9 +121,9 @@ if test x"$build" != x"$host"; then
         sys/time.h unistd.h])
       SECTION_FLAGS='-ffunction-sections -fdata-sections'
       AC_SUBST(SECTION_FLAGS) 
-      GLIBCPP_CHECK_LINKER_FEATURES
-      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-      GLIBCPP_CHECK_WCHAR_T_SUPPORT
+      GLIBCXX_CHECK_LINKER_FEATURES
+      GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+      GLIBCXX_CHECK_WCHAR_T_SUPPORT
       AC_DEFINE(HAVE_LC_MESSAGES)
       AC_DEFINE(HAVE_DRAND48)
       AC_DEFINE(HAVE_GETPAGESIZE)
@@ -178,9 +178,9 @@ if test x"$build" != x"$host"; then
         fp.h locale.h float.h inttypes.h])
       SECTION_FLAGS='-ffunction-sections -fdata-sections'
       AC_SUBST(SECTION_FLAGS)
-      GLIBCPP_CHECK_LINKER_FEATURES
-      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-      GLIBCPP_CHECK_WCHAR_T_SUPPORT
+      GLIBCXX_CHECK_LINKER_FEATURES
+      GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+      GLIBCXX_CHECK_WCHAR_T_SUPPORT
       AC_DEFINE(HAVE_COPYSIGN)
       AC_DEFINE(HAVE_COPYSIGNF)
       AC_DEFINE(HAVE_FREXPF)
@@ -203,9 +203,9 @@ if test x"$build" != x"$host"; then
         fp.h locale.h float.h inttypes.h])
       SECTION_FLAGS='-ffunction-sections -fdata-sections'
       AC_SUBST(SECTION_FLAGS)
-      GLIBCPP_CHECK_LINKER_FEATURES
-      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-      GLIBCPP_CHECK_WCHAR_T_SUPPORT
+      GLIBCXX_CHECK_LINKER_FEATURES
+      GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+      GLIBCXX_CHECK_WCHAR_T_SUPPORT
       AC_DEFINE(HAVE_COPYSIGN)
       AC_DEFINE(HAVE_COPYSIGNF)
       AC_DEFINE(HAVE_FINITE)
@@ -228,9 +228,9 @@ if test x"$build" != x"$host"; then
     *-mingw32*)
       os_include_dir="os/mingw32"
       AC_CHECK_HEADERS([sys/types.h locale.h float.h])
-      GLIBCPP_CHECK_LINKER_FEATURES
-      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-      GLIBCPP_CHECK_WCHAR_T_SUPPORT
+      GLIBCXX_CHECK_LINKER_FEATURES
+      GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+      GLIBCXX_CHECK_WCHAR_T_SUPPORT
       ;;
     *-netbsd*)
       os_include_dir="os/bsd/netbsd"
@@ -239,9 +239,9 @@ if test x"$build" != x"$host"; then
         fp.h locale.h float.h inttypes.h])
       SECTION_FLAGS='-ffunction-sections -fdata-sections'
       AC_SUBST(SECTION_FLAGS) 
-      GLIBCPP_CHECK_LINKER_FEATURES
-      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-      GLIBCPP_CHECK_WCHAR_T_SUPPORT
+      GLIBCXX_CHECK_LINKER_FEATURES
+      GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+      GLIBCXX_CHECK_WCHAR_T_SUPPORT
       AC_DEFINE(HAVE_COPYSIGN)
       AC_DEFINE(HAVE_COPYSIGNF)
       AC_DEFINE(HAVE_FINITEF)
@@ -262,9 +262,9 @@ if test x"$build" != x"$host"; then
       os_include_dir="os/qnx/qnx6.1"
       SECTION_FLAGS='-ffunction-sections -fdata-sections'
       AC_SUBST(SECTION_FLAGS) 
-      GLIBCPP_CHECK_LINKER_FEATURES
-      GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-      GLIBCPP_CHECK_WCHAR_T_SUPPORT
+      GLIBCXX_CHECK_LINKER_FEATURES
+      GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+      GLIBCXX_CHECK_WCHAR_T_SUPPORT
       AC_DEFINE(HAVE_COSF)
       AC_DEFINE(HAVE_COSL)
       AC_DEFINE(HAVE_COSHF)
@@ -331,7 +331,7 @@ if test x"$build" != x"$host"; then
         os_include_dir="os/newlib"
         AC_DEFINE(HAVE_HYPOT)
 
-        # GLIBCPP_CHECK_STDLIB_SUPPORT
+        # GLIBCXX_CHECK_STDLIB_SUPPORT
         AC_DEFINE(HAVE_STRTOF)        
         AC_DEFINE(HAVE_STRTOLD)        
         # AC_FUNC_MMAP
@@ -402,7 +402,7 @@ else
   # We are being configured natively. We can do more elaborate tests
   # that include AC_TRY_COMPILE now, as the linker is assumed to be
   # working.
-  GLIBCPP_IS_CROSS_COMPILING=false
+  GLIBCXX_IS_CROSS_COMPILING=false
   CANADIAN=no
 
   # Check for available headers.
@@ -410,18 +410,18 @@ else
   machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h \
   sys/types.h])
 
-  GLIBCPP_CHECK_COMPILER_FEATURES
-  GLIBCPP_CHECK_LINKER_FEATURES
-  GLIBCPP_CHECK_MATH_SUPPORT
-  GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
-  GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
-  GLIBCPP_CHECK_WCHAR_T_SUPPORT
-  GLIBCPP_CHECK_STDLIB_SUPPORT
+  GLIBCXX_CHECK_COMPILER_FEATURES
+  GLIBCXX_CHECK_LINKER_FEATURES
+  GLIBCXX_CHECK_MATH_SUPPORT
+  GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
+  GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+  GLIBCXX_CHECK_WCHAR_T_SUPPORT
+  GLIBCXX_CHECK_STDLIB_SUPPORT
 
   # For showmanyc_helper().
   AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
-  GLIBCPP_CHECK_POLL
-  GLIBCPP_CHECK_S_ISREG_OR_S_IFREG
+  GLIBCXX_CHECK_POLL
+  GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
 
   AC_LC_MESSAGES
 
@@ -434,11 +434,11 @@ else
   AC_FUNC_MMAP
 fi
 
-# This depends on GLIBCPP_CHECK_LINKER_FEATURES, but without it assumes no.
-GLIBCPP_ENABLE_SYMVERS([yes])
+# This depends on GLIBCXX_CHECK_LINKER_FEATURES, but without it assumes no.
+GLIBCXX_ENABLE_SYMVERS([yes])
 
-# This depends on GLIBCPP_ENABLE_SYMVERS and GLIBCPP_IS_CROSS_COMPILING.
-GLIBCPP_CONFIGURE_TESTSUITE
+# This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_CROSS_COMPILING.
+GLIBCXX_CONFIGURE_TESTSUITE
 
 # Propagate the target-specific source directories through the build chain.
 # (Nothing currently uses cpu_include_dir directly; only ATOMICITYH 
@@ -452,10 +452,10 @@ AC_SUBST(OS_INC_SRCDIR)
 
 
 # Determine cross-compile flags and all AM_CONDITIONALs.
-AC_SUBST(GLIBCPP_IS_CROSS_COMPILING)
+AC_SUBST(GLIBCXX_IS_CROSS_COMPILING)
 AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
-dnl from GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT:
-AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH,  test "$need_libmath" = yes)
+dnl from GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT:
+AM_CONDITIONAL(GLIBCXX_BUILD_LIBMATH,  test "$need_libmath" = yes)
  
 AC_CACHE_SAVE
 
@@ -466,11 +466,11 @@ else
 fi
 
 # Export all the install information
-GLIBCPP_EXPORT_INSTALL_INFO
+GLIBCXX_EXPORT_INSTALL_INFO
 
 # Export all the include and flag information to Makefiles.
-GLIBCPP_EXPORT_INCLUDES
-GLIBCPP_EXPORT_FLAGS
+GLIBCXX_EXPORT_INCLUDES
+GLIBCXX_EXPORT_FLAGS
 
 if ${CONFIG_SHELL-/bin/sh} ./libtool --tag CXX --features |
    grep "enable shared" > /dev/null; then
@@ -497,7 +497,7 @@ po/Makefile testsuite/Makefile scripts/check_survey scripts/testsuite_flags,
      # Ony modify Makefiles that are just being created.
      case " $CONFIG_FILES" in
        *" Makefile"*)
-	 ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+	 ac_file=Makefile . ${glibcxx_basedir}/../config-ml.in
 	 ;;
      esac
      case $CONFIG_FILES in
@@ -527,7 +527,7 @@ with_build_subdir=${with_build_subdir}
 with_multisubdir=${with_multisubdir}
 ac_configure_args="${multilib_arg} ${ac_configure_args}"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-glibcpp_basedir=${glibcpp_basedir}
+glibcxx_basedir=${glibcxx_basedir}
 CC="${CC}"
 CXX="${CXX}"
 ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}"
@@ -543,7 +543,7 @@ dnl  [if test -n "$CONFIG_FILES"; then
 dnl    # Ony modify Makefiles that are just being created.
 dnl    case " $CONFIG_FILES" in
 dnl      *" Makefile"*)
-dnl        ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+dnl        ac_file=Makefile . ${glibcxx_basedir}/../config-ml.in
 dnl        ;;
 dnl    esac
 dnl    case $CONFIG_FILES in
@@ -571,7 +571,7 @@ dnl  target=${target}
 dnl  with_multisubdir=${with_multisubdir}
 dnl  ac_configure_args="${multilib_arg} ${ac_configure_args}"
 dnl  CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-dnl  glibcpp_basedir=${glibcpp_basedir}
+dnl  glibcxx_basedir=${glibcxx_basedir}
 dnl  CC="${CC}"
 dnl  CXX="${CXX}"
 dnl  )
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 4c62208f535..20b7025a050 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -27,16 +27,16 @@ MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 # Cross compiler and multilib support.
-CXX = @glibcpp_CXX@
-glibcpp_srcdir=@glibcpp_srcdir@
-glibcpp_builddir=@glibcpp_builddir@
+CXX = @glibcxx_CXX@
+glibcxx_srcdir=@glibcxx_srcdir@
+glibcxx_builddir=@glibcxx_builddir@
 
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
-INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
+INCLUDES = -nostdinc++ $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES)
 
 # Standard C++ includes.
-std_srcdir = ${glibcpp_srcdir}/include/std
+std_srcdir = ${glibcxx_srcdir}/include/std
 std_builddir = .
 std_headers = \
 	${std_srcdir}/std_algorithm.h \
@@ -100,7 +100,7 @@ std_headers_rename = \
 	valarray \
 	vector
 
-bits_srcdir = ${glibcpp_srcdir}/include/bits
+bits_srcdir = ${glibcxx_srcdir}/include/bits
 bits_builddir = ./bits
 bits_headers = \
 	${bits_srcdir}/allocator.h \
@@ -169,7 +169,7 @@ bits_headers = \
 	${bits_srcdir}/valarray_after.h \
 	${bits_srcdir}/vector.tcc
 
-backward_srcdir = ${glibcpp_srcdir}/include/backward
+backward_srcdir = ${glibcxx_srcdir}/include/backward
 backward_builddir = ./backward
 backward_headers = \
 	${backward_srcdir}/complex.h \
@@ -209,7 +209,7 @@ backward_headers = \
 	${backward_srcdir}/strstream \
 	${backward_srcdir}/backward_warning.h
 
-ext_srcdir = ${glibcpp_srcdir}/include/ext
+ext_srcdir = ${glibcxx_srcdir}/include/ext
 ext_builddir = ./ext
 ext_headers = \
 	${ext_srcdir}/algorithm \
@@ -278,7 +278,7 @@ c_base_headers_rename = \
 	cwctype 
 
 # "C" compatibility headers.
-c_compatibility_srcdir = ${glibcpp_srcdir}/include/c_compatibility
+c_compatibility_srcdir = ${glibcxx_srcdir}/include/c_compatibility
 c_compatibility_builddir = .
 c_compatibility_headers = \
 	${c_compatibility_srcdir}/assert.h \
@@ -303,31 +303,31 @@ c_compatibility_headers = \
 # Some of the different "C" header models need extra files.
 # Some "C" header schemes require the "C" compatibility headers.
 # For --enable-cheaders=c_std
-if GLIBCPP_C_HEADERS_C_STD
+if GLIBCXX_C_HEADERS_C_STD
 c_base_headers_extra = ${c_base_srcdir}/cmath.tcc 
 else
 c_base_headers_extra = 
 endif
 
-if GLIBCPP_C_HEADERS_COMPATIBILITY
+if GLIBCXX_C_HEADERS_COMPATIBILITY
 c_compatibility_headers_extra = ${c_compatibility_headers}
 else
 c_compatibility_headers_extra = 
 endif
 
-host_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
+host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@
 host_builddir = ./${host_alias}/bits
 host_headers = \
 	${host_srcdir}/ctype_base.h \
 	${host_srcdir}/ctype_inline.h \
 	${host_srcdir}/ctype_noninline.h \
 	${host_srcdir}/os_defines.h \
-	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
-	${glibcpp_srcdir}/@FPOS_INC_SRCDIR@/fpos.h 
+	${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
+	${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h 
 
 # Non-installed host_header files.
 host_headers_noinst = \
-	${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@
+	${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@
 
 # These host_headers_extra files are all built with ad hoc naming rules.
 host_headers_extra = \
@@ -347,9 +347,9 @@ thread_host_headers = \
 
 pch_input = ${host_builddir}/stdc++.h
 pch_output_builddir = ${host_builddir}/stdc++.h.gch
-pch_source = ${glibcpp_srcdir}/include/stdc++.h
+pch_source = ${glibcxx_srcdir}/include/stdc++.h
 PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
-if GLIBCPP_BUILD_PCH
+if GLIBCXX_BUILD_PCH
 pch_build = ${pch_input}
 pch_install = install-pch
 else
@@ -452,57 +452,57 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
 	@if [ ! -f stamp-host ]; then \
 	  (cd ${host_builddir} ;\
 	  @LN_S@ ${host_headers} . || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CTIME_H@ time_members.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
+	  @LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
 	  echo `date` > stamp-host ; \
 	fi
 
 # Host includes dynamic.
 ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-				${glibcpp_srcdir}/include/bits/c++config \
+				${glibcxx_srcdir}/include/bits/c++config \
 				stamp-${host_alias}
-	@cat ${glibcpp_srcdir}/include/bits/c++config > $@ ;\
-	sed -e 's/HAVE_/_GLIBCPP_HAVE_/g' \
-	    -e 's/PACKAGE/_GLIBCPP_PACKAGE/g' \
-	    -e 's/VERSION/_GLIBCPP_VERSION/g' \
-	    -e 's/WORDS_/_GLIBCPP_WORDS_/g' \
+	@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+	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' \
 	    < ${CONFIG_HEADER} >> $@ ;\
-	echo "#endif // _CPP_CPPCONFIG_" >>$@
+	echo "#endif // _CXXCONFIG_" >>$@
 
 # Host includes for threads
-glibcpp_thread_h = @glibcpp_thread_h@
+glibcxx_thread_h = @glibcxx_thread_h@
 uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 
 ${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
-	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
+	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < ${toplevel_srcdir}/gcc/gthr.h > $@
 
 ${host_builddir}/gthr-single.h: ${toplevel_srcdir}/gcc/gthr-single.h \
 				  stamp-${host_alias}
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
 	    < ${toplevel_srcdir}/gcc/gthr-single.h > $@
 
 ${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/gcc/gthr-posix.h \
 				   stamp-${host_alias}
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    -e 's/\(${uppercase}*WEAK\)/_GLIBCXX_\1/g' \
 	    < ${toplevel_srcdir}/gcc/gthr-posix.h > $@
 
-${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \
+${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \
 				   stamp-${host_alias}
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    -e 's/\(${uppercase}*WEAK\)/_GLIBCXX_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
-	    < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
+	    < ${toplevel_srcdir}/gcc/${glibcxx_thread_h} > $@
 
 # Build a precompiled C++ include, stdc++.h.gch.
 ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source}
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 93369a3131c..b29b37c1990 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -95,7 +95,7 @@ FPOS_H = @FPOS_H@
 FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
@@ -124,15 +124,15 @@ baseline_dir = @baseline_dir@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
 toplevel_srcdir = @toplevel_srcdir@
@@ -143,16 +143,16 @@ MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 # Cross compiler and multilib support.
-CXX = @glibcpp_CXX@
-glibcpp_srcdir = @glibcpp_srcdir@
-glibcpp_builddir = @glibcpp_builddir@
+CXX = @glibcxx_CXX@
+glibcxx_srcdir = @glibcxx_srcdir@
+glibcxx_builddir = @glibcxx_builddir@
 
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
-INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
+INCLUDES = -nostdinc++ $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES)
 
 # Standard C++ includes.
-std_srcdir = ${glibcpp_srcdir}/include/std
+std_srcdir = ${glibcxx_srcdir}/include/std
 std_builddir = .
 std_headers = \
 	${std_srcdir}/std_algorithm.h \
@@ -218,7 +218,7 @@ std_headers_rename = \
 	vector
 
 
-bits_srcdir = ${glibcpp_srcdir}/include/bits
+bits_srcdir = ${glibcxx_srcdir}/include/bits
 bits_builddir = ./bits
 bits_headers = \
 	${bits_srcdir}/allocator.h \
@@ -288,7 +288,7 @@ bits_headers = \
 	${bits_srcdir}/vector.tcc
 
 
-backward_srcdir = ${glibcpp_srcdir}/include/backward
+backward_srcdir = ${glibcxx_srcdir}/include/backward
 backward_builddir = ./backward
 backward_headers = \
 	${backward_srcdir}/complex.h \
@@ -329,7 +329,7 @@ backward_headers = \
 	${backward_srcdir}/backward_warning.h
 
 
-ext_srcdir = ${glibcpp_srcdir}/include/ext
+ext_srcdir = ${glibcxx_srcdir}/include/ext
 ext_builddir = ./ext
 ext_headers = \
 	${ext_srcdir}/algorithm \
@@ -400,7 +400,7 @@ c_base_headers_rename = \
 
 
 # "C" compatibility headers.
-c_compatibility_srcdir = ${glibcpp_srcdir}/include/c_compatibility
+c_compatibility_srcdir = ${glibcxx_srcdir}/include/c_compatibility
 c_compatibility_builddir = .
 c_compatibility_headers = \
 	${c_compatibility_srcdir}/assert.h \
@@ -422,25 +422,25 @@ c_compatibility_headers = \
 	${c_compatibility_srcdir}/wchar.h \
 	${c_compatibility_srcdir}/wctype.h 
 
-@GLIBCPP_C_HEADERS_C_STD_TRUE@c_base_headers_extra = @GLIBCPP_C_HEADERS_C_STD_TRUE@${c_base_srcdir}/cmath.tcc 
-@GLIBCPP_C_HEADERS_C_STD_FALSE@c_base_headers_extra = 
-@GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = @GLIBCPP_C_HEADERS_COMPATIBILITY_TRUE@${c_compatibility_headers}
-@GLIBCPP_C_HEADERS_COMPATIBILITY_FALSE@c_compatibility_headers_extra = 
+@GLIBCXX_C_HEADERS_C_STD_TRUE@c_base_headers_extra = @GLIBCXX_C_HEADERS_C_STD_TRUE@${c_base_srcdir}/cmath.tcc 
+@GLIBCXX_C_HEADERS_C_STD_FALSE@c_base_headers_extra = 
+@GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@${c_compatibility_headers}
+@GLIBCXX_C_HEADERS_COMPATIBILITY_FALSE@c_compatibility_headers_extra = 
 
-host_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
+host_srcdir = ${glibcxx_srcdir}/@OS_INC_SRCDIR@
 host_builddir = ./${host_alias}/bits
 host_headers = \
 	${host_srcdir}/ctype_base.h \
 	${host_srcdir}/ctype_inline.h \
 	${host_srcdir}/ctype_noninline.h \
 	${host_srcdir}/os_defines.h \
-	${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
-	${glibcpp_srcdir}/@FPOS_INC_SRCDIR@/fpos.h 
+	${glibcxx_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
+	${glibcxx_srcdir}/@FPOS_INC_SRCDIR@/fpos.h 
 
 
 # Non-installed host_header files.
 host_headers_noinst = \
-	${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@
+	${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@
 
 
 # These host_headers_extra files are all built with ad hoc naming rules.
@@ -463,12 +463,12 @@ thread_host_headers = \
 
 pch_input = ${host_builddir}/stdc++.h
 pch_output_builddir = ${host_builddir}/stdc++.h.gch
-pch_source = ${glibcpp_srcdir}/include/stdc++.h
+pch_source = ${glibcxx_srcdir}/include/stdc++.h
 PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
-@GLIBCPP_BUILD_PCH_TRUE@pch_build = @GLIBCPP_BUILD_PCH_TRUE@${pch_input}
-@GLIBCPP_BUILD_PCH_FALSE@pch_build = 
-@GLIBCPP_BUILD_PCH_TRUE@pch_install = @GLIBCPP_BUILD_PCH_TRUE@install-pch
-@GLIBCPP_BUILD_PCH_FALSE@pch_install = 
+@GLIBCXX_BUILD_PCH_TRUE@pch_build = @GLIBCXX_BUILD_PCH_TRUE@${pch_input}
+@GLIBCXX_BUILD_PCH_FALSE@pch_build = 
+@GLIBCXX_BUILD_PCH_TRUE@pch_install = @GLIBCXX_BUILD_PCH_TRUE@install-pch
+@GLIBCXX_BUILD_PCH_FALSE@pch_install = 
 
 # List of all timestamp files.  By keeping only one copy of this list, both
 # CLEANFILES and all-local are kept up-to-date.
@@ -486,7 +486,7 @@ allcreated = \
 
 
 # Host includes for threads
-glibcpp_thread_h = @glibcpp_thread_h@
+glibcxx_thread_h = @glibcxx_thread_h@
 uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 
 # For robustness sake (in light of junk files or in-source
@@ -686,53 +686,53 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
 	@if [ ! -f stamp-host ]; then \
 	  (cd ${host_builddir} ;\
 	  @LN_S@ ${host_headers} . || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CTIME_H@ time_members.h || true ;\
-	  @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
+	  @LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_H@ basic_file.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CSTDIO_H@ c++io.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CLOCALE_H@ c++locale.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CLOCALE_INTERNAL_H@ . || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CTIME_H@ time_members.h || true ;\
+	  @LN_S@ ${glibcxx_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true);\
 	  echo `date` > stamp-host ; \
 	fi
 
 # Host includes dynamic.
 ${host_builddir}/c++config.h: ${CONFIG_HEADER} \
-				${glibcpp_srcdir}/include/bits/c++config \
+				${glibcxx_srcdir}/include/bits/c++config \
 				stamp-${host_alias}
-	@cat ${glibcpp_srcdir}/include/bits/c++config > $@ ;\
-	sed -e 's/HAVE_/_GLIBCPP_HAVE_/g' \
-	    -e 's/PACKAGE/_GLIBCPP_PACKAGE/g' \
-	    -e 's/VERSION/_GLIBCPP_VERSION/g' \
-	    -e 's/WORDS_/_GLIBCPP_WORDS_/g' \
+	@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+	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' \
 	    < ${CONFIG_HEADER} >> $@ ;\
-	echo "#endif // _CPP_CPPCONFIG_" >>$@
+	echo "#endif // _CXXCONFIG_" >>$@
 
 ${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
-	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCPP_\1/g' \
+	sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
 	    < ${toplevel_srcdir}/gcc/gthr.h > $@
 
 ${host_builddir}/gthr-single.h: ${toplevel_srcdir}/gcc/gthr-single.h \
 				  stamp-${host_alias}
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
 	    < ${toplevel_srcdir}/gcc/gthr-single.h > $@
 
 ${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/gcc/gthr-posix.h \
 				   stamp-${host_alias}
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    -e 's/\(${uppercase}*WEAK\)/_GLIBCXX_\1/g' \
 	    < ${toplevel_srcdir}/gcc/gthr-posix.h > $@
 
-${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \
+${host_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcxx_thread_h} \
 				   stamp-${host_alias}
-	sed -e 's/\(UNUSED\)/_GLIBCPP_\1/g' \
-	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCPP_\1/g' \
-	    -e 's/\(${uppercase}*WEAK\)/_GLIBCPP_\1/g' \
+	sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \
+	    -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \
+	    -e 's/\(${uppercase}*WEAK\)/_GLIBCXX_\1/g' \
 	    -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
-	    < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@
+	    < ${toplevel_srcdir}/gcc/${glibcxx_thread_h} > $@
 
 # Build a precompiled C++ include, stdc++.h.gch.
 ${pch_input}: ${allstamped} ${host_builddir}/c++config.h ${pch_source}
diff --git a/libstdc++-v3/include/backward/algo.h b/libstdc++-v3/include/backward/algo.h
index a3554a8f8d0..a56a1b38491 100644
--- a/libstdc++-v3/include/backward/algo.h
+++ b/libstdc++-v3/include/backward/algo.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_ALGO_H
-#define _CPP_BACKWARD_ALGO_H 1
+#ifndef _BACKWARD_ALGO_H
+#define _BACKWARD_ALGO_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -142,7 +142,7 @@ using __gnu_cxx::count_if;   // Extension returning void
 using __gnu_cxx::power; 
 using __gnu_cxx::iota; 
 
-#endif /* _CPP_BACKWARD_ALGO_H */
+#endif /* _BACKWARD_ALGO_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/algobase.h b/libstdc++-v3/include/backward/algobase.h
index 1606559828f..4cf82520d64 100644
--- a/libstdc++-v3/include/backward/algobase.h
+++ b/libstdc++-v3/include/backward/algobase.h
@@ -52,8 +52,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_ALGOBASE_H
-#define _CPP_BACKWARD_ALGOBASE_H 1
+#ifndef _BACKWARD_ALGOBASE_H
+#define _BACKWARD_ALGOBASE_H 1
 
 #include "backward_warning.h"
 #include "pair.h"
@@ -88,7 +88,7 @@ using __gnu_cxx::lexicographical_compare_3way;
 // Names from ext/memory
 using __gnu_cxx::uninitialized_copy_n;
 
-#endif /* _CPP_BACKWARD_ALGOBASE_H */
+#endif /* _BACKWARD_ALGOBASE_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/alloc.h b/libstdc++-v3/include/backward/alloc.h
index b748ef26c01..5781192bb33 100644
--- a/libstdc++-v3/include/backward/alloc.h
+++ b/libstdc++-v3/include/backward/alloc.h
@@ -40,8 +40,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_ALLOC_H
-#define _CPP_BACKWARD_ALLOC_H 1
+#ifndef _BACKWARD_ALLOC_H
+#define _BACKWARD_ALLOC_H 1
 
 #include "backward_warning.h"
 #include <bits/c++config.h>
diff --git a/libstdc++-v3/include/backward/backward_warning.h b/libstdc++-v3/include/backward/backward_warning.h
index 0f007bf364a..9e1377793ea 100644
--- a/libstdc++-v3/include/backward/backward_warning.h
+++ b/libstdc++-v3/include/backward/backward_warning.h
@@ -25,15 +25,15 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_BACKWARD_WARNING_H
-#define _CPP_BACKWARD_BACKWARD_WARNING_H 1
+#ifndef _BACKWARD_BACKWARD_WARNING_H
+#define _BACKWARD_BACKWARD_WARNING_H 1
 
 #ifdef __DEPRECATED
 #warning This file includes at least one deprecated or antiquated header. \
 Please consider using one of the 32 headers found in section 17.4.1.2 of the \
 C++ standard. Examples include substituting the <X> header for the <X.h> \
-header for C++ includes, or <sstream> instead of the deprecated header \
-<strstream.h>. To disable this warning use -Wno-deprecated.
+header for C++ includes, or <iostream> instead of the deprecated header \
+<iostream.h>. To disable this warning use -Wno-deprecated.
 #endif
 
 #endif
diff --git a/libstdc++-v3/include/backward/bvector.h b/libstdc++-v3/include/backward/bvector.h
index b114052933a..5d12914525e 100644
--- a/libstdc++-v3/include/backward/bvector.h
+++ b/libstdc++-v3/include/backward/bvector.h
@@ -53,16 +53,15 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef __SGI_STL_BVECTOR_H
-#define __SGI_STL_BVECTOR_H
-
+#ifndef _BACKWARD_BVECTOR_H
+#define _BACKWARD_BVECTOR_H 1
 
 #include "backward_warning.h"
 #include <vector>
 
 using std::bit_vector;
 
-#endif /* __SGI_STL_BVECTOR_H */
+#endif /* _BACKWARD_BVECTOR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/complex.h b/libstdc++-v3/include/backward/complex.h
index 0e721744a6b..589fac73fce 100644
--- a/libstdc++-v3/include/backward/complex.h
+++ b/libstdc++-v3/include/backward/complex.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_COMPLEX_H
-#define _CPP_BACKWARD_COMPLEX_H 1
+#ifndef _BACKWARD_COMPLEX_H
+#define _BACKWARD_COMPLEX_H 1
 
 #include "backward_warning.h"
 #include <complex>
diff --git a/libstdc++-v3/include/backward/defalloc.h b/libstdc++-v3/include/backward/defalloc.h
index 264e2967c3c..98987fd0c0f 100644
--- a/libstdc++-v3/include/backward/defalloc.h
+++ b/libstdc++-v3/include/backward/defalloc.h
@@ -52,8 +52,8 @@
 // Standard-conforming allocators have a very different interface.  The
 // standard default allocator is declared in the header <memory>.
 
-#ifndef _CPP_BACKWARD_DEFALLOC_H
-#define _CPP_BACKWARD_DEFALLOC_H 1
+#ifndef _BACKWARD_DEFALLOC_H
+#define _BACKWARD_DEFALLOC_H 1
 
 #include "backward_warning.h"
 #include "new.h"
@@ -114,4 +114,4 @@ public:
 
 
 
-#endif /* _CPP_BACKWARD_DEFALLOC_H */
+#endif /* _BACKWARD_DEFALLOC_H */
diff --git a/libstdc++-v3/include/backward/deque.h b/libstdc++-v3/include/backward/deque.h
index 983ae07bac7..36c7479ef09 100644
--- a/libstdc++-v3/include/backward/deque.h
+++ b/libstdc++-v3/include/backward/deque.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_DEQUE_H
-#define _CPP_BACKWARD_DEQUE_H 1
+#ifndef _BACKWARD_DEQUE_H
+#define _BACKWARD_DEQUE_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -63,7 +63,7 @@
 
 using std::deque;
 
-#endif /* _CPP_BACKWARD_DEQUE_H */
+#endif /* _BACKWARD_DEQUE_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/fstream.h b/libstdc++-v3/include/backward/fstream.h
index 44461f464dd..6dfd514c2f3 100644
--- a/libstdc++-v3/include/backward/fstream.h
+++ b/libstdc++-v3/include/backward/fstream.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_FSTREAM_H
-#define _CPP_BACKWARD_FSTREAM_H 1
+#ifndef _BACKWARD_FSTREAM_H
+#define _BACKWARD_FSTREAM_H 1
 
 #include "backward_warning.h"
 #include <fstream>
@@ -37,7 +37,7 @@ using std::ofstream;
 using std::fstream;
 using std::streampos;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 using std::wfilebuf;
 using std::wifstream;
 using std::wofstream;
diff --git a/libstdc++-v3/include/backward/function.h b/libstdc++-v3/include/backward/function.h
index bc96f49ffab..19f29c81326 100644
--- a/libstdc++-v3/include/backward/function.h
+++ b/libstdc++-v3/include/backward/function.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_FUNCTION_H
-#define _CPP_BACKWARD_FUNCTION_H 1
+#ifndef _BACKWARD_FUNCTION_H
+#define _BACKWARD_FUNCTION_H 1
 
 #include "backward_warning.h"
 #include <bits/c++config.h>
@@ -123,7 +123,7 @@ using __gnu_cxx::subtractive_rng;
 using __gnu_cxx::mem_fun1; 
 using __gnu_cxx::mem_fun1_ref; 
 
-#endif /* _CPP_BACKWARD_FUNCTION_H */
+#endif /* _BACKWARD_FUNCTION_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/hash_map.h b/libstdc++-v3/include/backward/hash_map.h
index 25c177abb16..bc9c1482c8a 100644
--- a/libstdc++-v3/include/backward/hash_map.h
+++ b/libstdc++-v3/include/backward/hash_map.h
@@ -53,8 +53,8 @@
  *
  */
 
-#ifndef _CPP_BACKWARD_HASH_MAP_H
-#define _CPP_BACKWARD_HASH_MAP_H 1
+#ifndef _BACKWARD_HASH_MAP_H
+#define _BACKWARD_HASH_MAP_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -65,7 +65,7 @@ using __gnu_cxx::hashtable;
 using __gnu_cxx::hash_map;
 using __gnu_cxx::hash_multimap;
 
-#endif /* _CPP_BACKWARD_HASH_MAP_H */
+#endif /* _BACKWARD_HASH_MAP_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/hash_set.h b/libstdc++-v3/include/backward/hash_set.h
index ddb7a755e56..89307de0402 100644
--- a/libstdc++-v3/include/backward/hash_set.h
+++ b/libstdc++-v3/include/backward/hash_set.h
@@ -53,8 +53,8 @@
  *
  */
 
-#ifndef _CPP_BACKWARD_HASH_SET_H
-#define _CPP_BACKWARD_HASH_SET_H 1
+#ifndef _BACKWARD_HASH_SET_H
+#define _BACKWARD_HASH_SET_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -65,5 +65,5 @@ using __gnu_cxx::hashtable;
 using __gnu_cxx::hash_set;
 using __gnu_cxx::hash_multiset;
 
-#endif /* _CPP_BACKWARD_HASH_SET_H */
+#endif /* _BACKWARD_HASH_SET_H */
 
diff --git a/libstdc++-v3/include/backward/hashtable.h b/libstdc++-v3/include/backward/hashtable.h
index a707d9e2522..abedd55b001 100644
--- a/libstdc++-v3/include/backward/hashtable.h
+++ b/libstdc++-v3/include/backward/hashtable.h
@@ -57,8 +57,8 @@
  *   You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BACKWARD_HASHTABLE_H
-#define _CPP_BACKWARD_HASHTABLE_H 1
+#ifndef _BACKWARD_HASHTABLE_H
+#define _BACKWARD_HASHTABLE_H 1
 
 #include "backward_warning.h"
 #include <ext/hashtable.h>
@@ -69,7 +69,7 @@
 using __gnu_cxx::hash;
 using __gnu_cxx::hashtable;
 
-#endif /* _CPP_BACKWARD_HASHTABLE_H */
+#endif /* _BACKWARD_HASHTABLE_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/heap.h b/libstdc++-v3/include/backward/heap.h
index 9308f0e7267..2f19545d0d7 100644
--- a/libstdc++-v3/include/backward/heap.h
+++ b/libstdc++-v3/include/backward/heap.h
@@ -52,8 +52,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_HEAP_H
-#define _CPP_BACKWARD_HEAP_H 1
+#ifndef _BACKWARD_HEAP_H
+#define _BACKWARD_HEAP_H 1
 
 #include "backward_warning.h"
 #include <bits/c++config.h>
@@ -64,7 +64,7 @@ using std::pop_heap;
 using std::make_heap;
 using std::sort_heap;
 
-#endif /* _CPP_BACKWARD_HEAP_H */
+#endif /* _BACKWARD_HEAP_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/iomanip.h b/libstdc++-v3/include/backward/iomanip.h
index 53286cda494..160dbebcdbf 100644
--- a/libstdc++-v3/include/backward/iomanip.h
+++ b/libstdc++-v3/include/backward/iomanip.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_IOMANIP_H
-#define _CPP_BACKWARD_IOMANIP_H 1
+#ifndef _BACKWARD_IOMANIP_H
+#define _BACKWARD_IOMANIP_H 1
 
 #include "backward_warning.h"
 #include "iostream.h"
diff --git a/libstdc++-v3/include/backward/iostream.h b/libstdc++-v3/include/backward/iostream.h
index 5346d9d22e8..5a5ccea62b7 100644
--- a/libstdc++-v3/include/backward/iostream.h
+++ b/libstdc++-v3/include/backward/iostream.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_IOSTREAM_H
-#define _CPP_BACKWARD_IOSTREAM_H 1
+#ifndef _BACKWARD_IOSTREAM_H
+#define _BACKWARD_IOSTREAM_H 1
 
 #include "backward_warning.h"
 #include <iostream>
@@ -41,7 +41,7 @@ using std::cout;
 using std::cin;
 using std::cerr;
 using std::clog;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 using std::wcout;
 using std::wcin;
 using std::wcerr;
diff --git a/libstdc++-v3/include/backward/istream.h b/libstdc++-v3/include/backward/istream.h
index 059e7742e2f..707b575a5bd 100644
--- a/libstdc++-v3/include/backward/istream.h
+++ b/libstdc++-v3/include/backward/istream.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_ISTREAM_H
-#define _CPP_BACKWARD_ISTREAM_H 1
+#ifndef _BACKWARD_ISTREAM_H
+#define _BACKWARD_ISTREAM_H 1
 
 #include "backward_warning.h"
 #include "iostream.h"
diff --git a/libstdc++-v3/include/backward/iterator.h b/libstdc++-v3/include/backward/iterator.h
index 179f457d324..4100049ee24 100644
--- a/libstdc++-v3/include/backward/iterator.h
+++ b/libstdc++-v3/include/backward/iterator.h
@@ -24,8 +24,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_ITERATOR_H
-#define _CPP_BACKWARD_ITERATOR_H 1
+#ifndef _BACKWARD_ITERATOR_H
+#define _BACKWARD_ITERATOR_H 1
 
 #include "backward_warning.h"
 #include "function.h"
@@ -155,7 +155,7 @@ template <class _ForwardIterator>
 // Names from stl_raw_storage_iter.h
 using std::raw_storage_iterator;
 
-#endif /* _CPP_BACKWARD_ITERATOR_H */
+#endif /* _BACKWARD_ITERATOR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/list.h b/libstdc++-v3/include/backward/list.h
index 350a92a0991..00c11a6987d 100644
--- a/libstdc++-v3/include/backward/list.h
+++ b/libstdc++-v3/include/backward/list.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_LIST_H
-#define _CPP_BACKWARD_LIST_H 1
+#ifndef _BACKWARD_LIST_H
+#define _BACKWARD_LIST_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -63,7 +63,7 @@
 
 using std::list;
 
-#endif /* _CPP_BACKWARD_LIST_H */
+#endif /* _BACKWARD_LIST_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/map.h b/libstdc++-v3/include/backward/map.h
index 00f606d7e32..56d5c69973b 100644
--- a/libstdc++-v3/include/backward/map.h
+++ b/libstdc++-v3/include/backward/map.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_MAP_H
-#define _CPP_BACKWARD_MAP_H 1
+#ifndef _BACKWARD_MAP_H
+#define _BACKWARD_MAP_H 1
 
 #include "backward_warning.h"
 #include "tree.h"
@@ -62,7 +62,7 @@
 
 using std::map;
 
-#endif /* _CPP_BACKWARD_MAP_H */
+#endif /* _BACKWARD_MAP_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/multimap.h b/libstdc++-v3/include/backward/multimap.h
index b9cdc848360..aba42f7217f 100644
--- a/libstdc++-v3/include/backward/multimap.h
+++ b/libstdc++-v3/include/backward/multimap.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_MULTIMAP_H
-#define _CPP_BACKWARD_MULTIMAP_H 1
+#ifndef _BACKWARD_MULTIMAP_H
+#define _BACKWARD_MULTIMAP_H 1
 
 #include "backward_warning.h"
 #include "tree.h"
@@ -62,7 +62,7 @@
 
 using std::multimap;
 
-#endif /* _CPP_BACKWARD_MULTIMAP_H */
+#endif /* _BACKWARD_MULTIMAP_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/multiset.h b/libstdc++-v3/include/backward/multiset.h
index 8aa7fd34157..7ec0c9476c9 100644
--- a/libstdc++-v3/include/backward/multiset.h
+++ b/libstdc++-v3/include/backward/multiset.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_MULTISET_H
-#define _CPP_BACKWARD_MULTISET_H 1
+#ifndef _BACKWARD_MULTISET_H
+#define _BACKWARD_MULTISET_H 1
 
 #include "backward_warning.h"
 #include "tree.h"
@@ -62,7 +62,7 @@
 
 using std::multiset;
 
-#endif /* _CPP_BACKWARD_MULTISET_H */
+#endif /* _BACKWARD_MULTISET_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/new.h b/libstdc++-v3/include/backward/new.h
index 556ab1fc2ec..e39f97ae6b2 100644
--- a/libstdc++-v3/include/backward/new.h
+++ b/libstdc++-v3/include/backward/new.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_NEW_H
-#define _CPP_BACKWARD_NEW_H 1
+#ifndef _BACKWARD_NEW_H
+#define _BACKWARD_NEW_H 1
 
 #include "backward_warning.h"
 #include <new>
diff --git a/libstdc++-v3/include/backward/ostream.h b/libstdc++-v3/include/backward/ostream.h
index 4c74756192e..2a65929f97a 100644
--- a/libstdc++-v3/include/backward/ostream.h
+++ b/libstdc++-v3/include/backward/ostream.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_OSTREAM_H
-#define _CPP_BACKWARD_OSTREAM_H 1
+#ifndef _BACKWARD_OSTREAM_H
+#define _BACKWARD_OSTREAM_H 1
 
 #include "backward_warning.h"
 #include "iostream.h"
diff --git a/libstdc++-v3/include/backward/pair.h b/libstdc++-v3/include/backward/pair.h
index f0ff7d7d689..cbb3bc7ed6d 100644
--- a/libstdc++-v3/include/backward/pair.h
+++ b/libstdc++-v3/include/backward/pair.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_PAIR_H
-#define _CPP_BACKWARD_PAIR_H 1
+#ifndef _BACKWARD_PAIR_H
+#define _BACKWARD_PAIR_H 1
 
 #include "backward_warning.h"
 #include <bits/c++config.h>
@@ -63,7 +63,7 @@
 using std::pair;
 using std::make_pair;
 
-#endif /* _CPP_BACKWARD_PAIR_H */
+#endif /* _BACKWARD_PAIR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/queue.h b/libstdc++-v3/include/backward/queue.h
index 1d3b29c36b5..e092ac27263 100644
--- a/libstdc++-v3/include/backward/queue.h
+++ b/libstdc++-v3/include/backward/queue.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_QUEUE_H
-#define _CPP_BACKWARD_QUEUE_H 1
+#ifndef _BACKWARD_QUEUE_H
+#define _BACKWARD_QUEUE_H 1
 
 #include "backward_warning.h"
 #include <queue>
diff --git a/libstdc++-v3/include/backward/rope.h b/libstdc++-v3/include/backward/rope.h
index 5f4c7875295..b6b18c2ab2b 100644
--- a/libstdc++-v3/include/backward/rope.h
+++ b/libstdc++-v3/include/backward/rope.h
@@ -40,8 +40,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_ROPE_H
-#define _CPP_BACKWARD_ROPE_H 1
+#ifndef _BACKWARD_ROPE_H
+#define _BACKWARD_ROPE_H 1
 
 #include "backward_warning.h"
 #include "hashtable.h"   
@@ -53,7 +53,7 @@ using __gnu_cxx::rope;
 using __gnu_cxx::crope; 
 using __gnu_cxx::wrope; 
 
-#endif /* _CPP_BACKWARD_ROPE_H */
+#endif /* _BACKWARD_ROPE_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/set.h b/libstdc++-v3/include/backward/set.h
index c1892554495..6a8320ba42f 100644
--- a/libstdc++-v3/include/backward/set.h
+++ b/libstdc++-v3/include/backward/set.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_SET_H
-#define _CPP_BACKWARD_SET_H 1
+#ifndef _BACKWARD_SET_H
+#define _BACKWARD_SET_H 1
 
 #include "backward_warning.h"
 #include "tree.h"
@@ -62,7 +62,7 @@
 
 using std::set;
 
-#endif /* _CPP_BACKWARD_SET_H */
+#endif /* _BACKWARD_SET_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/slist.h b/libstdc++-v3/include/backward/slist.h
index decf04df661..63db065fe35 100644
--- a/libstdc++-v3/include/backward/slist.h
+++ b/libstdc++-v3/include/backward/slist.h
@@ -41,15 +41,15 @@
  *
  */
 
-#ifndef _CPP_BACKWARD_SLIST_H
-#define _CPP_BACKWARD_SLIST_H 1
+#ifndef _BACKWARD_SLIST_H
+#define _BACKWARD_SLIST_H 1
 
 #include "backward_warning.h"
 #include <ext/slist>
 
 using __gnu_cxx::slist;
 
-#endif /* _CPP_BACKWARD_SLIST_H */
+#endif /* _BACKWARD_SLIST_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/stack.h b/libstdc++-v3/include/backward/stack.h
index 6f602936630..0ff53a43572 100644
--- a/libstdc++-v3/include/backward/stack.h
+++ b/libstdc++-v3/include/backward/stack.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_STACK_H
-#define _CPP_BACKWARD_STACK_H 1
+#ifndef _BACKWARD_STACK_H
+#define _BACKWARD_STACK_H 1
 
 #include "backward_warning.h"
 #include "vector.h"
@@ -65,7 +65,7 @@
 
 using std::stack;
 
-#endif /* _CPP_BACKWARD_STACK_H */
+#endif /* _BACKWARD_STACK_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/stream.h b/libstdc++-v3/include/backward/stream.h
index 21a851decd8..8371b056a13 100644
--- a/libstdc++-v3/include/backward/stream.h
+++ b/libstdc++-v3/include/backward/stream.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_STREAM_H
-#define _CPP_BACKWARD_STREAM_H 1
+#ifndef _BACKWARD_STREAM_H
+#define _BACKWARD_STREAM_H 1
 
 #include "backward_warning.h"
 #include "iostream.h"
diff --git a/libstdc++-v3/include/backward/streambuf.h b/libstdc++-v3/include/backward/streambuf.h
index aef863ff133..35a3c672dd2 100644
--- a/libstdc++-v3/include/backward/streambuf.h
+++ b/libstdc++-v3/include/backward/streambuf.h
@@ -25,8 +25,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BACKWARD_STREAMBUF_H
-#define _CPP_BACKWARD_STREAMBUF_H 1
+#ifndef _BACKWARD_STREAMBUF_H
+#define _BACKWARD_STREAMBUF_H 1
 
 #include "backward_warning.h"
 #include <streambuf>
diff --git a/libstdc++-v3/include/backward/tempbuf.h b/libstdc++-v3/include/backward/tempbuf.h
index f47e707808a..75b9b8bbe45 100644
--- a/libstdc++-v3/include/backward/tempbuf.h
+++ b/libstdc++-v3/include/backward/tempbuf.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_TEMPBUF_H
-#define _CPP_BACKWARD_TEMPBUF_H 1
+#ifndef _BACKWARD_TEMPBUF_H
+#define _BACKWARD_TEMPBUF_H 1
 
 #include "backward_warning.h"
 #include "pair.h"
@@ -71,7 +71,7 @@ using std::get_temporary_buffer;
 using std::return_temporary_buffer;
 using __gnu_cxx::temporary_buffer;
 
-#endif /* _CPP_BACKWARD_TEMPBUF_H */
+#endif /* _BACKWARD_TEMPBUF_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/backward/tree.h b/libstdc++-v3/include/backward/tree.h
index f3ee6525b88..ca3ff897594 100644
--- a/libstdc++-v3/include/backward/tree.h
+++ b/libstdc++-v3/include/backward/tree.h
@@ -41,8 +41,8 @@
  *
  */
 
-#ifndef _CPP_EXT_TREE
-#define _CPP_EXT_TREE 1
+#ifndef _BACKWARD_TREE
+#define _BACKWARD_TREE 1
 
 #include "backward_warning.h"
 #include <ext/rb_tree>
diff --git a/libstdc++-v3/include/backward/vector.h b/libstdc++-v3/include/backward/vector.h
index 77880686f0d..961f41a7840 100644
--- a/libstdc++-v3/include/backward/vector.h
+++ b/libstdc++-v3/include/backward/vector.h
@@ -53,8 +53,8 @@
  * purpose.  It is provided "as is" without express or implied warranty.
  */
 
-#ifndef _CPP_BACKWARD_VECTOR_H
-#define _CPP_BACKWARD_VECTOR_H 1
+#ifndef _BACKWARD_VECTOR_H
+#define _BACKWARD_VECTOR_H 1
 
 #include "backward_warning.h"
 #include "algobase.h"
@@ -63,7 +63,7 @@
 
 using std::vector;
 
-#endif /* _CPP_BACKWARD_VECTOR_H */
+#endif /* _BACKWARD_VECTOR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index b6dec02572a..a5bcaf5c512 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -206,7 +206,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.
   // NB: This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class allocator<char>;
   extern template class allocator<wchar_t>;
 #endif
diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h
index 98b73cadd7c..f2e468e6abf 100644
--- a/libstdc++-v3/include/bits/basic_ios.h
+++ b/libstdc++-v3/include/bits/basic_ios.h
@@ -33,8 +33,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_BASICIOS_H
-#define _CPP_BITS_BASICIOS_H 1
+#ifndef _BASIC_IOS_H
+#define _BASIC_IOS_H 1
 
 #pragma GCC system_header
 
@@ -441,9 +441,9 @@ namespace std
     };
 } // namespace std
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export
 #include <bits/basic_ios.tcc>
 #endif
 
-#endif /* _CPP_BITS_BASICIOS_H */
+#endif /* _BASIC_IOS_H */
diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc
index bb531688105..d0a8ff3cc43 100644
--- a/libstdc++-v3/include/bits/basic_ios.tcc
+++ b/libstdc++-v3/include/bits/basic_ios.tcc
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_BITS_BASICIOS_TCC
-#define _CPP_BITS_BASICIOS_TCC 1
+#ifndef _BASIC_IOS_TCC
+#define _BASIC_IOS_TCC 1
 
 #pragma GCC system_header
 
@@ -176,10 +176,10 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_ios<char>;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_ios<wchar_t>;
 #endif
 #endif
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index 7942c7635e2..8a9d5625030 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -37,8 +37,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STRING_H
-#define _CPP_BITS_STRING_H        1
+#ifndef _BASIC_STRING_H
+#define _BASIC_STRING_H 1
 
 #pragma GCC system_header
 
@@ -875,7 +875,7 @@ namespace std
       int
       compare(const _CharT* __s) const;
 
-      // _GLIBCPP_RESOLVE_LIB_DEFECTS
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 5 String::compare specification questionable
       int
       compare(size_type __pos, size_type __n1, const _CharT* __s) const;
@@ -1074,4 +1074,4 @@ namespace std
 	    basic_string<_CharT, _Traits, _Alloc>& __str);
 } // namespace std
 
-#endif /* _CPP_BITS_STRING_H */
+#endif /* _BASIC_STRING_H */
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc
index 826e418e263..fb46c4ca346 100644
--- a/libstdc++-v3/include/bits/basic_string.tcc
+++ b/libstdc++-v3/include/bits/basic_string.tcc
@@ -38,8 +38,8 @@
 // Written by Jason Merrill based upon the specification by Takanori Adachi
 // in ANSI X3J16/94-0013R2.  Rewritten by Nathan Myers to ISO-14882.
 
-#ifndef _CPP_BITS_STRING_TCC
-#define _CPP_BITS_STRING_TCC 1
+#ifndef _BASIC_STRING_TCC
+#define _BASIC_STRING_TCC 1
 
 #pragma GCC system_header
 
@@ -502,7 +502,7 @@ namespace std
     _S_create(size_t __capacity, const _Alloc& __alloc)
     {
       typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 83.  String::npos vs. string::max_size()
       if (__capacity > _S_max_size)
 #else
@@ -1057,7 +1057,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB: This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_string<char>;
   extern template 
     basic_istream<char>& 
@@ -1072,7 +1072,7 @@ namespace std
     basic_istream<char>& 
     getline(basic_istream<char>&, string&);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_string<wchar_t>;
   extern template 
     basic_istream<wchar_t>& 
diff --git a/libstdc++-v3/include/bits/boost_concept_check.h b/libstdc++-v3/include/bits/boost_concept_check.h
index a6a94a214ed..b3ef7afe8f9 100644
--- a/libstdc++-v3/include/bits/boost_concept_check.h
+++ b/libstdc++-v3/include/bits/boost_concept_check.h
@@ -13,15 +13,15 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _GLIBCPP_BOOST_CONCEPT_CHECK
-#define _GLIBCPP_BOOST_CONCEPT_CHECK 1
+#ifndef _BOOST_CONCEPT_CHECK_H
+#define _BOOST_CONCEPT_CHECK_H 1
 
 #pragma GCC system_header
+
 #include <cstddef>                // for ptrdiff_t, used next
 #include <bits/stl_iterator_base_types.h>    // for traits and tags
 #include <utility>                           // for pair<>
 
-
 namespace __gnu_cxx
 {
 
@@ -38,7 +38,7 @@ inline void __function_requires()
 
 
 // ??? Should the "concept_checking*" structs begin with more than _ ?
-#define _GLIBCPP_CLASS_REQUIRES(_type_var, _ns, _concept) \
+#define _GLIBCXX_CLASS_REQUIRES(_type_var, _ns, _concept) \
   typedef void (_ns::_concept <_type_var>::* _func##_type_var##_concept)(); \
   template <_func##_type_var##_concept _Tp1> \
   struct _concept_checking##_type_var##_concept { }; \
@@ -46,7 +46,7 @@ inline void __function_requires()
     &_ns::_concept <_type_var>::__constraints> \
     _concept_checking_typedef##_type_var##_concept
 
-#define _GLIBCPP_CLASS_REQUIRES2(_type_var1, _type_var2, _ns, _concept) \
+#define _GLIBCXX_CLASS_REQUIRES2(_type_var1, _type_var2, _ns, _concept) \
   typedef void (_ns::_concept <_type_var1,_type_var2>::* _func##_type_var1##_type_var2##_concept)(); \
   template <_func##_type_var1##_type_var2##_concept _Tp1> \
   struct _concept_checking##_type_var1##_type_var2##_concept { }; \
@@ -54,7 +54,7 @@ inline void __function_requires()
     &_ns::_concept <_type_var1,_type_var2>::__constraints> \
     _concept_checking_typedef##_type_var1##_type_var2##_concept
 
-#define _GLIBCPP_CLASS_REQUIRES3(_type_var1, _type_var2, _type_var3, _ns, _concept) \
+#define _GLIBCXX_CLASS_REQUIRES3(_type_var1, _type_var2, _type_var3, _ns, _concept) \
   typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3>::* _func##_type_var1##_type_var2##_type_var3##_concept)(); \
   template <_func##_type_var1##_type_var2##_type_var3##_concept _Tp1> \
   struct _concept_checking##_type_var1##_type_var2##_type_var3##_concept { }; \
@@ -62,7 +62,7 @@ inline void __function_requires()
     &_ns::_concept <_type_var1,_type_var2,_type_var3>::__constraints>  \
   _concept_checking_typedef##_type_var1##_type_var2##_type_var3##_concept
 
-#define _GLIBCPP_CLASS_REQUIRES4(_type_var1, _type_var2, _type_var3, _type_var4, _ns, _concept) \
+#define _GLIBCXX_CLASS_REQUIRES4(_type_var1, _type_var2, _type_var3, _type_var4, _ns, _concept) \
   typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3,_type_var4>::* _func##_type_var1##_type_var2##_type_var3##_type_var4##_concept)(); \
   template <_func##_type_var1##_type_var2##_type_var3##_type_var4##_concept _Tp1> \
   struct _concept_checking##_type_var1##_type_var2##_type_var3##_type_var4##_concept { }; \
@@ -240,7 +240,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
     _Tp __a, __b;
   };
 
-#define _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(_OP,_NAME) \
+#define _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(_OP,_NAME) \
   template <class _First, class _Second> \
   struct _NAME { \
     void __constraints() { (void)__constraints_(); } \
@@ -251,7 +251,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
     _Second __b; \
   }
 
-#define _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(_OP,_NAME) \
+#define _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(_OP,_NAME) \
   template <class _Ret, class _First, class _Second> \
   struct _NAME { \
     void __constraints() { (void)__constraints_(); } \
@@ -262,21 +262,21 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
     _Second __b; \
   }
 
-  _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(==, _EqualOpConcept);
-  _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(!=, _NotEqualOpConcept);
-  _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<, _LessThanOpConcept);
-  _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<=, _LessEqualOpConcept);
-  _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>, _GreaterThanOpConcept);
-  _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>=, _GreaterEqualOpConcept);
+  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(==, _EqualOpConcept);
+  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(!=, _NotEqualOpConcept);
+  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<, _LessThanOpConcept);
+  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<=, _LessEqualOpConcept);
+  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>, _GreaterThanOpConcept);
+  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>=, _GreaterEqualOpConcept);
 
-  _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(+, _PlusOpConcept);
-  _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(*, _TimesOpConcept);
-  _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(/, _DivideOpConcept);
-  _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(-, _SubtractOpConcept);
-  _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT(%, _ModOpConcept);
+  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(+, _PlusOpConcept);
+  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(*, _TimesOpConcept);
+  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(/, _DivideOpConcept);
+  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(-, _SubtractOpConcept);
+  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(%, _ModOpConcept);
 
-#undef _GLIBCPP_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT
-#undef _GLIBCPP_DEFINE_BINARY_OPERATOR_CONSTRAINT
+#undef _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT
+#undef _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT
 
   //===========================================================================
   // Function Object Concepts
@@ -896,6 +896,6 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
 
 #undef _IsUnused
 
-#endif // _GLIBCPP_BOOST_CONCEPT_CHECK
+#endif // _GLIBCXX_BOOST_CONCEPT_CHECK
 
 
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index e9969c0ea3e..169394a923f 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -28,17 +28,17 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_CPPCONFIG
-#define _CPP_CPPCONFIG 1
+#ifndef _CXXCONFIG
+#define _CXXCONFIG 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__ 20030705
+#define __GLIBCXX__ 20030704
 
 // This is necessary until GCC supports separate template compilation.
-#define _GLIBCPP_NO_TEMPLATE_EXPORT 1
+#define _GLIBCXX_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
@@ -47,7 +47,7 @@
 // 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
+#define _GLIBCXX_FULLY_COMPLIANT_HEADERS 1
 
 // Allow use of the GNU syntax extension, "extern template." This
 // extension is fully documented in the g++ manual, but in a nutshell,
@@ -55,18 +55,18 @@
 // library to avoid multiple weak definitions for required types that
 // are already explicitly instantiated in the library binary. This
 // substantially reduces the binary size of resulting executables.
-#ifndef _GLIBCPP_EXTERN_TEMPLATE
-# define _GLIBCPP_EXTERN_TEMPLATE 1
+#ifndef _GLIBCXX_EXTERN_TEMPLATE
+# define _GLIBCXX_EXTERN_TEMPLATE 1
 #endif
 
 // To enable older, ARM-style iostreams and other anachronisms use this.
-//#define _GLIBCPP_DEPRECATED 1
+//#define _GLIBCXX_DEPRECATED 1
 
 // Use corrected code from the committee library group's issues list.
-#define _GLIBCPP_RESOLVE_LIB_DEFECTS 1
+#define _GLIBCXX_RESOLVE_LIB_DEFECTS 1
 
 // Hopefully temporary workaround to autoconf/m4 issue with quoting '@'.
-#define _GLIBCPP_AT_AT "@@"
+#define _GLIBCXX_AT_AT "@@"
 
 // 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
@@ -92,9 +92,9 @@
 
 // Create a boolean flag to be used to determine if --fast-math is set.
 #ifdef __FAST_MATH__
-# define _GLIBCPP_FAST_MATH 1
+# define _GLIBCXX_FAST_MATH 1
 #else
-# define _GLIBCPP_FAST_MATH 0
+# define _GLIBCXX_FAST_MATH 0
 #endif
 
 // This marks string literals in header files to be extracted for eventual
diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 2b733cd94a0..a6d1d8c3b37 100644
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -37,8 +37,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_CHAR_TRAITS_H
-#define _CPP_BITS_CHAR_TRAITS_H 1
+#ifndef _CHAR_TRAITS_H
+#define _CHAR_TRAITS_H 1
 
 #pragma GCC system_header
 
@@ -181,7 +181,7 @@ namespace std
   };
 
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   /// 21.1.3.2  char_traits specializations
   template<>
     struct char_traits<wchar_t>
@@ -245,7 +245,7 @@ namespace std
       not_eof(const int_type& __c)
       { return eq_int_type(__c, eof()) ? 0 : __c; }
   };
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
   template<typename _CharT, typename _Traits>
     struct _Char_traits_match
diff --git a/libstdc++-v3/include/bits/codecvt.h b/libstdc++-v3/include/bits/codecvt.h
index 45d5f3a2915..f013142ffea 100644
--- a/libstdc++-v3/include/bits/codecvt.h
+++ b/libstdc++-v3/include/bits/codecvt.h
@@ -38,8 +38,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_CODECVT_H
-#define _CPP_BITS_CODECVT_H	1
+#ifndef _CODECVT_H
+#define _CODECVT_H 1
 
 #pragma GCC system_header
 
@@ -271,7 +271,7 @@
       do_max_length() const throw();
   };
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   // codecvt<wchar_t, char, mbstate_t> required specialization
   template<>
     class codecvt<wchar_t, char, mbstate_t> 
@@ -330,7 +330,7 @@
       virtual int 
       do_max_length() const throw();
     };
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
   // 22.2.1.6  Template class codecvt_byname
   template<typename _InternT, typename _ExternT, typename _StateT>
@@ -353,8 +353,8 @@
 
   // Include host and configuration specific partial specializations
   // with additional functionality, if possible.
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   #include <bits/codecvt_specializations.h>
 #endif
 
-#endif // _CPP_BITS_CODECVT_H
+#endif // _CODECVT_H
diff --git a/libstdc++-v3/include/bits/concept_check.h b/libstdc++-v3/include/bits/concept_check.h
index 88877ebf57e..80c1439342d 100644
--- a/libstdc++-v3/include/bits/concept_check.h
+++ b/libstdc++-v3/include/bits/concept_check.h
@@ -32,8 +32,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _GLIBCPP_CONCEPT_CHECK
-#define _GLIBCPP_CONCEPT_CHECK 1
+#ifndef _CONCEPT_CHECK_H
+#define _CONCEPT_CHECK_H 1
 
 #pragma GCC system_header
 
@@ -47,13 +47,13 @@
 // Concept-checking code is off by default unless users turn it on via
 // configure options or editing c++config.h.
 
-#ifndef _GLIBCPP_CONCEPT_CHECKS
+#ifndef _GLIBCXX_CONCEPT_CHECKS
 
-#define __glibcpp_function_requires(...)
-#define __glibcpp_class_requires(_a,_b)
-#define __glibcpp_class_requires2(_a,_b,_c)
-#define __glibcpp_class_requires3(_a,_b,_c,_d)
-#define __glibcpp_class_requires4(_a,_b,_c,_d,_e)
+#define __glibcxx_function_requires(...)
+#define __glibcxx_class_requires(_a,_b)
+#define __glibcxx_class_requires2(_a,_b,_c)
+#define __glibcxx_class_requires3(_a,_b,_c,_d)
+#define __glibcxx_class_requires4(_a,_b,_c,_d,_e)
 
 #else // the checks are on
 
@@ -61,7 +61,7 @@
 
 // Note that the obvious and elegant approach of
 //
-//#define glibcpp_function_requires(C) boost::function_requires< boost::C >()
+//#define glibcxx_function_requires(C) boost::function_requires< boost::C >()
 //
 // won't work due to concept templates with more than one parameter, e.g.,
 // BinaryPredicateConcept.  The preprocessor tries to split things up on
@@ -69,17 +69,17 @@
 // parenthesis to hide the commas, because "boost::(Temp<Foo,Bar>)" isn't
 // a valid instantiation pattern.  Thus, we steal a feature from C99.
 
-#define __glibcpp_function_requires(...)                                 \
+#define __glibcxx_function_requires(...)                                 \
             __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >();
-#define __glibcpp_class_requires(_a,_C)                                  \
-            _GLIBCPP_CLASS_REQUIRES(_a, __gnu_cxx, _C);
-#define __glibcpp_class_requires2(_a,_b,_C)                              \
-            _GLIBCPP_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
-#define __glibcpp_class_requires3(_a,_b,_c,_C)                           \
-            _GLIBCPP_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
-#define __glibcpp_class_requires4(_a,_b,_c,_d,_C)                        \
-            _GLIBCPP_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
+#define __glibcxx_class_requires(_a,_C)                                  \
+            _GLIBCXX_CLASS_REQUIRES(_a, __gnu_cxx, _C);
+#define __glibcxx_class_requires2(_a,_b,_C)                              \
+            _GLIBCXX_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
+#define __glibcxx_class_requires3(_a,_b,_c,_C)                           \
+            _GLIBCXX_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
+#define __glibcxx_class_requires4(_a,_b,_c,_d,_C)                        \
+            _GLIBCXX_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
 
 #endif // enable/disable
 
-#endif // _GLIBCPP_CONCEPT_CHECK
+#endif // _GLIBCXX_CONCEPT_CHECK
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 415150275c4..00fe5606b89 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_CPP_TYPE_TRAITS_H
-#define _CPP_BITS_CPP_TYPE_TRAITS_H 1
+#ifndef _CPP_TYPE_TRAITS_H
+#define _CPP_TYPE_TRAITS_H 1
 
 #pragma GCC system_header
 
@@ -167,7 +167,7 @@ namespace std
     };
   };
 
-# ifdef _GLIBCPP_USE_WCHAR_T
+# ifdef _GLIBCXX_USE_WCHAR_T
   template<>
   struct __is_integer<wchar_t>
   {
@@ -329,4 +329,4 @@ namespace std
 } // namespace std
 
 
-#endif //_CPP_BITS_CPP_TYPE_TRAITS_H
+#endif //_CPP_TYPE_TRAITS_H
diff --git a/libstdc++-v3/include/bits/demangle.h b/libstdc++-v3/include/bits/demangle.h
index 41347a2bb13..d6fdcd58c3e 100644
--- a/libstdc++-v3/include/bits/demangle.h
+++ b/libstdc++-v3/include/bits/demangle.h
@@ -28,44 +28,44 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef __DEMANGLER_H
-#define __DEMANGLER_H 1
+#ifndef _DEMANGLER_H
+#define _DEMANGLER_H 1
 
 #include <limits>
 #include <vector>
 #include <string>
 #include <cctype>
 
-#ifndef _GLIBCPP_DEMANGLER_DEBUG
-#define _GLIBCPP_DEMANGLER_CWDEBUG 0
-#define _GLIBCPP_DEMANGLER_DEBUG(x)
-#define _GLIBCPP_DEMANGLER_DOUT(cntrl, data)
-#define _GLIBCPP_DEMANGLER_DOUT_ENTERING(x)
-#define _GLIBCPP_DEMANGLER_DOUT_ENTERING2(x)
-#define _GLIBCPP_DEMANGLER_RETURN \
+#ifndef _GLIBCXX_DEMANGLER_DEBUG
+#define _GLIBCXX_DEMANGLER_CWDEBUG 0
+#define _GLIBCXX_DEMANGLER_DEBUG(x)
+#define _GLIBCXX_DEMANGLER_DOUT(cntrl, data)
+#define _GLIBCXX_DEMANGLER_DOUT_ENTERING(x)
+#define _GLIBCXX_DEMANGLER_DOUT_ENTERING2(x)
+#define _GLIBCXX_DEMANGLER_RETURN \
     return M_result
-#define _GLIBCPP_DEMANGLER_RETURN2 \
+#define _GLIBCXX_DEMANGLER_RETURN2 \
     return M_result
-#define _GLIBCPP_DEMANGLER_FAILURE \
+#define _GLIBCXX_DEMANGLER_FAILURE \
     do { M_result = false; return false; } while(0)
 #else
-#define _GLIBCPP_DEMANGLER_CWDEBUG 1
+#define _GLIBCXX_DEMANGLER_CWDEBUG 1
 #endif
 
 // The following defines change the behaviour of the demangler.  The
 // default behaviour is that none of these macros is defined.
 
-// _GLIBCPP_DEMANGLER_STYLE_VOID
+// _GLIBCXX_DEMANGLER_STYLE_VOID
 // Default behaviour:					int f()
 // Uses (void) instead of ():				int f(void)
 
-// _GLIBCPP_DEMANGLER_STYLE_LITERAL
+// _GLIBCXX_DEMANGLER_STYLE_LITERAL
 // Default behaviour:					(long)13, 
 //							(unsigned long long)19
 // Use extensions 'u', 'l' and 'll' for integral
 // literals (as in template arguments):			13l, 19ull
 
-// _GLIBCPP_DEMANGLER_STYLE_LITERAL_INT
+// _GLIBCXX_DEMANGLER_STYLE_LITERAL_INT
 // Default behaviour:					4
 // Use also an explicit cast for int in literals:	(int)4
 
@@ -282,7 +282,7 @@ namespace __gnu_cxx
 	std::vector<int, Allocator> M_template_arg_pos;
 	int M_template_arg_pos_offset;
 	std::vector<substitution_st, Allocator> M_substitutions_pos;
-#if _GLIBCPP_DEMANGLER_CWDEBUG
+#if _GLIBCXX_DEMANGLER_CWDEBUG
 	bool M_inside_add_substitution;
 #endif
 
@@ -294,7 +294,7 @@ namespace __gnu_cxx
 	  M_name_is_cdtor(false), M_name_is_template(false),
 	  M_name_is_conversion_operator(false),
 	  M_template_args_need_space(false), M_template_arg_pos_offset(0)
-#if _GLIBCPP_DEMANGLER_CWDEBUG
+#if _GLIBCXX_DEMANGLER_CWDEBUG
 	  , M_inside_add_substitution(false)
 #endif
 	{ }
@@ -373,7 +373,7 @@ namespace __gnu_cxx
       };
 
     template<typename Allocator>
-#if !_GLIBCPP_DEMANGLER_CWDEBUG
+#if !_GLIBCXX_DEMANGLER_CWDEBUG
       inline
 #endif
       void
@@ -383,14 +383,14 @@ namespace __gnu_cxx
       {
 	if (!M_inside_substitution)
 	{
-#if _GLIBCPP_DEMANGLER_CWDEBUG
+#if _GLIBCXX_DEMANGLER_CWDEBUG
 	  if (M_inside_add_substitution)
 	    return;
 #endif
 	  M_substitutions_pos.
 	      push_back(substitution_st(start_pos,
 		  sub_type, number_of_prefixes));
-#if _GLIBCPP_DEMANGLER_CWDEBUG
+#if _GLIBCXX_DEMANGLER_CWDEBUG
 	  if (!DEBUGCHANNELS::dc::demangler.is_on())
 	    return;
 	  string_type substitution_name("S");
@@ -403,7 +403,7 @@ namespace __gnu_cxx
 	  int saved_pos = M_pos;
 	  M_pos = start_pos;
 	  M_inside_add_substitution = true;
-	  _GLIBCPP_DEMANGLER_DEBUG( dc::demangler.off() );
+	  _GLIBCXX_DEMANGLER_DEBUG( dc::demangler.off() );
 	  switch(sub_type)
 	  {
 	    case type:
@@ -437,8 +437,8 @@ namespace __gnu_cxx
 	      break;
 	  }
 	  M_pos = saved_pos;
-	  _GLIBCPP_DEMANGLER_DEBUG( dc::demangler.on() );
-	  _GLIBCPP_DEMANGLER_DOUT(dc::demangler,
+	  _GLIBCXX_DEMANGLER_DEBUG( dc::demangler.on() );
+	  _GLIBCXX_DEMANGLER_DOUT(dc::demangler,
 	      "Adding substitution " << substitution_name
 	      << " : " << subst
 	      << " (from " << location_ct((char*)__builtin_return_address(0)
@@ -487,7 +487,7 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_number(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_number");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_number");
 	if (current() != 'n')
 	  decode_decimal_integer(output);
 	else
@@ -496,7 +496,7 @@ namespace __gnu_cxx
 	  eat_current();
 	  decode_decimal_integer(output);
 	}
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <builtin-type> ::= v  # void
@@ -557,13 +557,13 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_builtin_type(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_builtin_type");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_builtin_type");
 	char const* bt;
 	if (!islower(current()) || !(bt = builtin_type_c[current() - 'a']))
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	output += bt;
 	eat_current();
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <class-enum-type> ::= <name>
@@ -572,12 +572,12 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_class_enum_type(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_class_enum_type");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_class_enum_type");
 	string_type nested_name_qualifiers;
 	if (!decode_name(output, nested_name_qualifiers))
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	output += nested_name_qualifiers;
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <substitution> ::=
@@ -601,7 +601,7 @@ namespace __gnu_cxx
       session<Allocator>::decode_substitution(string_type& output,
 	  qualifier_list<Allocator>* qualifiers)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_substitution");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_substitution");
 	unsigned int value = 0;
 	char c = next();
 	if (c != '_')
@@ -621,7 +621,7 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    }
 	    case 'b':
 	    {
@@ -636,7 +636,7 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    }
 	    case 'd':
 	      output += "std::iostream";
@@ -650,7 +650,7 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    case 'i':
 	      output += "std::istream";
 	      if (!M_inside_template_args)
@@ -663,7 +663,7 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    case 'o':
 	      output += "std::ostream";
 	      if (!M_inside_template_args)
@@ -676,7 +676,7 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    case 's':
 	      output += "std::string";
 	      if (!M_inside_template_args)
@@ -689,13 +689,13 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    case 't':
 	      output += "std";
 	      eat_current();
 	      if (qualifiers)
 		qualifiers->printing_suppressed();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    default:
 	      for(;; c = next())
 	      {
@@ -706,7 +706,7 @@ namespace __gnu_cxx
 		else if (c == '_')
 		  break;
 		else
-		  _GLIBCPP_DEMANGLER_FAILURE;
+		  _GLIBCXX_DEMANGLER_FAILURE;
 	      }
 	      ++value;
 	      break;
@@ -715,7 +715,7 @@ namespace __gnu_cxx
 	eat_current();
 	if (value >= M_substitutions_pos.size() ||
 	    M_inside_type > 20)			// Rather than core dump.
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	++M_inside_substitution;
 	int saved_pos = M_pos;
 	substitution_st& substitution(M_substitutions_pos[value]);
@@ -738,7 +738,7 @@ namespace __gnu_cxx
 		  output += ' ';
 		M_template_args_need_space = false;
 		if (!decode_template_args(output))
-		  _GLIBCPP_DEMANGLER_FAILURE;
+		  _GLIBCXX_DEMANGLER_FAILURE;
 	      }
 	      else
 	      {
@@ -747,10 +747,10 @@ namespace __gnu_cxx
 		if (current() == 'S')
 		{
 		  if (!decode_substitution(output))
-		    _GLIBCPP_DEMANGLER_FAILURE;
+		    _GLIBCXX_DEMANGLER_FAILURE;
 		}
 		else if (!decode_unqualified_name(output))
-		  _GLIBCPP_DEMANGLER_FAILURE;
+		  _GLIBCXX_DEMANGLER_FAILURE;
 	      }
 	    }
 	    if (qualifiers)
@@ -764,7 +764,7 @@ namespace __gnu_cxx
 	}
 	M_pos = saved_pos;
 	--M_inside_substitution;
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <template-param> ::= T_			# first template parameter
@@ -775,9 +775,9 @@ namespace __gnu_cxx
       session<Allocator>::decode_template_param(string_type& output,
 	  qualifier_list<Allocator>* qualifiers)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_template_parameter");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_template_parameter");
 	if (current() != 'T')
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	unsigned int value = 0;
 	char c;
 	if ((c = next()) != '_')
@@ -790,14 +790,14 @@ namespace __gnu_cxx
 	  ++value;
 	}
 	if (eat_current() != '_')
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	value += M_template_arg_pos_offset;
 	if (value >= M_template_arg_pos.size())
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	int saved_pos = M_pos;
 	M_pos = M_template_arg_pos[value];
 	if (M_inside_type > 20)		// Rather than core dump.
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	++M_inside_substitution;
 	if (current() == 'X')
 	{
@@ -810,23 +810,23 @@ namespace __gnu_cxx
 	  decode_type(output, qualifiers);
 	--M_inside_substitution;
 	M_pos = saved_pos;
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     template<typename Allocator>
       bool
       session<Allocator>::decode_literal(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_literal");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_literal");
 	eat_current();	// Eat the 'L'.
 	if (current() == '_')
 	{
 	  if (next() != 'Z')
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  eat_current();
 	  if ((M_pos += decode_encoding(output, M_str + M_pos,
 		  M_maxpos - M_pos + 1)) < 0)
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	}
 	else
 	{
@@ -838,16 +838,16 @@ namespace __gnu_cxx
 	    else
 	      output += "true";
 	    eat_current();
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  }
 	  char c = current();
-#ifdef _GLIBCPP_DEMANGLER_STYLE_LITERAL
+#ifdef _GLIBCXX_DEMANGLER_STYLE_LITERAL
 	  if (c == 'i' || c == 'j' || c == 'l' ||
 	      c == 'm' || c == 'x' || c == 'y')
 	    eat_current();
 	  else
 #else
-#ifndef _GLIBCPP_DEMANGLER_STYLE_LITERAL_INT
+#ifndef _GLIBCXX_DEMANGLER_STYLE_LITERAL_INT
 	  if (c == 'i')
 	    eat_current();
 	  else
@@ -856,12 +856,12 @@ namespace __gnu_cxx
 	  {
 	    output += '(';
 	    if (!decode_type(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    output += ')';
 	  }
 	  if (!decode_number(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
-#ifdef _GLIBCPP_DEMANGLER_STYLE_LITERAL
+	    _GLIBCXX_DEMANGLER_FAILURE;
+#ifdef _GLIBCXX_DEMANGLER_STYLE_LITERAL
 	  if (c == 'j' || c == 'm' || c == 'y')
 	    output += 'u';
 	  if (c == 'l' || c == 'm')
@@ -870,7 +870,7 @@ namespace __gnu_cxx
 	    output += "ll";
 #endif
 	}
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <operator-name> ::=
@@ -1040,7 +1040,7 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_operator_name(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_operator_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_operator_name");
 
 	char opcode0 = current();
 	char opcode1 = tolower(next());
@@ -1066,7 +1066,7 @@ namespace __gnu_cxx
 	      eat_current();
 	      if (hash == 27 || hash == 28)
 		M_template_args_need_space = true;
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    }
 	    else if (opcode0 == 'c' && opcode1 == 'v')
 	    {
@@ -1082,14 +1082,14 @@ namespace __gnu_cxx
 		M_template_arg_pos.push_back(M_pos + 3);
 	      }
 	      if (!decode_type(output))
-		_GLIBCPP_DEMANGLER_FAILURE;
+		_GLIBCXX_DEMANGLER_FAILURE;
 	      if (!M_inside_template_args)
 		M_name_is_conversion_operator = true;
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    }
 	  }
 	}
-	_GLIBCPP_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_FAILURE;
       }
 
     //
@@ -1105,21 +1105,21 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_expression(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_expression");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_expression");
 	if (current() == 'T')
 	{
 	  if (!decode_template_param(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
-	  _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	else if (current() == 'L')
 	{
 	  if (!decode_literal(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  if (current() != 'E')
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  eat_current();
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	else
 	{
@@ -1152,7 +1152,7 @@ namespace __gnu_cxx
 		eat_current();
 		output += '(';
 		if (!decode_expression(output))
-		  _GLIBCPP_DEMANGLER_FAILURE;
+		  _GLIBCXX_DEMANGLER_FAILURE;
 		output += ')';
 		if (!entry.unary)
 		{
@@ -1163,15 +1163,15 @@ namespace __gnu_cxx
 		  output += ' ';
 		  output += '(';
 		  if (!decode_expression(output))
-		    _GLIBCPP_DEMANGLER_FAILURE;
+		    _GLIBCXX_DEMANGLER_FAILURE;
 		  output += ')';
 		}
-		_GLIBCPP_DEMANGLER_RETURN;
+		_GLIBCXX_DEMANGLER_RETURN;
 	      }
 	    }
 	  }
 	}
-	_GLIBCPP_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_FAILURE;
       }
 
     //
@@ -1184,9 +1184,9 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_template_args(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_template_args");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_template_args");
 	if (eat_current() != 'I')
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	int prev_size = M_template_arg_pos.size();
 	++M_inside_template_args;
 	if (M_template_args_need_space)
@@ -1203,21 +1203,21 @@ namespace __gnu_cxx
 	  {
 	    eat_current();
 	    if (!decode_expression(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    if (current() != 'E')
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    eat_current();
 	  }
 	  else if (current() == 'L')
 	  {
 	    if (!decode_literal(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    if (current() != 'E')
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    eat_current();
 	  }
 	  else if (!decode_type(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  if (current() == 'E')
 	    break;
 	  output += ", ";
@@ -1232,7 +1232,7 @@ namespace __gnu_cxx
 	  M_name_is_template = true;
 	  M_template_arg_pos_offset = prev_size;
 	}
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <bare-function-type> ::=
@@ -1242,38 +1242,38 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_bare_function_type(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_bare_function_type");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_bare_function_type");
 	if (M_saw_destructor)
 	{
 	  if (eat_current() != 'v' || (current() != 'E' && current() != 0))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  output += "()";
 	  M_saw_destructor = false;
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
-#ifndef _GLIBCPP_DEMANGLER_STYLE_VOID
+#ifndef _GLIBCXX_DEMANGLER_STYLE_VOID
 	if (current() == 'v')
 	{
 	  eat_current();
 	  if (current() != 'E' && current() != 0)
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  output += "()";
 	  M_saw_destructor = false;
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 #endif
 	output += '(';
 	M_template_args_need_space = false;
 	if (!decode_type(output))	// Must have at least one parameter.
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	while (current() != 'E' && current() != 0)
 	{
 	  output += ", ";
 	  if (!decode_type(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	}
 	output += ')';
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <type> ::=
@@ -1445,7 +1445,7 @@ namespace __gnu_cxx
 	  string_type& prefix, string_type& postfix,
 	  qualifier_list<Allocator>* qualifiers)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING2
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING2
 	    (qualifiers ? "decode_type" : "decode_type[with qualifiers]");
 	++M_inside_type;
 	bool recursive_template_param_or_substitution_call;
@@ -1768,8 +1768,8 @@ namespace __gnu_cxx
 	if (!recursive_template_param_or_substitution_call)
 	  delete qualifiers;
 	if (failure)
-	  _GLIBCPP_DEMANGLER_FAILURE;
-	_GLIBCPP_DEMANGLER_RETURN2;
+	  _GLIBCXX_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_RETURN2;
       }
 
     // <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
@@ -1788,10 +1788,10 @@ namespace __gnu_cxx
       session<Allocator>::decode_nested_name(string_type& output,
 					     string_type& qualifiers)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_nested_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_nested_name");
 
 	if (current() != 'N' || M_pos >= M_maxpos)
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 
 	// <CV-qualifiers> ::= [r] [V] [K]  # restrict (C99), volatile, const
 	char const* qualifiers_start = &M_str[M_pos + 1];
@@ -1819,12 +1819,12 @@ namespace __gnu_cxx
 	  if (current() == 'S')
 	  {
 	    if (!decode_substitution(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	  }
 	  else if (current() == 'I')
 	  {
 	    if (!decode_template_args(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    if (current() != 'E')
 	    {
 	      // substitution: "<template-prefix> <template-args>".
@@ -1835,7 +1835,7 @@ namespace __gnu_cxx
 	  else
 	  {
 	    if (!decode_unqualified_name(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    if (current() != 'E')
 	    {
 	      // substitution: "<prefix> <unqualified-name>" or
@@ -1849,7 +1849,7 @@ namespace __gnu_cxx
 	  if (current() == 'E')
 	  {
 	    eat_current();
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  }
 	  if (current() != 'I')
 	    output += "::";
@@ -1857,7 +1857,7 @@ namespace __gnu_cxx
 	    output += ' ';
 	  M_template_args_need_space = false;
 	}
-	_GLIBCPP_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_FAILURE;
       }
 
     // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
@@ -1868,12 +1868,12 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_local_name(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_local_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_local_name");
 	if (current() != 'Z' || M_pos >= M_maxpos)
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	if ((M_pos += decode_encoding(output, M_str + M_pos + 1,
 		M_maxpos - M_pos) + 1) < 0 || eat_current() != 'E')
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	output += "::";
 	if (current() == 's')
 	{
@@ -1884,13 +1884,13 @@ namespace __gnu_cxx
 	{
 	  string_type nested_name_qualifiers;
 	  if (!decode_name(output, nested_name_qualifiers))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  output += nested_name_qualifiers;
 	}
 	string_type discriminator;
 	if (current() == '_' && next() != 'n' && !decode_number(discriminator))
-	  _GLIBCPP_DEMANGLER_FAILURE;
-	_GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <source-name> ::= <positive length number> <identifier>
@@ -1899,10 +1899,10 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_source_name(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_source_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_source_name");
 	int length = current() - '0';
 	if (length < 1 || length > 9)
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	while(std::isdigit(next()))
 	  length = 10 * length + current() - '0';
 	char const* ptr = &M_str[M_pos];
@@ -1911,16 +1911,16 @@ namespace __gnu_cxx
 	{
 	  output += "(anonymous namespace)";
 	  if ((M_pos += length) > M_maxpos + 1)
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	}
 	else
 	  while(length--)
 	  {
 	    if (current() == 0)
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    output += eat_current();
 	  }
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <unqualified-name> ::= <operator-name>	# Starts with lower case.
@@ -1931,7 +1931,7 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_unqualified_name(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_unqualified_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_unqualified_name");
 	if (std::isdigit(current()))
 	{
 	  if (!M_inside_template_args)
@@ -1948,13 +1948,13 @@ namespace __gnu_cxx
 	    M_name_is_cdtor = false;
 	    M_name_is_conversion_operator = false;
 	    if (!decode_source_name(M_function_name))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    if (!recursive_unqualified_name)
 	      output += M_function_name;
 	  }
 	  else if (!decode_source_name(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
-	  _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	if (islower(current()))
 	{
@@ -1965,15 +1965,15 @@ namespace __gnu_cxx
 	    M_name_is_cdtor = false;
 	    M_name_is_conversion_operator = false;
 	    if (!decode_operator_name(M_function_name))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    output += M_function_name;
 	  }
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	if (current() == 'C' || current() == 'D')
 	{
 	  if (M_inside_template_args)
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  // <ctor-dtor-name> ::=
 	  //   C1	# complete object (in-charge) constructor
 	  //   C2	# base object (not-in-charge) constructor
@@ -1986,22 +1986,22 @@ namespace __gnu_cxx
 	  {
 	    char c = next();
 	    if (c < '1' || c > '3')
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	  }
 	  else
 	  {
 	    char c = next();
 	    if (c < '0' || c > '2')
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    output += '~';
 	    M_saw_destructor = true;
 	  }
 	  M_name_is_cdtor = true;
 	  eat_current();
 	  output += M_function_name;
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
-	_GLIBCPP_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_FAILURE;
       }
 
     // <unscoped-name> ::=
@@ -2012,16 +2012,16 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_unscoped_name(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_unscoped_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_unscoped_name");
 	if (current() == 'S')
 	{
 	  if (next() != 't')
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  eat_current();
 	  output += "std::";
 	}
 	decode_unqualified_name(output);
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <name> ::=
@@ -2039,34 +2039,34 @@ namespace __gnu_cxx
       session<Allocator>::decode_name(string_type& output,
 				      string_type& nested_name_qualifiers)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_name");
 	int substitution_start = M_pos;
 	if (current() == 'S' && (M_pos >= M_maxpos || M_str[M_pos + 1] != 't'))
 	{
 	  if (!decode_substitution(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	}
 	else if (current() == 'N')
 	{
 	  decode_nested_name(output, nested_name_qualifiers);
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	else if (current() == 'Z')
 	{
 	  decode_local_name(output);
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	else if (!decode_unscoped_name(output))
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	if (current() == 'I')
 	{
 	  // Must have been an <unscoped-template-name>.
 	  add_substitution(substitution_start, unscoped_template_name);
 	  if (!decode_template_args(output))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	}
 	M_template_args_need_space = false;
-	_GLIBCPP_DEMANGLER_RETURN;
+	_GLIBCXX_DEMANGLER_RETURN;
       }
 
     // <call-offset> ::= h <nv-offset> _
@@ -2079,12 +2079,12 @@ namespace __gnu_cxx
     template<typename Allocator>
       bool
       session<Allocator>::decode_call_offset(string_type&
-#if _GLIBCPP_DEMANGLER_CWDEBUG
+#if _GLIBCXX_DEMANGLER_CWDEBUG
 	  output
 #endif
 	  )
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_call_offset");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_call_offset");
 	if (current() == 'h')
 	{
 	  string_type dummy;
@@ -2092,7 +2092,7 @@ namespace __gnu_cxx
 	  if (decode_number(dummy) && current() == '_')
 	  {
 	    eat_current();
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  }
 	}
 	else if (current() == 'v')
@@ -2105,11 +2105,11 @@ namespace __gnu_cxx
 	    if (decode_number(dummy) && current() == '_')
 	    {
 	      eat_current();
-	      _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_RETURN;
 	    }
 	  }
 	}
-	_GLIBCPP_DEMANGLER_FAILURE;
+	_GLIBCXX_DEMANGLER_FAILURE;
       }
 
     //
@@ -2135,67 +2135,67 @@ namespace __gnu_cxx
       bool
       session<Allocator>::decode_special_name(string_type& output)
       {
-	_GLIBCPP_DEMANGLER_DOUT_ENTERING("decode_special_name");
+	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_special_name");
 	if (current() == 'G')
 	{
 	  if (next() != 'V')
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  output += "guard variable for ";
 	  string_type nested_name_qualifiers;
 	  eat_current();
 	  if (!decode_name(output, nested_name_qualifiers))
-	    _GLIBCPP_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_FAILURE;
 	  output += nested_name_qualifiers;
-	  _GLIBCPP_DEMANGLER_RETURN;
+	  _GLIBCXX_DEMANGLER_RETURN;
 	}
 	else if (current() != 'T')
-	  _GLIBCPP_DEMANGLER_FAILURE;
+	  _GLIBCXX_DEMANGLER_FAILURE;
 	switch(next())
 	{
 	  case 'V':
 	    output += "vtable for ";
 	    eat_current();
 	    decode_type(output);
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  case 'T':
 	    output += "VTT for ";
 	    eat_current();
 	    decode_type(output);
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  case 'I':
 	    output += "typeinfo for ";
 	    eat_current();
 	    decode_type(output);
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  case 'S':
 	    output += "typeinfo name for ";
 	    eat_current();
 	    decode_type(output);
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  case 'c':
 	    output += "covariant return thunk to ";
 	    if (!decode_call_offset(output)
 		|| !decode_call_offset(output)
 		|| (M_pos += decode_encoding(output, M_str + M_pos,
 		    M_maxpos - M_pos + 1)) < 0)
-	      _GLIBCPP_DEMANGLER_FAILURE;
-	    _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  case 'C':		// GNU extension?
 	  {
 	    string_type first;
 	    output += "construction vtable for ";
 	    eat_current();
 	    if (!decode_type(first))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    while(std::isdigit(current()))
 	      eat_current();
 	    if (eat_current() != '_')
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    if (!decode_type(output))
-	      _GLIBCPP_DEMANGLER_FAILURE;
+	      _GLIBCXX_DEMANGLER_FAILURE;
 	    output += "-in-";
 	    output += first;
-	    _GLIBCPP_DEMANGLER_RETURN;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	  }
 	  default:
 	    if (current() == 'v')
@@ -2205,8 +2205,8 @@ namespace __gnu_cxx
 	    if (!decode_call_offset(output)
 		|| (M_pos += decode_encoding(output, M_str + M_pos,
 		    M_maxpos - M_pos + 1)) < 0)
-	      _GLIBCPP_DEMANGLER_FAILURE;
-	    _GLIBCPP_DEMANGLER_RETURN;
+	      _GLIBCXX_DEMANGLER_FAILURE;
+	    _GLIBCXX_DEMANGLER_RETURN;
 	}
       }
 
@@ -2222,11 +2222,11 @@ namespace __gnu_cxx
 					  char const* in,
 					  int len)
       {
-#if _GLIBCPP_DEMANGLER_CWDEBUG
-	_GLIBCPP_DEMANGLER_DOUT(dc::demangler,
+#if _GLIBCXX_DEMANGLER_CWDEBUG
+	_GLIBCXX_DEMANGLER_DOUT(dc::demangler,
 	    "Output thus far: \"" << output << '"');
 	string_type input(in, len > 0x40000000 ? strlen(in) : len);
-	_GLIBCPP_DEMANGLER_DOUT(
+	_GLIBCXX_DEMANGLER_DOUT(
 	    dc::demangler, "Entering decode_encoding(\"" << input << "\")");
 #endif
 	if (len <= 0)
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index 43be956cdcc..8164df5f769 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_DEQUE_TCC
-#define __GLIBCPP_INTERNAL_DEQUE_TCC
+#ifndef _DEQUE_TCC
+#define _DEQUE_TCC 1
 
 namespace std
 { 
@@ -709,4 +709,4 @@ namespace std
     }
 } // namespace std 
   
-#endif /* __GLIBCPP_INTERNAL_DEQUE_TCC */
+#endif
diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index fddfd63e721..c25d50142f4 100644
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -32,8 +32,8 @@
 // ISO C++ 14882: 27.8  File-based streams
 //
 
-#ifndef _CPP_BITS_FSTREAM_TCC
-#define _CPP_BITS_FSTREAM_TCC 1
+#ifndef _FSTREAM_TCC
+#define _FSTREAM_TCC 1
 
 #pragma GCC system_header
 
@@ -519,7 +519,7 @@ namespace std
     basic_filebuf<_CharT, _Traits>::
     seekpos(pos_type __pos, ios_base::openmode __mode)
     {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 171. Strange seekpos() semantics due to joint position
       pos_type __ret =  pos_type(off_type(-1)); 
 
@@ -567,13 +567,13 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_filebuf<char>;
   extern template class basic_ifstream<char>;
   extern template class basic_ofstream<char>;
   extern template class basic_fstream<char>;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_filebuf<wchar_t>;
   extern template class basic_ifstream<wchar_t>;
   extern template class basic_ofstream<wchar_t>;
diff --git a/libstdc++-v3/include/bits/gslice.h b/libstdc++-v3/include/bits/gslice.h
index 95781f9bbcc..c546028703a 100644
--- a/libstdc++-v3/include/bits/gslice.h
+++ b/libstdc++-v3/include/bits/gslice.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_GSLICE_H
-#define _CPP_BITS_GSLICE_H 1
+#ifndef _GSLICE_H
+#define _GSLICE_H 1
 
 #pragma GCC system_header
 
@@ -117,7 +117,7 @@ namespace std {
 } // std::
 
 
-#endif /* _CPP_BITS_GSLICE_H */
+#endif /* _GSLICE_H */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/gslice_array.h b/libstdc++-v3/include/bits/gslice_array.h
index 22b59d17cda..508eb7c9ab7 100644
--- a/libstdc++-v3/include/bits/gslice_array.h
+++ b/libstdc++-v3/include/bits/gslice_array.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_GSLICE_ARRAY
-#define _CPP_BITS_GSLICE_ARRAY 1
+#ifndef _GSLICE_ARRAY_H
+#define _GSLICE_ARRAY_H 1
 
 #pragma GCC system_header
 
@@ -171,7 +171,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
 
 } // std::
 
-#endif /* _CPP_BITS_GSLICE_ARRAY */
+#endif /* _GSLICE_ARRAY_H */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/indirect_array.h b/libstdc++-v3/include/bits/indirect_array.h
index d88cc252e99..cb81aabf77f 100644
--- a/libstdc++-v3/include/bits/indirect_array.h
+++ b/libstdc++-v3/include/bits/indirect_array.h
@@ -35,8 +35,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_INDIRECT_ARRAY_H
-#define _CPP_BITS_INDIRECT_ARRAY_H 1
+#ifndef _INDIRECT_ARRAY_H
+#define _INDIRECT_ARRAY_H 1
 
 #pragma GCC system_header
 
@@ -171,7 +171,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
 
 } // std::
 
-#endif /* _CPP_BITS_INDIRECT_ARRAY_H */
+#endif /* _INDIRECT_ARRAY_H */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h
index ef2f57ab0f8..34600cc3de7 100644
--- a/libstdc++-v3/include/bits/ios_base.h
+++ b/libstdc++-v3/include/bits/ios_base.h
@@ -37,8 +37,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_IOSBASE_H
-#define _CPP_BITS_IOSBASE_H 1
+#ifndef _IOS_BASE_H
+#define _IOS_BASE_H 1
 
 #pragma GCC system_header
 
@@ -164,7 +164,7 @@ namespace std
     class failure : public exception
     {
     public:
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
       //48.  Use of non-existent exception constructor
       explicit 
       failure(const string& __str) throw();
@@ -359,7 +359,7 @@ namespace std
     /// Request a seek relative to the current end of the sequence.
     static const seekdir end = 		seekdir(SEEK_END);
 
-#ifdef _GLIBCPP_DEPRECATED
+#ifdef _GLIBCXX_DEPRECATED
     // Annex D.6
     typedef int io_state;
     typedef int open_mode;
@@ -687,7 +687,7 @@ namespace std
   protected:
     ios_base();
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
   //50.  Copy constructor and assignment operator of ios_base
   private:
     ios_base(const ios_base&);
@@ -879,5 +879,5 @@ namespace std
 
 } // namespace std
 
-#endif /* _CPP_BITS_IOSBASE_H */
+#endif /* _IOS_BASE_H */
 
diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc
index eaeb414678f..7f26f645ef5 100644
--- a/libstdc++-v3/include/bits/istream.tcc
+++ b/libstdc++-v3/include/bits/istream.tcc
@@ -32,6 +32,9 @@
 // ISO C++ 14882: 27.6.2  Output streams
 //
 
+#ifndef _ISTREAM_TCC
+#define _ISTREAM_TCC 1
+
 #pragma GCC system_header
 
 #include <locale>
@@ -59,7 +62,7 @@ namespace std
 					  traits_type::to_char_type(__c)))
 		  __c = __sb->snextc();
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //195.  Should basic_istream::sentry's constructor ever set eofbit? 
 	      if (traits_type::eq_int_type(__c, __eof))
 		__in.setstate(ios_base::eofbit);
@@ -142,7 +145,7 @@ namespace std
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	      long __l;
 	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l);
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 	      // 118. basic_istream uses nonexistent num_get member functions.
 	      if (!(__err & ios_base::failbit)
 		  && (numeric_limits<short>::min() <= __l 
@@ -204,7 +207,7 @@ namespace std
 	      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
 	      long __l;
 	      __check_facet(this->_M_num_get).get(*this, 0, *this, __err, __l);
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 	      // 118. basic_istream uses nonexistent num_get member functions.
 	      if (!(__err & ios_base::failbit)
 		  && (numeric_limits<int>::min() <= __l 
@@ -305,7 +308,7 @@ namespace std
       return *this;
     }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT, typename _Traits>
     basic_istream<_CharT, _Traits>& 
     basic_istream<_CharT, _Traits>::
@@ -828,7 +831,7 @@ namespace std
     basic_istream<_CharT, _Traits>::
     putback(char_type __c)
     {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 60. What is a formatted input function?
       _M_gcount = 0;
 #endif
@@ -862,7 +865,7 @@ namespace std
     basic_istream<_CharT, _Traits>::
     unget(void)
     {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 60. What is a formatted input function?
       _M_gcount = 0;
 #endif
@@ -945,7 +948,7 @@ namespace std
       // DR60.  Do not change _M_gcount.
       if (!this->fail())
 	{
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 136.  seekp, seekg setting wrong streams?
 	  pos_type __err = this->rdbuf()->pubseekpos(__pos, ios_base::in);
 
@@ -965,7 +968,7 @@ namespace std
       // DR60.  Do not change _M_gcount.
       if (!this->fail())
 	{
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 136.  seekp, seekg setting wrong streams?
 	  pos_type __err = this->rdbuf()->pubseekoff(__off, __dir, 
 						     ios_base::in);
@@ -1040,7 +1043,7 @@ namespace std
 	      if (_Traits::eq_int_type(__c, __eof))
 		__in.setstate(ios_base::eofbit);
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //68.  Extractors for char* should store null at end
 	      *__s = char_type();
 #endif
@@ -1124,7 +1127,7 @@ namespace std
 	    __in.setstate(ios_base::eofbit);
 	  __in.width(0);
 	}
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //211.  operator>>(istream&, string&) doesn't set failbit
       if (!__extracted)
 	__in.setstate (ios_base::failbit);
@@ -1184,7 +1187,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_istream<char>;
   extern template istream& ws(istream&);
   extern template istream& operator>>(istream&, char&);
@@ -1194,7 +1197,7 @@ namespace std
   extern template istream& operator>>(istream&, unsigned char*);
   extern template istream& operator>>(istream&, signed char*);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_istream<wchar_t>;
   extern template wistream& ws(wistream&);
   extern template wistream& operator>>(wistream&, wchar_t&);
@@ -1202,3 +1205,5 @@ namespace std
 #endif
 #endif
 } // namespace std
+
+#endif
diff --git a/libstdc++-v3/include/bits/list.tcc b/libstdc++-v3/include/bits/list.tcc
index d6cccb72b41..428dc90e2e1 100644
--- a/libstdc++-v3/include/bits/list.tcc
+++ b/libstdc++-v3/include/bits/list.tcc
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_LIST_TCC
-#define __GLIBCPP_INTERNAL_LIST_TCC
+#ifndef _LIST_TCC
+#define _LIST_TCC 1
 
 namespace std
 {
@@ -367,4 +367,4 @@ namespace std
     }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_LIST_TCC */
+#endif /* _LIST_TCC */
diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h
index cfc11493216..7949aa41532 100644
--- a/libstdc++-v3/include/bits/locale_classes.h
+++ b/libstdc++-v3/include/bits/locale_classes.h
@@ -37,8 +37,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_LOCALE_CLASSES_H
-#define _CPP_BITS_LOCALE_CLASSES_H	1
+#ifndef _LOCALE_CLASSES_H
+#define _LOCALE_CLASSES_H 1
 
 #pragma GCC system_header
 
@@ -161,7 +161,7 @@ namespace std
     // macros. For GNU systems, the following are also valid:
     // LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT,
     // and LC_IDENTIFICATION.
-    static const size_t _S_categories_size = 6 + _GLIBCPP_NUM_CATEGORIES;
+    static const size_t _S_categories_size = 6 + _GLIBCXX_NUM_CATEGORIES;
 
     explicit 
     locale(_Impl*) throw();
diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index 72141f1983e..312d1d4f50d 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -37,8 +37,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_LOCFACETS_H
-#define _CPP_BITS_LOCFACETS_H	1
+#ifndef _LOCALE_FACETS_H
+#define _LOCALE_FACETS_H 1
 
 #pragma GCC system_header
 
@@ -51,10 +51,10 @@
 namespace std
 {
   // NB: Don't instantiate required wchar_t facets if no wchar_t support.
-#ifdef _GLIBCPP_USE_WCHAR_T
-# define  _GLIBCPP_NUM_FACETS 28
+#ifdef _GLIBCXX_USE_WCHAR_T
+# define  _GLIBCXX_NUM_FACETS 28
 #else
-# define  _GLIBCPP_NUM_FACETS 14
+# define  _GLIBCXX_NUM_FACETS 14
 #endif
 
   // Convert string to numeric value of type _Tv and store results.  
@@ -76,7 +76,7 @@ namespace std
     __convert_to_v(const char*, unsigned long&, ios_base::iostate&, 
 		   const __c_locale&, int);
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<>
     void
     __convert_to_v(const char*, long long&, ios_base::iostate&, 
@@ -425,7 +425,7 @@ namespace std
     const ctype<char>&
     use_facet<ctype<char> >(const locale& __loc);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   // 22.2.1.3  ctype<wchar_t> specialization
   template<>
     class ctype<wchar_t> : public __ctype_abstract_base<wchar_t>
@@ -498,7 +498,7 @@ namespace std
   template<>
     const ctype<wchar_t>&
     use_facet<ctype<wchar_t> >(const locale& __loc);
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
   // Include host and configuration specific ctype inlines.
   #include <bits/ctype_inline.h>
@@ -753,7 +753,7 @@ namespace std
     void
     numpunct<char>::_M_initialize_numpunct(__c_locale __cloc);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     numpunct<wchar_t>::~numpunct();
 
@@ -824,7 +824,7 @@ namespace std
 	  ios_base::iostate& __err, unsigned long& __v)  const
       { return this->do_get(__in, __end, __io, __err, __v); }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
       iter_type 
       get(iter_type __in, iter_type __end, ios_base& __io,
 	  ios_base::iostate& __err, long long& __v) const
@@ -886,7 +886,7 @@ namespace std
       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, 
 	     unsigned long&) const;
 
-#ifdef _GLIBCPP_USE_LONG_LONG 
+#ifdef _GLIBCXX_USE_LONG_LONG 
       virtual iter_type 
       do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err, 
 	     long long&) const;
@@ -958,7 +958,7 @@ namespace std
 	  unsigned long __v) const
       { return this->do_put(__s, __f, __fill, __v); }
 
-#ifdef _GLIBCPP_USE_LONG_LONG 
+#ifdef _GLIBCXX_USE_LONG_LONG 
       iter_type 
       put(iter_type __s, ios_base& __f, char_type __fill, long long __v) const
       { return this->do_put(__s, __f, __fill, __v); }
@@ -1020,7 +1020,7 @@ namespace std
       virtual iter_type 
       do_put(iter_type, ios_base&, char_type __fill, unsigned long) const;
 
-#ifdef _GLIBCPP_USE_LONG_LONG 
+#ifdef _GLIBCXX_USE_LONG_LONG 
       virtual iter_type 
       do_put(iter_type, ios_base&, char_type __fill, long long __v) const;
 
@@ -1116,7 +1116,7 @@ namespace std
     size_t
     collate<char>::_M_transform(char*, const char*, size_t) const;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     int 
     collate<wchar_t>::_M_compare(const wchar_t*, const wchar_t*) const;
@@ -1350,7 +1350,7 @@ namespace std
     void
     __timepunct<char>::_M_put(char*, size_t, const char*, const tm*) const;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     const wchar_t*
     __timepunct<wchar_t>::_S_timezones[14];
@@ -1687,7 +1687,7 @@ namespace std
     void
     moneypunct<char, false>::_M_initialize_moneypunct(__c_locale, const char*);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     moneypunct<wchar_t, true>::~moneypunct();
 
@@ -1928,7 +1928,7 @@ namespace std
     string
     messages<char>::do_get(catalog, int, int, const string&) const;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     wstring
     messages<wchar_t>::do_get(catalog, int, int, const wstring&) const;
diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 9026a3e4960..518f41ad056 100644
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -30,8 +30,8 @@
 
 // Warning: this file is not meant for user inclusion. Use <locale>.
 
-#ifndef _CPP_BITS_LOCFACETS_TCC
-#define _CPP_BITS_LOCFACETS_TCC 1
+#ifndef _LOCALE_FACETS_TCC
+#define _LOCALE_FACETS_TCC 1
 
 #pragma GCC system_header
 
@@ -96,7 +96,7 @@ namespace std
     const __numpunct_cache<char>&
     __use_cache(const locale& __loc);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     const __numpunct_cache<wchar_t>&
     __use_cache(const locale& __loc);
@@ -391,7 +391,7 @@ namespace std
       return __beg;
     }
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
   //17.  Bad bool parsing
   template<typename _CharT, typename _InIter>
     _InIter
@@ -525,7 +525,7 @@ namespace std
       return __beg;
     }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT, typename _InIter>
     _InIter
     num_get<_CharT, _InIter>::
@@ -658,7 +658,7 @@ namespace std
 		       const _CharT* __lit, ios_base::fmtflags __flags)
     { return __int_to_char(__out, __size, __v, __lit, __flags, false); }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT>
     inline int
     __int_to_char(_CharT* __out, const int __size, long long __v,
@@ -835,7 +835,7 @@ namespace std
     _M_group_float(const string& __grouping, _CharT __sep, const _CharT* __p, 
 		   _CharT* __new, _CharT* __cs, int& __len) const
     {
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
       //282. What types does numpunct grouping refer to?
       // Add grouping, if necessary. 
       _CharT* __p2;
@@ -857,7 +857,7 @@ namespace std
     }
 
   // The following code uses snprintf (or sprintf(), when
-  // _GLIBCPP_USE_C99 is not defined) to convert floating point values
+  // _GLIBCXX_USE_C99 is not defined) to convert floating point values
   // for insertion into a stream.  An optimization would be to replace
   // them with code that works directly on a wide buffer and then use
   // __pad to do the padding.  It would be good to replace them anyway
@@ -898,7 +898,7 @@ namespace std
 	// Long enough for the max format spec.
 	char __fbuf[16];
 
-#ifdef _GLIBCPP_USE_C99
+#ifdef _GLIBCXX_USE_C99
 	// First try a buffer perhaps big enough (for sure sufficient
 	// for non-ios_base::fixed outputs)
 	int __cs_size = __max_digits * 3;
@@ -1032,7 +1032,7 @@ namespace std
            unsigned long __v) const
     { return _M_convert_int(__s, __io, __fill, __v); }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT, typename _OutIter>
     _OutIter
     num_put<_CharT, _OutIter>::
@@ -1320,7 +1320,7 @@ namespace std
     { 
       const locale __loc = __io.getloc();
       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-#ifdef _GLIBCPP_USE_C99
+#ifdef _GLIBCXX_USE_C99
       // First try a buffer perhaps big enough.
       int __cs_size = 64;
       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
@@ -2295,7 +2295,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB: This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class moneypunct<char, false>;
   extern template class moneypunct<char, true>;
   extern template class moneypunct_byname<char, false>;
@@ -2422,7 +2422,7 @@ namespace std
     bool
     has_facet<messages<char> >(const locale&);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class moneypunct<wchar_t, false>;
   extern template class moneypunct<wchar_t, true>;
   extern template class moneypunct_byname<wchar_t, false>;
diff --git a/libstdc++-v3/include/bits/localefwd.h b/libstdc++-v3/include/bits/localefwd.h
index 16fa8821e9a..a4507c3e28f 100644
--- a/libstdc++-v3/include/bits/localefwd.h
+++ b/libstdc++-v3/include/bits/localefwd.h
@@ -37,8 +37,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_LOCALE_FWD_H
-#define _CPP_BITS_LOCALE_FWD_H	1
+#ifndef _LOCALE_FWD_H
+#define _LOCALE_FWD_H 1
 
 #pragma GCC system_header
 
@@ -110,7 +110,7 @@ namespace std
   template<typename _CharT> 
     class ctype;
   template<> class ctype<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> class ctype<wchar_t>;
 #endif
   template<typename _CharT> 
@@ -122,7 +122,7 @@ namespace std
   template<typename _InternT, typename _ExternT, typename _StateT>
     class codecvt;
   template<> class codecvt<char, char, mbstate_t>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> class codecvt<wchar_t, char, mbstate_t>;
 #endif
   template<typename _InternT, typename _ExternT, typename _StateT>
diff --git a/libstdc++-v3/include/bits/mask_array.h b/libstdc++-v3/include/bits/mask_array.h
index 74ccdd0040f..ba67db70e9b 100644
--- a/libstdc++-v3/include/bits/mask_array.h
+++ b/libstdc++-v3/include/bits/mask_array.h
@@ -35,8 +35,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_MASK_ARRAY_H
-#define _CPP_BITS_MASK_ARRAY_H 1
+#ifndef _MASK_ARRAY_H
+#define _MASK_ARRAY_H 1
 
 #pragma GCC system_header
 
@@ -160,7 +160,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
     
 } // std::
 
-#endif /* _CPP_BITS_MASK_ARRAY_H */
+#endif /* _MASK_ARRAY_H */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index b71bdb835d2..942a305825c 100644
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -32,6 +32,9 @@
 // ISO C++ 14882: 27.6.2  Output streams
 //
 
+#ifndef _OSTREAM_TCC
+#define _OSTREAM_TCC 1
+
 #pragma GCC system_header
 
 #include <locale>
@@ -235,7 +238,7 @@ namespace std
       return *this;
     }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template<typename _CharT, typename _Traits>
     basic_ostream<_CharT, _Traits>& 
     basic_ostream<_CharT, _Traits>::operator<<(long long __n)
@@ -431,7 +434,7 @@ namespace std
     {
       if (!this->fail())
 	{
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 136.  seekp, seekg setting wrong streams?
 	  pos_type __err = this->rdbuf()->pubseekpos(__pos, ios_base::out);
 
@@ -450,7 +453,7 @@ namespace std
     {
       if (!this->fail())
 	{
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 136.  seekp, seekg setting wrong streams?
 	  pos_type __err = this->rdbuf()->pubseekoff(__off, __d, 
 						     ios_base::out);
@@ -577,7 +580,7 @@ namespace std
     operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s)
     {
       typedef basic_ostream<_CharT, _Traits> __ostream_type;
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 167.  Improper use of traits_type::length()
 // Note that this is only in 'Review' status.
       typedef char_traits<char>		     __traits_type;
@@ -674,7 +677,7 @@ namespace std
 	  const streamsize __w = __out.width() > 0 ? __out.width() : 0;
 	  _CharT* __pads = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __w));
 	  streamsize __len = static_cast<streamsize>(__str.size());
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 	  // 25. String operator<< uses width() value wrong
 #endif
 	  if (__w > __len)
@@ -693,7 +696,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_ostream<char>;
   extern template ostream& endl(ostream&);
   extern template ostream& ends(ostream&);
@@ -705,7 +708,7 @@ namespace std
   extern template ostream& operator<<(ostream&, const unsigned char*);
   extern template ostream& operator<<(ostream&, const signed char*);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_ostream<wchar_t>;
   extern template wostream& endl(wostream&);
   extern template wostream& ends(wostream&);
@@ -717,3 +720,5 @@ namespace std
 #endif
 #endif
 } // namespace std
+
+#endif
diff --git a/libstdc++-v3/include/bits/slice_array.h b/libstdc++-v3/include/bits/slice_array.h
index c2c89308c8c..ad33a474672 100644
--- a/libstdc++-v3/include/bits/slice_array.h
+++ b/libstdc++-v3/include/bits/slice_array.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_SLICE_ARRAY_H
-#define _CPP_BITS_SLICE_ARRAY_H 1
+#ifndef _SLICE_ARRAY_H
+#define _SLICE_ARRAY_H 1
 
 #pragma GCC system_header
 
@@ -211,7 +211,7 @@ _DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
 
 } // std::
 
-#endif /* _CPP_BITS_SLICE_ARRAY_H */
+#endif /* _SLICE_ARRAY_H */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/sstream.tcc b/libstdc++-v3/include/bits/sstream.tcc
index d512e8adb08..0430a260d75 100644
--- a/libstdc++-v3/include/bits/sstream.tcc
+++ b/libstdc++-v3/include/bits/sstream.tcc
@@ -32,8 +32,8 @@
 // ISO C++ 14882: 27.7  String-based streams
 //
 
-#ifndef _CPP_BITS_SSTREAM_TCC
-#define _CPP_BITS_SSTREAM_TCC	1
+#ifndef _SSTREAM_TCC
+#define _SSTREAM_TCC 1
 
 #pragma GCC system_header
 
@@ -214,7 +214,7 @@ namespace std
   extern template class basic_ostringstream<char>;
   extern template class basic_stringstream<char>;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_stringbuf<wchar_t>;
   extern template class basic_istringstream<wchar_t>;
   extern template class basic_ostringstream<wchar_t>;
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index 3b00005939a..f4ba55346e3 100644
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -58,13 +58,13 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_ALGO_H
-#define __GLIBCPP_INTERNAL_ALGO_H
+#ifndef _ALGO_H
+#define _ALGO_H 1
 
 #include <bits/stl_heap.h>
 #include <bits/stl_tempbuf.h>     // for _Temporary_buffer
 
-// See concept_check.h for the __glibcpp_*_requires macros.
+// See concept_check.h for the __glibcxx_*_requires macros.
 
 namespace std
 {
@@ -86,7 +86,7 @@ namespace std
     __median(const _Tp& __a, const _Tp& __b, const _Tp& __c)
     {
       // concept requirements
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
       if (__a < __b)
 	if (__b < __c)
 	  return __b;
@@ -120,7 +120,7 @@ namespace std
     __median(const _Tp& __a, const _Tp& __b, const _Tp& __c, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_BinaryFunctionConcept<_Compare,bool,_Tp,_Tp>)
+      __glibcxx_function_requires(_BinaryFunctionConcept<_Compare,bool,_Tp,_Tp>)
       if (__comp(__a, __b))
 	if (__comp(__b, __c))
 	  return __b;
@@ -152,7 +152,7 @@ namespace std
     for_each(_InputIterator __first, _InputIterator __last, _Function __f)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
       for ( ; __first != __last; ++__first)
 	__f(*__first);
       return __f;
@@ -292,8 +292,8 @@ namespace std
 	 const _Tp& __val)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_EqualOpConcept<
 		typename iterator_traits<_InputIterator>::value_type, _Tp>)
       return std::find(__first, __last, __val, std::__iterator_category(__first));
     }
@@ -312,8 +312,8 @@ namespace std
 	    _Predicate __pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	      typename iterator_traits<_InputIterator>::value_type>)
       return std::find_if(__first, __last, __pred, std::__iterator_category(__first));
     }
@@ -331,8 +331,8 @@ namespace std
     adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type>)
       if (__first == __last)
 	return __last;
@@ -361,8 +361,8 @@ namespace std
 		  _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	    typename iterator_traits<_ForwardIterator>::value_type,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
       if (__first == __last)
@@ -389,10 +389,10 @@ namespace std
     count(_InputIterator __first, _InputIterator __last, const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_InputIterator>::value_type >)
-      __glibcpp_function_requires(_EqualityComparableConcept<_Tp>)
+      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
       typename iterator_traits<_InputIterator>::difference_type __n = 0;
       for ( ; __first != __last; ++__first)
 	if (*__first == __value)
@@ -413,8 +413,8 @@ namespace std
     count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_InputIterator>::value_type>)
       typename iterator_traits<_InputIterator>::difference_type __n = 0;
       for ( ; __first != __last; ++__first)
@@ -453,9 +453,9 @@ namespace std
 	   _ForwardIterator2 __first2, _ForwardIterator2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_ForwardIterator1>::value_type,
 	    typename iterator_traits<_ForwardIterator2>::value_type>)
 
@@ -526,9 +526,9 @@ namespace std
 	   _BinaryPredicate  __predicate)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	    typename iterator_traits<_ForwardIterator1>::value_type,
 	    typename iterator_traits<_ForwardIterator2>::value_type>)
 
@@ -599,10 +599,10 @@ namespace std
 	     _Integer __count, const _Tp& __val)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcpp_function_requires(_EqualityComparableConcept<_Tp>)
+      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
 
       if (__count <= 0)
 	return __first;
@@ -648,8 +648,8 @@ namespace std
 	     _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
 
       if (__count <= 0)
@@ -700,12 +700,12 @@ namespace std
 		_ForwardIterator2 __first2)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcpp_function_requires(_ConvertibleConcept<
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_ConvertibleConcept<
 	    typename iterator_traits<_ForwardIterator1>::value_type,
 	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcpp_function_requires(_ConvertibleConcept<
+      __glibcxx_function_requires(_ConvertibleConcept<
 	    typename iterator_traits<_ForwardIterator2>::value_type,
 	    typename iterator_traits<_ForwardIterator1>::value_type>)
 
@@ -735,8 +735,8 @@ namespace std
 	      _OutputIterator __result, _UnaryOperation __unary_op)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
             // "the type returned by a _UnaryOperation"
             __typeof__(__unary_op(*__first))>)
 
@@ -770,9 +770,9 @@ namespace std
 	      _BinaryOperation __binary_op)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
             // "the type returned by a _BinaryOperation"
             __typeof__(__binary_op(*__first1,*__first2))>)
 
@@ -799,10 +799,10 @@ namespace std
 	    const _Tp& __old_value, const _Tp& __new_value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcpp_function_requires(_ConvertibleConcept<_Tp,
+      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       for ( ; __first != __last; ++__first)
@@ -828,10 +828,10 @@ namespace std
 	       _Predicate __pred, const _Tp& __new_value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_ConvertibleConcept<_Tp,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       for ( ; __first != __last; ++__first)
@@ -860,10 +860,10 @@ namespace std
 		 const _Tp& __old_value, const _Tp& __new_value)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
 
       for ( ; __first != __last; ++__first, ++__result)
@@ -893,10 +893,10 @@ namespace std
 		    _Predicate __pred, const _Tp& __new_value)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_InputIterator>::value_type>)
 
       for ( ; __first != __last; ++__first, ++__result)
@@ -920,8 +920,8 @@ namespace std
     generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_GeneratorConcept<_Generator,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_GeneratorConcept<_Generator,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       for ( ; __first != __last; ++__first)
@@ -944,7 +944,7 @@ namespace std
     generate_n(_OutputIterator __first, _Size __n, _Generator __gen)
     {
       // concept requirements
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
             // "the type returned by a _Generator"
             __typeof__(gen())>)
 
@@ -972,10 +972,10 @@ namespace std
 		_OutputIterator __result, const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
 
       for ( ; __first != __last; ++__first)
@@ -1006,10 +1006,10 @@ namespace std
 		   _OutputIterator __result, _Predicate __pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_InputIterator>::value_type>)
 
       for ( ; __first != __last; ++__first)
@@ -1042,10 +1042,10 @@ namespace std
 	   const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_ConvertibleConcept<_Tp,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
 
       __first = std::find(__first, __last, __value);
@@ -1076,8 +1076,8 @@ namespace std
 	      _Predicate __pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       __first = std::find_if(__first, __last, __pred);
@@ -1144,7 +1144,7 @@ namespace std
 		  output_iterator_tag)
     {
       // concept requirements -- iterators already checked
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	  typename iterator_traits<_InputIterator>::value_type,
 	  typename iterator_traits<_InputIterator>::value_type>)
 
@@ -1173,7 +1173,7 @@ namespace std
 		  forward_iterator_tag)
     {
       // concept requirements -- iterators already checked
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	    typename iterator_traits<_ForwardIterator>::value_type,
 	    typename iterator_traits<_InputIterator>::value_type>)
 
@@ -1202,10 +1202,10 @@ namespace std
 		_OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_InputIterator>::value_type>)
 
       typedef typename iterator_traits<_OutputIterator>::iterator_category _IterType;
@@ -1236,8 +1236,8 @@ namespace std
 		_BinaryPredicate __binary_pred)
     {
       // concept requirements -- predicates checked later
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
 
       typedef typename iterator_traits<_OutputIterator>::iterator_category _IterType;
@@ -1264,8 +1264,8 @@ namespace std
     unique(_ForwardIterator __first, _ForwardIterator __last)
     {
 	  // concept requirements
-	  __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-	  __glibcpp_function_requires(_EqualityComparableConcept<
+	  __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+	  __glibcxx_function_requires(_EqualityComparableConcept<
 		    typename iterator_traits<_ForwardIterator>::value_type>)
 
 	  __first = std::adjacent_find(__first, __last);
@@ -1292,8 +1292,8 @@ namespace std
            _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 		typename iterator_traits<_ForwardIterator>::value_type,
 		typename iterator_traits<_ForwardIterator>::value_type>)
 
@@ -1350,7 +1350,7 @@ namespace std
     reverse(_BidirectionalIterator __first, _BidirectionalIterator __last)
     {
 	  // concept requirements
-	  __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<
+	  __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
 		    _BidirectionalIterator>)
 	  std::__reverse(__first, __last, std::__iterator_category(__first));
     }
@@ -1376,8 +1376,8 @@ namespace std
 			     _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 		typename iterator_traits<_BidirectionalIterator>::value_type>)
 
       while (__first != __last) {
@@ -1453,7 +1453,7 @@ namespace std
 	      bidirectional_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<
+      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
 	    _BidirectionalIterator>)
 
       if ((__first == __middle) || (__last  == __middle))
@@ -1486,7 +1486,7 @@ namespace std
 	     random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       if ((__first == __middle) || (__last  == __middle))
@@ -1562,7 +1562,7 @@ namespace std
     rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
 
       typedef typename iterator_traits<_ForwardIterator>::iterator_category _IterType;
       std::__rotate(__first, __middle, __last, _IterType());
@@ -1591,8 +1591,8 @@ namespace std
                 _ForwardIterator __last, _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 		typename iterator_traits<_ForwardIterator>::value_type>)
 
       return std::copy(__first, __middle, copy(__middle, __last, __result));
@@ -1612,7 +1612,7 @@ namespace std
     inline _Distance
     __random_number(_Distance __n)
     {
-  #ifdef _GLIBCPP_HAVE_DRAND48
+  #ifdef _GLIBCXX_HAVE_DRAND48
       return lrand48() % __n;
   #else
       return rand() % __n;
@@ -1635,7 +1635,7 @@ namespace std
     random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       if (__first == __last) return;
@@ -1662,7 +1662,7 @@ namespace std
 		   _RandomNumberGenerator& __rand)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       if (__first == __last) return;
@@ -1750,8 +1750,8 @@ namespace std
 	      _Predicate   __pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       return std::__partition(__first, __last, __pred, std::__iterator_category(__first));
@@ -1850,8 +1850,8 @@ namespace std
 		     _Predicate __pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       if (__first == __last)
@@ -2116,9 +2116,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       std::make_heap(__first, __middle);
       for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)
@@ -2155,9 +2155,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 							  _ValueType, _ValueType>)
 
       std::make_heap(__first, __middle, __comp);
@@ -2195,10 +2195,10 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_OutputValueType>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_InputValueType>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_OutputValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_InputValueType>)
 
       if (__result_first == __result_last) return __result_last;
       _RandomAccessIterator __result_real_last = __result_first;
@@ -2250,10 +2250,10 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcpp_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_ConvertibleConcept<_InputValueType, _OutputValueType>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _OutputValueType, _OutputValueType>)
 
       if (__result_first == __result_last) return __result_last;
@@ -2352,9 +2352,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       if (__first != __last) {
 	std::__introsort_loop(__first, __last, __lg(__last - __first) * 2);
@@ -2383,9 +2383,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _ValueType>)
 
       if (__first != __last) {
 	std::__introsort_loop(__first, __last, __lg(__last - __first) * 2, __comp);
@@ -2415,9 +2415,9 @@ namespace std
       // version, defined next.  The difference is in the strictness of the
       // comparison operations... so for looser checking, define your own
       // comparison function, as was intended.
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
 
       _DistanceType __len = std::distance(__first, __last);
       _DistanceType __half;
@@ -2461,8 +2461,8 @@ namespace std
       typedef typename iterator_traits<_ForwardIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>)
 
       _DistanceType __len = std::distance(__first, __last);
       _DistanceType __half;
@@ -2502,9 +2502,9 @@ namespace std
 
       // concept requirements
       // See comments on lower_bound.
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
 
       _DistanceType __len = std::distance(__first, __last);
       _DistanceType __half;
@@ -2548,8 +2548,8 @@ namespace std
       typedef typename iterator_traits<_ForwardIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>)
 
       _DistanceType __len = std::distance(__first, __last);
       _DistanceType __half;
@@ -2726,14 +2726,14 @@ namespace std
 	  _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
 
       while (__first1 != __last1 && __first2 != __last2) {
@@ -2778,14 +2778,14 @@ namespace std
 	  _OutputIterator __result, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -3147,9 +3147,9 @@ namespace std
           _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<
+      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
 	    _BidirectionalIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       if (__first == __middle || __middle == __last)
 	return;
@@ -3199,9 +3199,9 @@ namespace std
           _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<
+      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
 	    _BidirectionalIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    _ValueType, _ValueType>)
 
       if (__first == __middle || __middle == __last)
@@ -3286,9 +3286,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       _Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last);
       if (buf.begin() == 0)
@@ -3322,9 +3322,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 							  _ValueType, _ValueType>)
 
       _Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last);
@@ -3359,8 +3359,8 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       while (__last - __first > 3) {
 	_RandomAccessIterator __cut =
@@ -3402,8 +3402,8 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 				  _ValueType, _ValueType>)
 
       while (__last - __first > 3) {
@@ -3446,9 +3446,9 @@ namespace std
 
       // concept requirements
       // See comments on lower_bound.
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
 
       _DistanceType __len = std::distance(__first, __last);
       _DistanceType __half;
@@ -3501,9 +3501,9 @@ namespace std
       typedef typename iterator_traits<_ForwardIterator>::difference_type _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType, _Tp>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp, _ValueType>)
 
       _DistanceType __len = std::distance(__first, __last);
       _DistanceType __half;
@@ -3548,10 +3548,10 @@ namespace std
     {
       // concept requirements
       // See comments on lower_bound.
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_SameTypeConcept<_Tp,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_SameTypeConcept<_Tp,
 		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
 
       _ForwardIterator __i = std::lower_bound(__first, __last, __val);
       return __i != __last && !(__val < *__i);
@@ -3578,10 +3578,10 @@ namespace std
                   const _Tp& __val, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 		typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare, _Tp,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp,
 		typename iterator_traits<_ForwardIterator>::value_type>)
 
       _ForwardIterator __i = std::lower_bound(__first, __last, __val, __comp);
@@ -3599,12 +3599,12 @@ namespace std
 	     _InputIterator2 __first2, _InputIterator2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
 
       while (__first1 != __last1 && __first2 != __last2)
@@ -3624,12 +3624,12 @@ namespace std
 	     _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -3651,14 +3651,14 @@ namespace std
 	      _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
 
       while (__first1 != __last1 && __first2 != __last2) {
@@ -3688,14 +3688,14 @@ namespace std
 	      _OutputIterator __result, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -3725,14 +3725,14 @@ namespace std
 		     _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
 
       while (__first1 != __last1 && __first2 != __last2)
@@ -3757,14 +3757,14 @@ namespace std
 		     _OutputIterator __result, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -3789,14 +3789,14 @@ namespace std
 		   _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
 
       while (__first1 != __last1 && __first2 != __last2)
@@ -3822,14 +3822,14 @@ namespace std
 		   _OutputIterator __result, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -3855,14 +3855,14 @@ namespace std
 			     _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
 
       while (__first1 != __last1 && __first2 != __last2)
@@ -3892,14 +3892,14 @@ namespace std
 			     _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_SameTypeConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_SameTypeConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -3929,8 +3929,8 @@ namespace std
     max_element(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       if (__first == __last) return __first;
@@ -3947,8 +3947,8 @@ namespace std
 		_Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_ForwardIterator>::value_type,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
@@ -3964,8 +3964,8 @@ namespace std
     min_element(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       if (__first == __last) return __first;
@@ -3982,8 +3982,8 @@ namespace std
 		_Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_ForwardIterator>::value_type,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
@@ -4003,8 +4003,8 @@ namespace std
     next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_BidirectionalIterator>::value_type>)
 
       if (__first == __last)
@@ -4040,8 +4040,8 @@ namespace std
 		     _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_BidirectionalIterator>::value_type,
 	    typename iterator_traits<_BidirectionalIterator>::value_type>)
 
@@ -4077,8 +4077,8 @@ namespace std
     prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_BidirectionalIterator>::value_type>)
 
       if (__first == __last)
@@ -4114,8 +4114,8 @@ namespace std
 		     _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_Compare,
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
 	    typename iterator_traits<_BidirectionalIterator>::value_type,
 	    typename iterator_traits<_BidirectionalIterator>::value_type>)
 
@@ -4154,9 +4154,9 @@ namespace std
 		  _ForwardIterator __first2, _ForwardIterator __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_InputIterator>::value_type,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
@@ -4174,12 +4174,12 @@ namespace std
 		  _BinaryPredicate __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_InputIterator>::value_type,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	    typename iterator_traits<_InputIterator>::value_type,
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
@@ -4255,8 +4255,8 @@ namespace std
 	       bidirectional_iterator_tag, bidirectional_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>)
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>)
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>)
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>)
 
       typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1;
       typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2;
@@ -4284,8 +4284,8 @@ namespace std
 	       _BinaryPredicate __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>)
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>)
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator1>)
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator2>)
 
       typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1;
       typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2;
@@ -4313,9 +4313,9 @@ namespace std
 	     _ForwardIterator2 __first2, _ForwardIterator2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_ForwardIterator1>::value_type,
 	    typename iterator_traits<_ForwardIterator2>::value_type>)
 
@@ -4332,9 +4332,9 @@ namespace std
 	     _BinaryPredicate __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
 	    typename iterator_traits<_ForwardIterator1>::value_type,
 	    typename iterator_traits<_ForwardIterator2>::value_type>)
 
@@ -4346,5 +4346,5 @@ namespace std
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_ALGO_H */
+#endif /* _ALGO_H */
 
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 3c68c425c32..57faf234fd1 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_ALGOBASE_H
-#define __GLIBCPP_INTERNAL_ALGOBASE_H
+#ifndef _ALGOBASE_H
+#define _ALGOBASE_H 1
 
 #include <bits/c++config.h>
 #include <cstring>
@@ -94,10 +94,10 @@ namespace std
       typedef typename iterator_traits<_ForwardIterator2>::value_type _ValueType2;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcpp_function_requires(_ConvertibleConcept<_ValueType1, _ValueType2>)
-      __glibcpp_function_requires(_ConvertibleConcept<_ValueType2, _ValueType1>)
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator1>)
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator2>)
+      __glibcxx_function_requires(_ConvertibleConcept<_ValueType1, _ValueType2>)
+      __glibcxx_function_requires(_ConvertibleConcept<_ValueType2, _ValueType1>)
 
       _ValueType1 __tmp = *__a;
       *__a = *__b;
@@ -118,7 +118,7 @@ namespace std
     swap(_Tp& __a, _Tp& __b)
     {
       // concept requirements
-      __glibcpp_function_requires(_SGIAssignableConcept<_Tp>)
+      __glibcxx_function_requires(_SGIAssignableConcept<_Tp>)
       
       _Tp __tmp = __a;
       __a = __b;
@@ -143,7 +143,7 @@ namespace std
     min(const _Tp& __a, const _Tp& __b)
     {
       // concept requirements
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
       //return __b < __a ? __b : __a;
       if (__b < __a) return __b; return __a;
     }
@@ -163,7 +163,7 @@ namespace std
     max(const _Tp& __a, const _Tp& __b) 
     {
       // concept requirements
-      __glibcpp_function_requires(_LessThanComparableConcept<_Tp>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
       //return  __a < __b ? __b : __a;
       if (__a < __b) return __b; return __a;
     }
@@ -327,8 +327,8 @@ namespace std
     copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
 
        typedef typename _Is_normal_iterator<_InputIterator>::_Normal __Normal;
@@ -460,9 +460,9 @@ namespace std
     copy_backward(_BI1 __first, _BI1 __last, _BI2 __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BI1>)
-      __glibcpp_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
-      __glibcpp_function_requires(_ConvertibleConcept<
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>)
+      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
+      __glibcxx_function_requires(_ConvertibleConcept<
 	    typename iterator_traits<_BI1>::value_type,
 	    typename iterator_traits<_BI2>::value_type>)
 
@@ -488,7 +488,7 @@ namespace std
     fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIterator>)
 
       for ( ; __first != __last; ++__first)
 	*__first = __value;
@@ -510,7 +510,7 @@ namespace std
     fill_n(_OutputIterator __first, _Size __n, const _Tp& __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,_Tp>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,_Tp>)
 
       for ( ; __n > 0; --__n, ++__first)
 	*__first = __value;
@@ -582,11 +582,11 @@ namespace std
 	     _InputIterator2 __first2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
       while (__first1 != __last1 && *__first1 == *__first2)
@@ -617,8 +617,8 @@ namespace std
 	     _InputIterator2 __first2, _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       while (__first1 != __last1 && __binary_pred(*__first1, *__first2))
         {
@@ -644,9 +644,9 @@ namespace std
     equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_EqualOpConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_EqualOpConcept<
 	    typename iterator_traits<_InputIterator1>::value_type,
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
@@ -676,8 +676,8 @@ namespace std
 	  _BinaryPredicate __binary_pred)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	if (!__binary_pred(*__first1, *__first2))
@@ -705,11 +705,11 @@ namespace std
 			    _InputIterator2 __first2, _InputIterator2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
       for (;__first1 != __last1 && __first2 != __last2; ++__first1, ++__first2) 
@@ -741,8 +741,8 @@ namespace std
 			    _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       for ( ; __first1 != __last1 && __first2 != __last2
 	    ; ++__first1, ++__first2) 
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index 3f6c2a22463..755e581a005 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_BVECTOR_H
-#define __GLIBCPP_INTERNAL_BVECTOR_H
+#ifndef _BVECTOR_H
+#define _BVECTOR_H 1
 
 namespace std
 { 
@@ -728,7 +728,7 @@ typedef vector<bool, __alloc> bit_vector;
 
 } // namespace std 
 
-#endif /* __GLIBCPP_INTERNAL_BVECTOR_H */
+#endif /* _BVECTOR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/bits/stl_construct.h b/libstdc++-v3/include/bits/stl_construct.h
index 27fb2e42ec7..08841174f07 100644
--- a/libstdc++-v3/include/bits/stl_construct.h
+++ b/libstdc++-v3/include/bits/stl_construct.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STL_CONSTRUCT_H
-#define _CPP_BITS_STL_CONSTRUCT_H 1
+#ifndef _STL_CONSTRUCT_H
+#define _STL_CONSTRUCT_H 1
 
 #include <bits/type_traits.h>
 #include <new>
@@ -144,5 +144,5 @@ namespace std
     }
 } // namespace std
 
-#endif /* _CPP_BITS_STL_CONSTRUCT_H */
+#endif /* _STL_CONSTRUCT_H */
 
diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h
index ef7a7253e94..e474ede80c0 100644
--- a/libstdc++-v3/include/bits/stl_deque.h
+++ b/libstdc++-v3/include/bits/stl_deque.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_DEQUE_H
-#define __GLIBCPP_INTERNAL_DEQUE_H
+#ifndef _DEQUE_H
+#define _DEQUE_H 1
 
 #include <bits/concept_check.h>
 #include <bits/stl_iterator_base_types.h>
@@ -309,7 +309,7 @@ namespace std
     return !(__x < __y);
   }
   
-  // _GLIBCPP_RESOLVE_LIB_DEFECTS
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
   // According to the resolution of DR179 not only the various comparison
   // operators but also operator- must accept mixed iterator/const_iterator
   // parameters.
@@ -638,7 +638,7 @@ namespace std
     class deque : protected _Deque_base<_Tp, _Alloc>
   {
     // concept requirements
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
   
     typedef _Deque_base<_Tp, _Alloc>           _Base;
   
@@ -1527,4 +1527,4 @@ namespace std
   }
 } // namespace std 
   
-#endif /* __GLIBCPP_INTERNAL_DEQUE_H */
+#endif /* _DEQUE_H */
diff --git a/libstdc++-v3/include/bits/stl_function.h b/libstdc++-v3/include/bits/stl_function.h
index 9ea975d4a8d..90513144726 100644
--- a/libstdc++-v3/include/bits/stl_function.h
+++ b/libstdc++-v3/include/bits/stl_function.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_FUNCTION_H
-#define __GLIBCPP_INTERNAL_FUNCTION_H
+#ifndef _FUNCTION_H
+#define _FUNCTION_H 1
 
 namespace std
 {
@@ -361,7 +361,7 @@ public:
   operator()(const typename _Operation::second_argument_type& __x) const {
     return op(value, __x); 
   }
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
   //109.  Missing binders for non-const sequence elements
   typename _Operation::result_type
   operator()(typename _Operation::second_argument_type& __x) const {
@@ -395,7 +395,7 @@ public:
   operator()(const typename _Operation::first_argument_type& __x) const {
     return op(__x, value); 
   }
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
   //109.  Missing binders for non-const sequence elements
   typename _Operation::result_type
   operator()(typename _Operation::first_argument_type& __x) const {
@@ -729,7 +729,7 @@ mem_fun_ref(_Ret (_Tp::*__f)(_Arg) const)
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_FUNCTION_H */
+#endif /* _FUNCTION_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/bits/stl_heap.h b/libstdc++-v3/include/bits/stl_heap.h
index 8105ff05719..ff829a06f25 100644
--- a/libstdc++-v3/include/bits/stl_heap.h
+++ b/libstdc++-v3/include/bits/stl_heap.h
@@ -57,8 +57,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STL_HEAP_H
-#define _CPP_BITS_STL_HEAP_H 1
+#ifndef _STL_HEAP_H
+#define _STL_HEAP_H 1
 
 namespace std
 {
@@ -89,9 +89,9 @@ namespace std
 	  _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       std::__push_heap(__first, _DistanceType((__last - __first) - 1), _DistanceType(0), 
 		       _ValueType(*(__last - 1)));
@@ -123,7 +123,7 @@ namespace std
 	  _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       std::__push_heap(__first, _DistanceType((__last - __first) - 1), _DistanceType(0), 
@@ -168,9 +168,9 @@ namespace std
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       std::__pop_heap(__first, __last - 1, __last - 1, _ValueType(*(__last - 1)));
     }
@@ -214,7 +214,7 @@ namespace std
 	     _RandomAccessIterator __last, _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       typedef typename iterator_traits<_RandomAccessIterator>::value_type _ValueType;
@@ -231,9 +231,9 @@ namespace std
 	  _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<_ValueType>)
+      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
 
       if (__last - __first < 2) return;
       _DistanceType __len = __last - __first;
@@ -257,7 +257,7 @@ namespace std
 	  _DistanceType;
 
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       if (__last - __first < 2) return;
@@ -277,9 +277,9 @@ namespace std
     sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_RandomAccessIterator>::value_type>)
 
       while (__last - __first > 1)
@@ -292,7 +292,7 @@ namespace std
 	      _Compare __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       while (__last - __first > 1)
@@ -301,7 +301,7 @@ namespace std
 
 } // namespace std
 
-#endif /* _CPP_BITS_STL_HEAP_H */
+#endif /* _STL_HEAP_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index 734ff78fe18..4aa92ffdd20 100644
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -62,8 +62,8 @@
  *  supporting functions and overloaded operators.
  */
 
-#ifndef __GLIBCPP_INTERNAL_ITERATOR_H
-#define __GLIBCPP_INTERNAL_ITERATOR_H
+#ifndef _ITERATOR_H
+#define _ITERATOR_H 1
 
 namespace std
 {
@@ -109,7 +109,7 @@ namespace std
        *  The default constructor default-initializes member @p current.
        *  If it is a pointer, that means it is zero-initialized.
       */
-      // _GLIBCPP_RESOLVE_LIB_DEFECTS
+      // _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 235 No specification of default ctor for reverse_iterator
       reverse_iterator() : current() { }
 
@@ -722,7 +722,7 @@ namespace __gnu_cxx
 	     const __normal_iterator<_Iterator, _Container>& __rhs)
   { return __lhs.base() >= __rhs.base(); }
 
-  // _GLIBCPP_RESOLVE_LIB_DEFECTS
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
   // According to the resolution of DR179 not only the various comparison
   // operators but also operator- must accept mixed iterator/const_iterator
   // parameters.
diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
index 53cf23490a9..a1404e139e4 100644
--- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
+++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
@@ -61,8 +61,8 @@
  *  functions, such as distance() and advance().
  */
 
-#ifndef __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H
-#define __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H
+#ifndef _ITERATOR_BASE_FUNCS_H
+#define _ITERATOR_BASE_FUNCS_H 1
 
 #pragma GCC system_header
 #include <bits/concept_check.h>
@@ -75,7 +75,7 @@ namespace std
                input_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
   
       typename iterator_traits<_InputIterator>::difference_type __n = 0;
       while (__first != __last) {
@@ -90,7 +90,7 @@ namespace std
                random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
       return __last - __first;
     }
   
@@ -119,7 +119,7 @@ namespace std
     __advance(_InputIterator& __i, _Distance __n, input_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
       while (__n--) ++__i;
     }
   
@@ -129,7 +129,7 @@ namespace std
               bidirectional_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
+      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BidirectionalIterator>)
   
       if (__n > 0)
         while (__n--) ++__i;
@@ -143,7 +143,7 @@ namespace std
               random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
       __i += __n;
     }
   
@@ -168,4 +168,4 @@ namespace std
     }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_ITERATOR_BASE_FUNCS_H */
+#endif /* _ITERATOR_BASE_FUNCS_H */
diff --git a/libstdc++-v3/include/bits/stl_iterator_base_types.h b/libstdc++-v3/include/bits/stl_iterator_base_types.h
index 8b040e49602..373caba2ca3 100644
--- a/libstdc++-v3/include/bits/stl_iterator_base_types.h
+++ b/libstdc++-v3/include/bits/stl_iterator_base_types.h
@@ -61,8 +61,8 @@
  *  such as iterator_traits and struct iterator.
  */
 
-#ifndef __GLIBCPP_INTERNAL_ITERATOR_BASE_TYPES_H
-#define __GLIBCPP_INTERNAL_ITERATOR_BASE_TYPES_H
+#ifndef _ITERATOR_BASE_TYPES_H
+#define _ITERATOR_BASE_TYPES_H 1
 
 #pragma GCC system_header
 
@@ -161,5 +161,5 @@ namespace std
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_ITERATOR_BASE_TYPES_H */
+#endif /* _ITERATOR_BASE_TYPES_H */
 
diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h
index 0fa7cd23a7b..95fd78e07ea 100644
--- a/libstdc++-v3/include/bits/stl_list.h
+++ b/libstdc++-v3/include/bits/stl_list.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_LIST_H
-#define __GLIBCPP_INTERNAL_LIST_H
+#ifndef _LIST_H
+#define _LIST_H 1
 
 #include <bits/concept_check.h>
 
@@ -366,7 +366,7 @@ namespace std
     class list : protected _List_base<_Tp, _Alloc>
   {
     // concept requirements
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
   
     typedef _List_base<_Tp, _Alloc>                       _Base;
   
@@ -1108,4 +1108,4 @@ namespace std
     { __x.swap(__y); }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_LIST_H */
+#endif /* _LIST_H */
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 853ef3ec032..7b15dccae1d 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_MAP_H
-#define __GLIBCPP_INTERNAL_MAP_H
+#ifndef _MAP_H
+#define _MAP_H 1
 
 #include <bits/concept_check.h>
 
@@ -91,8 +91,8 @@ namespace std
     class map
   {
     // concept requirements
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
-    __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
   
   public:
     typedef _Key                                          key_type;
@@ -311,7 +311,7 @@ namespace std
     operator[](const key_type& __k)
     {
       // concept requirements
-      __glibcpp_function_requires(_DefaultConstructibleConcept<mapped_type>)
+      __glibcxx_function_requires(_DefaultConstructibleConcept<mapped_type>)
   
       iterator __i = lower_bound(__k);
       // __i->first is greater than or equivalent to __k.
@@ -655,4 +655,4 @@ namespace std
     { __x.swap(__y); }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_MAP_H */
+#endif /* _MAP_H */
diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index f35e3a21239..ebc7ff9137b 100644
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_MULTIMAP_H
-#define __GLIBCPP_INTERNAL_MULTIMAP_H
+#ifndef _MULTIMAP_H
+#define _MULTIMAP_H 1
 
 #include <bits/concept_check.h>
 
@@ -105,8 +105,8 @@ namespace std
     class multimap
   {
     // concept requirements
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
-    __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
   
   public:
     typedef _Key                                          key_type;
@@ -634,4 +634,4 @@ namespace std
     { __x.swap(__y); }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_MULTIMAP_H */
+#endif /* _MULTIMAP_H */
diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index 9235f8fd5dc..7c908e1b77e 100644
--- a/libstdc++-v3/include/bits/stl_multiset.h
+++ b/libstdc++-v3/include/bits/stl_multiset.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_MULTISET_H
-#define __GLIBCPP_INTERNAL_MULTISET_H
+#ifndef _MULTISET_H
+#define _MULTISET_H 1
 
 #include <bits/concept_check.h>
 
@@ -84,8 +84,8 @@ template <class _Key, class _Compare, class _Alloc>
 class multiset
 {
   // concept requirements
-  __glibcpp_class_requires(_Key, _SGIAssignableConcept)
-  __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
+  __glibcxx_class_requires(_Key, _SGIAssignableConcept)
+  __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
 
 public:
 
@@ -183,7 +183,7 @@ public:
 
   size_type count(const key_type& __x) const { return _M_t.count(__x); }
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //214.  set::find() missing const overload
   iterator find(const key_type& __x) { return _M_t.find(__x); }
   const_iterator find(const key_type& __x) const { return _M_t.find(__x); }
@@ -270,4 +270,4 @@ inline void swap(multiset<_Key,_Compare,_Alloc>& __x,
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_MULTISET_H */
+#endif /* _MULTISET_H */
diff --git a/libstdc++-v3/include/bits/stl_numeric.h b/libstdc++-v3/include/bits/stl_numeric.h
index 53b193b95ce..4aa92edf91d 100644
--- a/libstdc++-v3/include/bits/stl_numeric.h
+++ b/libstdc++-v3/include/bits/stl_numeric.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STL_NUMERIC_H
-#define _CPP_BITS_STL_NUMERIC_H 1
+#ifndef _STL_NUMERIC_H
+#define _STL_NUMERIC_H 1
 
 namespace std
 {
@@ -69,7 +69,7 @@ namespace std
     accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
 
       for ( ; __first != __last; ++__first)
 	__init = __init + *__first;
@@ -82,7 +82,7 @@ namespace std
 	       _BinaryOperation __binary_op)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
 
       for ( ; __first != __last; ++__first)
 	__init = __binary_op(__init, *__first);
@@ -95,8 +95,8 @@ namespace std
 		  _InputIterator2 __first2, _Tp __init)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	__init = __init + (*__first1 * *__first2);
@@ -112,8 +112,8 @@ namespace std
 		  _BinaryOperation2 __binary_op2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
 
       for ( ; __first1 != __last1; ++__first1, ++__first2)
 	__init = __binary_op1(__init, __binary_op2(*__first1, *__first2));
@@ -128,8 +128,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -149,8 +149,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -170,8 +170,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -192,8 +192,8 @@ namespace std
       typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
 
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
 
       if (__first == __last) return __result;
       *__result = *__first;
@@ -208,4 +208,4 @@ namespace std
 
 } // namespace std
 
-#endif /* _CPP_BITS_STL_NUMERIC_H */
+#endif /* _STL_NUMERIC_H */
diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h
index b0411b2becc..0d0047fac48 100644
--- a/libstdc++-v3/include/bits/stl_pair.h
+++ b/libstdc++-v3/include/bits/stl_pair.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_PAIR_H
-#define __GLIBCPP_INTERNAL_PAIR_H
+#ifndef _PAIR_H
+#define _PAIR_H 1
 
 namespace std
 {
@@ -72,7 +72,7 @@ struct pair {
 
   _T1 first;                 ///< @c first is a copy of the first object
   _T2 second;                ///< @c second is a copy of the second object
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //265.  std::pair::pair() effects overly restrictive
   /** The default constructor creates @c first and @c second using their
    *  respective default constructors.  */
@@ -138,7 +138,7 @@ inline bool operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) {
  *  the LWG by default.
 */
 template <class _T1, class _T2>
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //181.  make_pair() unintended behavior
 inline pair<_T1, _T2> make_pair(_T1 __x, _T2 __y)
 #else
@@ -150,7 +150,7 @@ inline pair<_T1, _T2> make_pair(const _T1& __x, const _T2& __y)
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_PAIR_H */
+#endif /* _PAIR_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/bits/stl_queue.h b/libstdc++-v3/include/bits/stl_queue.h
index 38c378c8773..0bb41acaf9f 100644
--- a/libstdc++-v3/include/bits/stl_queue.h
+++ b/libstdc++-v3/include/bits/stl_queue.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_QUEUE_H
-#define __GLIBCPP_INTERNAL_QUEUE_H
+#ifndef _QUEUE_H
+#define _QUEUE_H 1
 
 #include <bits/concept_check.h>
 
@@ -106,10 +106,10 @@ namespace std
   {
     // concept requirements
     typedef typename _Sequence::value_type _Sequence_value_type;
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
-    __glibcpp_class_requires(_Sequence, _FrontInsertionSequenceConcept)
-    __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept)
-    __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires(_Sequence, _FrontInsertionSequenceConcept)
+    __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept)
+    __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
   
     template <typename _Tp1, typename _Seq1>
     friend bool operator== (const queue<_Tp1, _Seq1>&,
@@ -306,11 +306,11 @@ namespace std
   {
     // concept requirements
     typedef typename _Sequence::value_type _Sequence_value_type;
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
-    __glibcpp_class_requires(_Sequence, _SequenceConcept)
-    __glibcpp_class_requires(_Sequence, _RandomAccessContainerConcept)
-    __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-    __glibcpp_class_requires4(_Compare, bool, _Tp, _Tp, _BinaryFunctionConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires(_Sequence, _SequenceConcept)
+    __glibcxx_class_requires(_Sequence, _RandomAccessContainerConcept)
+    __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
+    __glibcxx_class_requires4(_Compare, bool, _Tp, _Tp, _BinaryFunctionConcept)
   
   public:
     typedef typename _Sequence::value_type                value_type;
@@ -427,4 +427,4 @@ namespace std
   // No equality/comparison operators are provided for priority_queue.
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_QUEUE_H */
+#endif /* _QUEUE_H */
diff --git a/libstdc++-v3/include/bits/stl_raw_storage_iter.h b/libstdc++-v3/include/bits/stl_raw_storage_iter.h
index c4ff66963c5..3460205e7a8 100644
--- a/libstdc++-v3/include/bits/stl_raw_storage_iter.h
+++ b/libstdc++-v3/include/bits/stl_raw_storage_iter.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H
-#define _CPP_BITS_STL_RAW_STORAGE_ITERATOR_H 1
+#ifndef _STL_RAW_STORAGE_ITERATOR_H
+#define _STL_RAW_STORAGE_ITERATOR_H 1
 
 namespace std
 {
diff --git a/libstdc++-v3/include/bits/stl_relops.h b/libstdc++-v3/include/bits/stl_relops.h
index a8a3a173dd4..18561ec2dc1 100644
--- a/libstdc++-v3/include/bits/stl_relops.h
+++ b/libstdc++-v3/include/bits/stl_relops.h
@@ -68,8 +68,8 @@
  *  @endif
  */
 
-#ifndef _CPP_BITS_STL_RELOPS_H
-#define _CPP_BITS_STL_RELOPS_H 1
+#ifndef _STL_RELOPS_H
+#define _STL_RELOPS_H 1
 
 namespace std
 {
@@ -134,4 +134,4 @@ inline bool operator>=(const _Tp& __x, const _Tp& __y) {
   } // namespace rel_ops
 } // namespace std
 
-#endif /* _CPP_BITS_STL_RELOPS_H */
+#endif /* _STL_RELOPS_H */
diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h
index 96dc4b307a3..3c477608e9b 100644
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_SET_H
-#define __GLIBCPP_INTERNAL_SET_H
+#ifndef _SET_H
+#define _SET_H 1
 
 #include <bits/concept_check.h>
 
@@ -85,8 +85,8 @@ template <class _Key, class _Compare, class _Alloc>
 class set
 {
   // concept requirements
-  __glibcpp_class_requires(_Key, _SGIAssignableConcept)
-  __glibcpp_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
+  __glibcxx_class_requires(_Key, _SGIAssignableConcept)
+  __glibcxx_class_requires4(_Compare, bool, _Key, _Key, _BinaryFunctionConcept)
 
 public:
   // typedefs:
@@ -182,7 +182,7 @@ public:
     return _M_t.find(__x) == _M_t.end() ? 0 : 1;
   }
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 //214.  set::find() missing const overload
   iterator find(const key_type& __x) { return _M_t.find(__x); }
   const_iterator find(const key_type& __x) const { return _M_t.find(__x); }
@@ -267,4 +267,4 @@ inline void swap(set<_Key,_Compare,_Alloc>& __x,
 
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_SET_H */
+#endif /* _SET_H */
diff --git a/libstdc++-v3/include/bits/stl_stack.h b/libstdc++-v3/include/bits/stl_stack.h
index 54b3e158026..b9847ceb6ad 100644
--- a/libstdc++-v3/include/bits/stl_stack.h
+++ b/libstdc++-v3/include/bits/stl_stack.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_STACK_H
-#define __GLIBCPP_INTERNAL_STACK_H
+#ifndef _STACK_H
+#define _STACK_H 1
 
 #include <bits/concept_check.h>
 
@@ -107,9 +107,9 @@ namespace std
   {
     // concept requirements
     typedef typename _Sequence::value_type _Sequence_value_type;
-    __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
-    __glibcpp_class_requires(_Sequence, _BackInsertionSequenceConcept)
-    __glibcpp_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
+    __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
+    __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept)
+    __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
   
     template <typename _Tp1, typename _Seq1>
     friend bool operator== (const stack<_Tp1, _Seq1>&,
@@ -247,4 +247,4 @@ namespace std
     { return !(__x < __y); }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_STACK_H */
+#endif /* _STACK_H */
diff --git a/libstdc++-v3/include/bits/stl_tempbuf.h b/libstdc++-v3/include/bits/stl_tempbuf.h
index 4f90402fea2..1fa5afcda17 100644
--- a/libstdc++-v3/include/bits/stl_tempbuf.h
+++ b/libstdc++-v3/include/bits/stl_tempbuf.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_TEMPBUF_H
-#define __GLIBCPP_INTERNAL_TEMPBUF_H
+#ifndef _TEMPBUF_H
+#define _TEMPBUF_H 1
 
 namespace std
 {
@@ -75,7 +75,7 @@ template <class _ForwardIterator, class _Tp>
   class _Temporary_buffer
 {
   // concept requirements
-  __glibcpp_class_requires(_ForwardIterator, _ForwardIteratorConcept)
+  __glibcxx_class_requires(_ForwardIterator, _ForwardIteratorConcept)
 
   ptrdiff_t  _M_original_len;
   ptrdiff_t  _M_len;
@@ -145,5 +145,5 @@ private:
     
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_TEMPBUF_H */
+#endif /* _TEMPBUF_H */
 
diff --git a/libstdc++-v3/include/bits/stl_threads.h b/libstdc++-v3/include/bits/stl_threads.h
index 1ae75373a86..65407ce4aea 100644
--- a/libstdc++-v3/include/bits/stl_threads.h
+++ b/libstdc++-v3/include/bits/stl_threads.h
@@ -45,8 +45,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __SGI_STL_INTERNAL_THREADS_H
-#define __SGI_STL_INTERNAL_THREADS_H
+#ifndef _STL_THREADS_H
+#define _STL_THREADS_H 1
 
 #include <cstddef>
 
@@ -117,11 +117,11 @@ namespace std
 #if !defined(__GTHREAD_MUTEX_INIT) && defined(__GTHREAD_MUTEX_INIT_FUNCTION)
 namespace __gnu_cxx
 {
-  extern __gthread_mutex_t _GLIBCPP_mutex;
-  extern __gthread_mutex_t *_GLIBCPP_mutex_address;
-  extern __gthread_once_t _GLIBCPP_once;
-  extern void _GLIBCPP_mutex_init (void);
-  extern void _GLIBCPP_mutex_address_init (void);
+  extern __gthread_mutex_t _GLIBCXX_mutex;
+  extern __gthread_mutex_t *_GLIBCXX_mutex_address;
+  extern __gthread_once_t _GLIBCXX_once;
+  extern void _GLIBCXX_mutex_init (void);
+  extern void _GLIBCXX_mutex_address_init (void);
 }
 #endif
 
@@ -143,24 +143,24 @@ namespace std
       // There should be no code in this path given the usage rules above.
 #elif defined(__GTHREAD_MUTEX_INIT_FUNCTION)
       if (_M_init_flag) return;
-      if (__gthread_once (&__gnu_cxx::_GLIBCPP_once,
-			  __gnu_cxx::_GLIBCPP_mutex_init) != 0
+      if (__gthread_once (&__gnu_cxx::_GLIBCXX_once,
+			  __gnu_cxx::_GLIBCXX_mutex_init) != 0
 	  && __gthread_active_p ())
 	abort ();
-      __gthread_mutex_lock (&__gnu_cxx::_GLIBCPP_mutex);
+      __gthread_mutex_lock (&__gnu_cxx::_GLIBCXX_mutex);
       if (!_M_init_flag) 
 	{
 	  // Even though we have a global lock, we use __gthread_once to be
 	  // absolutely certain the _M_lock mutex is only initialized once on
 	  // multiprocessor systems.
-	  __gnu_cxx::_GLIBCPP_mutex_address = &_M_lock;
+	  __gnu_cxx::_GLIBCXX_mutex_address = &_M_lock;
 	  if (__gthread_once (&_M_once,
-			      __gnu_cxx::_GLIBCPP_mutex_address_init) != 0
+			      __gnu_cxx::_GLIBCXX_mutex_address_init) != 0
 	    && __gthread_active_p ())
 	    abort ();
 	  _M_init_flag = 1;
 	}
-      __gthread_mutex_unlock (&__gnu_cxx::_GLIBCPP_mutex);
+      __gthread_mutex_unlock (&__gnu_cxx::_GLIBCXX_mutex);
 #endif
     }
 
diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 33c8ebd7915..2172c98f6a4 100644
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -60,8 +60,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_TREE_H
-#define __GLIBCPP_INTERNAL_TREE_H
+#ifndef _TREE_H
+#define _TREE_H 1
 
 /*
 
diff --git a/libstdc++-v3/include/bits/stl_uninitialized.h b/libstdc++-v3/include/bits/stl_uninitialized.h
index e2106e0a50a..e60e24a1c01 100644
--- a/libstdc++-v3/include/bits/stl_uninitialized.h
+++ b/libstdc++-v3/include/bits/stl_uninitialized.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STL_UNINITIALIZED_H
-#define _CPP_BITS_STL_UNINITIALIZED_H 1
+#ifndef _STL_UNINITIALIZED_H
+#define _STL_UNINITIALIZED_H 1
 
 #include <cstring>
 
@@ -283,4 +283,4 @@ namespace std
 
 } // namespace std
 
-#endif /* _CPP_BITS_STL_UNINITIALIZED_H */
+#endif /* _STL_UNINITIALIZED_H */
diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h
index 91a6d9ba9ab..43d28210a09 100644
--- a/libstdc++-v3/include/bits/stl_vector.h
+++ b/libstdc++-v3/include/bits/stl_vector.h
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_VECTOR_H
-#define __GLIBCPP_INTERNAL_VECTOR_H
+#ifndef _VECTOR_H
+#define _VECTOR_H 1
 
 #include <bits/stl_iterator_base_funcs.h>
 #include <bits/functexcept.h>
@@ -186,7 +186,7 @@ namespace std
     class vector : protected _Vector_base<_Tp, _Alloc>
     {
       // Concept requirements.
-      __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
   
       typedef _Vector_base<_Tp, _Alloc>                     _Base;
       typedef vector<_Tp, _Alloc>                           vector_type;
@@ -968,4 +968,4 @@ namespace std
     { __x.swap(__y); }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_VECTOR_H */
+#endif /* _VECTOR_H */
diff --git a/libstdc++-v3/include/bits/stream_iterator.h b/libstdc++-v3/include/bits/stream_iterator.h
index 4897fc36fef..dcbf9f01d91 100644
--- a/libstdc++-v3/include/bits/stream_iterator.h
+++ b/libstdc++-v3/include/bits/stream_iterator.h
@@ -32,8 +32,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STREAM_ITERATOR_H
-#define _CPP_BITS_STREAM_ITERATOR_H 1
+#ifndef _STREAM_ITERATOR_H
+#define _STREAM_ITERATOR_H 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc
index a16169ad5ef..2fac3508e33 100644
--- a/libstdc++-v3/include/bits/streambuf.tcc
+++ b/libstdc++-v3/include/bits/streambuf.tcc
@@ -32,8 +32,8 @@
 // ISO C++ 14882: 27.5  Stream buffers
 //
 
-#ifndef _CPP_BITS_STREAMBUF_TCC
-#define _CPP_BITS_STREAMBUF_TCC 1
+#ifndef _STREAMBUF_TCC
+#define _STREAMBUF_TCC 1
 
 #pragma GCC system_header
 
@@ -156,14 +156,14 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class basic_streambuf<char>;
   extern template
     streamsize
     __copy_streambufs(basic_ios<char>&, basic_streambuf<char>*,
 		      basic_streambuf<char>*); 
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class basic_streambuf<wchar_t>;
   extern template
     streamsize
diff --git a/libstdc++-v3/include/bits/streambuf_iterator.h b/libstdc++-v3/include/bits/streambuf_iterator.h
index 95def0b7e4d..f25cd4f35ed 100644
--- a/libstdc++-v3/include/bits/streambuf_iterator.h
+++ b/libstdc++-v3/include/bits/streambuf_iterator.h
@@ -33,8 +33,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STREAMBUF_ITERATOR_H
-#define _CPP_BITS_STREAMBUF_ITERATOR_H 1
+#ifndef _STREAMBUF_ITERATOR_H
+#define _STREAMBUF_ITERATOR_H 1
 
 #pragma GCC system_header
 
@@ -109,7 +109,7 @@ namespace std
 	return __old; 
       }
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
       // 110 istreambuf_iterator::equal not const
       // NB: there is also number 111 (NAD, Future) pending on this function.
       bool 
diff --git a/libstdc++-v3/include/bits/stringfwd.h b/libstdc++-v3/include/bits/stringfwd.h
index db40befdab6..75775804a1b 100644
--- a/libstdc++-v3/include/bits/stringfwd.h
+++ b/libstdc++-v3/include/bits/stringfwd.h
@@ -36,8 +36,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_STRINGFWD_H
-#define _CPP_BITS_STRINGFWD_H	1
+#ifndef _STRINGFWD_H
+#define _STRINGFWD_H 1
 
 #pragma GCC system_header
 
@@ -59,11 +59,11 @@ namespace std
 
   typedef basic_string<char>    string;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> struct char_traits<wchar_t>;
 
   typedef basic_string<wchar_t> wstring;
 #endif
 } // namespace std
 
-#endif	// _CPP_BITS_STRINGFWD_H
+#endif	// _STRINGFWD_H
diff --git a/libstdc++-v3/include/bits/type_traits.h b/libstdc++-v3/include/bits/type_traits.h
index 61bc4369275..80f7e39575e 100644
--- a/libstdc++-v3/include/bits/type_traits.h
+++ b/libstdc++-v3/include/bits/type_traits.h
@@ -46,8 +46,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_TYPE_TRAITS_H
-#define _CPP_BITS_TYPE_TRAITS_H 1
+#ifndef _TYPE_TRAITS_H
+#define _TYPE_TRAITS_H 1
 
 #pragma GCC system_header
 
@@ -332,7 +332,7 @@ struct _Is_normal_iterator< __gnu_cxx::__normal_iterator<_Iterator, _Container>
    typedef __true_type _Normal;
 };
 
-#endif /* _CPP_BITS_TYPE_TRAITS_H */
+#endif /* _TYPE_TRAITS_H */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/bits/valarray_after.h b/libstdc++-v3/include/bits/valarray_after.h
index 687e6d21321..2506a4bdde4 100644
--- a/libstdc++-v3/include/bits/valarray_after.h
+++ b/libstdc++-v3/include/bits/valarray_after.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_VALARRAY_AFTER_H
-#define _CPP_VALARRAY_AFTER_H 1
+#ifndef _VALARRAY_AFTER_H
+#define _VALARRAY_AFTER_H 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h
index 68aec240b45..3b14f1d3c1f 100644
--- a/libstdc++-v3/include/bits/valarray_array.h
+++ b/libstdc++-v3/include/bits/valarray_array.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_BITS_ARRAY_H
-#define _CPP_BITS_ARRAY_H 1
+#ifndef _VALARRAY_ARRAY_H
+#define _VALARRAY_ARRAY_H 1
 
 #pragma GCC system_header
 
@@ -618,12 +618,12 @@ _Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m,		\
 
 } // std::
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export 
 # include <bits/valarray_array.tcc>    
 #endif
            
-#endif /* _CPP_BITS_ARRAY_H */
+#endif /* _ARRAY_H */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/valarray_array.tcc b/libstdc++-v3/include/bits/valarray_array.tcc
index ba4b0830a47..acf21a0fcd2 100644
--- a/libstdc++-v3/include/bits/valarray_array.tcc
+++ b/libstdc++-v3/include/bits/valarray_array.tcc
@@ -29,8 +29,8 @@
 
 // Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
 
-#ifndef _CPP_BITS_VALARRAY_ARRAY_TCC 
-#define _CPP_BITS_VALARRAY_ARRAY_TCC 1
+#ifndef _VALARRAY_ARRAY_TCC 
+#define _VALARRAY_ARRAY_TCC 1
 
 namespace std
 {
@@ -52,7 +52,7 @@ __valarray_fill (_Array<_Tp> __a, size_t __n, _Array<bool> __m, const _Tp& __t)
 
 export template<typename _Tp>
 void
-__valarray_copy (_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b, size_t __n)
+__valarray_copy(_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b, size_t __n)
 {
     _Tp* __p (__a._M_data);
     bool* __ok (__m._M_data);
@@ -154,7 +154,7 @@ __valarray_copy_construct (_Array<_Tp> __a, _Array<bool> __m,
 
 } // std::
 
-#endif /* _CPP_BITS_VALARRAY_ARRAY_TCC */
+#endif /* _VALARRAY_ARRAY_TCC */
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/bits/valarray_before.h b/libstdc++-v3/include/bits/valarray_before.h
index 7a0b677d023..775d150eff1 100644
--- a/libstdc++-v3/include/bits/valarray_before.h
+++ b/libstdc++-v3/include/bits/valarray_before.h
@@ -34,8 +34,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef _CPP_VALARRAY_BEFORE_H
-#define _CPP_VALARRAY_BEFORE_H 1
+#ifndef _VALARRAY_BEFORE_H
+#define _VALARRAY_BEFORE_H 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/bits/vector.tcc b/libstdc++-v3/include/bits/vector.tcc
index e5fdea82478..7e65c4d9c8d 100644
--- a/libstdc++-v3/include/bits/vector.tcc
+++ b/libstdc++-v3/include/bits/vector.tcc
@@ -58,8 +58,8 @@
  *  You should not attempt to use it directly.
  */
 
-#ifndef __GLIBCPP_INTERNAL_VECTOR_TCC
-#define __GLIBCPP_INTERNAL_VECTOR_TCC
+#ifndef _VECTOR_TCC
+#define _VECTOR_TCC 1
 
 namespace std
 {
@@ -269,7 +269,7 @@ namespace std
       }
     }
   
-  #ifdef _GLIBCPP_DEPRECATED
+  #ifdef _GLIBCXX_DEPRECATED
   template<typename _Tp, typename _Alloc>
     void
     vector<_Tp,_Alloc>::
@@ -454,4 +454,4 @@ namespace std
     }
 } // namespace std
 
-#endif /* __GLIBCPP_INTERNAL_VECTOR_TCC */
+#endif /* _VECTOR_TCC */
diff --git a/libstdc++-v3/include/c/std_cctype.h b/libstdc++-v3/include/c/std_cctype.h
index 9d84a3d68b7..1271e072a69 100644
--- a/libstdc++-v3/include/c/std_cctype.h
+++ b/libstdc++-v3/include/c/std_cctype.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: <ccytpe>
 //
 
-#ifndef _CPP_CCTYPE
-#define _CPP_CCTYPE 1
+#ifndef _CCTYPE
+#define _CCTYPE 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cerrno.h b/libstdc++-v3/include/c/std_cerrno.h
index 646d6096574..21c2701fa18 100644
--- a/libstdc++-v3/include/c/std_cerrno.h
+++ b/libstdc++-v3/include/c/std_cerrno.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CERRNO
-#define _CPP_CERRNO 1
+#ifndef _CERRNO
+#define _CERRNO 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cfloat.h b/libstdc++-v3/include/c/std_cfloat.h
index 9c95760b38b..bcdb5f7bc29 100644
--- a/libstdc++-v3/include/c/std_cfloat.h
+++ b/libstdc++-v3/include/c/std_cfloat.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-#ifndef _CPP_CFLOAT
-#define _CPP_CFLOAT 1
+#ifndef _CFLOAT
+#define _CFLOAT 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_climits.h b/libstdc++-v3/include/c/std_climits.h
index 9194cb9adf7..659bed9caed 100644
--- a/libstdc++-v3/include/c/std_climits.h
+++ b/libstdc++-v3/include/c/std_climits.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-#ifndef _CPP_CLIMITS
-#define _CPP_CLIMITS	1
+#ifndef _CLIMITS
+#define _CLIMITS 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_clocale.h b/libstdc++-v3/include/c/std_clocale.h
index b6b3c22268a..6ac30a77fd7 100644
--- a/libstdc++-v3/include/c/std_clocale.h
+++ b/libstdc++-v3/include/c/std_clocale.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.2.2  Implementation properties: C library
 //
 
-#ifndef _CPP_CLOCALE
-#define _CPP_CLOCALE 1
+#ifndef _CLOCALE
+#define _CLOCALE 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cmath.h b/libstdc++-v3/include/c/std_cmath.h
index beb7141625c..9d5d7c916f6 100644
--- a/libstdc++-v3/include/c/std_cmath.h
+++ b/libstdc++-v3/include/c/std_cmath.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 26.5  C library
 //
 
-#ifndef _CPP_CMATH
-#define _CPP_CMATH 1
+#ifndef _CMATH
+#define _CMATH 1
  
 #pragma GCC system_header
 
@@ -93,7 +93,7 @@ namespace std
   abs(long double __x)
   { return __builtin_fabsl(__x); }
 
-#if _GLIBCPP_HAVE_MODFF
+#if _GLIBCXX_HAVE_MODFF
   inline float 
   modf(float __x, float* __iptr) { return modff(__x, __iptr); }
 #else
@@ -107,7 +107,7 @@ namespace std
   }
 #endif
 
-#if _GLIBCPP_HAVE_MODFL
+#if _GLIBCXX_HAVE_MODFL
   inline long double 
   modf(long double __x, long double* __iptr) { return modfl(__x, __iptr); }
 #else
diff --git a/libstdc++-v3/include/c/std_csetjmp.h b/libstdc++-v3/include/c/std_csetjmp.h
index fe3f9c70bcd..ad80a28ccb7 100644
--- a/libstdc++-v3/include/c/std_csetjmp.h
+++ b/libstdc++-v3/include/c/std_csetjmp.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CPP_CSETJMP
-#define _CPP_CSETJMP 1
+#ifndef _CSETJMP
+#define _CSETJMP 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_csignal.h b/libstdc++-v3/include/c/std_csignal.h
index 09614e7ea01..6f2790c5b31 100644
--- a/libstdc++-v3/include/c/std_csignal.h
+++ b/libstdc++-v3/include/c/std_csignal.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CPP_CSIGNAL
-#define _CPP_CSIGNAL 1
+#ifndef _CSIGNAL
+#define _CSIGNAL 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cstdarg.h b/libstdc++-v3/include/c/std_cstdarg.h
index 39d019bc1c2..5f66f906a72 100644
--- a/libstdc++-v3/include/c/std_cstdarg.h
+++ b/libstdc++-v3/include/c/std_cstdarg.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CPP_CSTDARG
-#define _CPP_CSTDARG 1
+#ifndef _CSTDARG
+#define _CSTDARG 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cstddef.h b/libstdc++-v3/include/c/std_cstddef.h
index 82561cdac7b..b88944e61b7 100644
--- a/libstdc++-v3/include/c/std_cstddef.h
+++ b/libstdc++-v3/include/c/std_cstddef.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 18.1  Types
 //
 
-#ifndef _CPP_CSTDDEF
-#define _CPP_CSTDDEF 1
+#ifndef _CSTDDEF
+#define _CSTDDEF 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cstdio.h b/libstdc++-v3/include/c/std_cstdio.h
index 3d6272aa62e..0ef5787a7f5 100644
--- a/libstdc++-v3/include/c/std_cstdio.h
+++ b/libstdc++-v3/include/c/std_cstdio.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 27.8.2  C Library files
 //
 
-#ifndef _CPP_CSTDIO
-#define _CPP_CSTDIO 1
+#ifndef _CSTDIO
+#define _CSTDIO 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cstdlib.h b/libstdc++-v3/include/c/std_cstdlib.h
index 57ade0dfb36..1c34b36b601 100644
--- a/libstdc++-v3/include/c/std_cstdlib.h
+++ b/libstdc++-v3/include/c/std_cstdlib.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CPP_CSTDLIB
-#define _CPP_CSTDLIB 1
+#ifndef _CSTDLIB
+#define _CSTDLIB 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cstring.h b/libstdc++-v3/include/c/std_cstring.h
index 656ff52be34..e5c786d2973 100644
--- a/libstdc++-v3/include/c/std_cstring.h
+++ b/libstdc++-v3/include/c/std_cstring.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.4.6  C library
 //
 
-#ifndef _CPP_CSTRING
-#define _CPP_CSTRING 1
+#ifndef _CSTRING
+#define _CSTRING 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_ctime.h b/libstdc++-v3/include/c/std_ctime.h
index ba9103ee054..17d965afa90 100644
--- a/libstdc++-v3/include/c/std_ctime.h
+++ b/libstdc++-v3/include/c/std_ctime.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 20.5  Date and time
 //
 
-#ifndef _CPP_CTIME
-#define _CPP_CTIME 1
+#ifndef _CTIME
+#define _CTIME 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c/std_cwchar.h b/libstdc++-v3/include/c/std_cwchar.h
index d06f5e4efcd..61126d96392 100644
--- a/libstdc++-v3/include/c/std_cwchar.h
+++ b/libstdc++-v3/include/c/std_cwchar.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 21.4
 //
 
-#ifndef _CPP_CWCHAR
-#define _CPP_CWCHAR 1
+#ifndef _CWCHAR
+#define _CWCHAR 1
 
 #pragma GCC system_header
 
@@ -40,13 +40,13 @@
 #include <cstddef>
 #include <ctime>
 
-#if _GLIBCPP_HAVE_WCHAR_H
+#if _GLIBCXX_HAVE_WCHAR_H
 #include_next <wchar.h>
 #endif
 
 // Need to do a bit of trickery here with mbstate_t as char_traits
 // assumes it is in wchar.h, regardless of wchar_t specializations.
-#ifndef _GLIBCPP_HAVE_MBSTATE_T
+#ifndef _GLIBCXX_HAVE_MBSTATE_T
 namespace std
 {
   extern "C" 
diff --git a/libstdc++-v3/include/c/std_cwctype.h b/libstdc++-v3/include/c/std_cwctype.h
index d51569843a6..b94497bbe83 100644
--- a/libstdc++-v3/include/c/std_cwctype.h
+++ b/libstdc++-v3/include/c/std_cwctype.h
@@ -31,14 +31,14 @@
 // ISO C++ 14882: <cwctype>
 //
 
-#ifndef _CPP_CWCTYPE
-#define _CPP_CWCTYPE 1
+#ifndef _CWCTYPE
+#define _CWCTYPE 1
 
 #pragma GCC system_header
 
 #include <bits/c++config.h>
 
-#if _GLIBCPP_HAVE_WCTYPE_H
+#if _GLIBCXX_HAVE_WCTYPE_H
 #include_next <wctype.h>
 #endif
 
diff --git a/libstdc++-v3/include/c_compatibility/ctype.h b/libstdc++-v3/include/c_compatibility/ctype.h
index 1989347e2d8..3a610d1777b 100644
--- a/libstdc++-v3/include/c_compatibility/ctype.h
+++ b/libstdc++-v3/include/c_compatibility/ctype.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_CTYPE_H_
-#define _CPP_CTYPE_H_ 1
+#ifndef _GLIBCXX_CTYPE_H
+#define _GLIBCXX_CTYPE_H 1
 
 #include <cctype>
 
diff --git a/libstdc++-v3/include/c_compatibility/errno.h b/libstdc++-v3/include/c_compatibility/errno.h
index f890b537549..f6b2b768680 100644
--- a/libstdc++-v3/include/c_compatibility/errno.h
+++ b/libstdc++-v3/include/c_compatibility/errno.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_ERRNO_H_
-#define _CPP_ERRNO_H_ 1
+#ifndef _GLIBCXX_ERRNO_H
+#define _GLIBCXX_ERRNO_H 1
 
 #include <cerrno>
 
diff --git a/libstdc++-v3/include/c_compatibility/float.h b/libstdc++-v3/include/c_compatibility/float.h
index 7d7b9d44f9f..5eaaba6e593 100644
--- a/libstdc++-v3/include/c_compatibility/float.h
+++ b/libstdc++-v3/include/c_compatibility/float.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_FLOAT_H_
-#define _CPP_FLOAT_H_ 1
+#ifndef _GLIBCXX_FLOAT_H
+#define _GLIBCXX_FLOAT_H 1
 
 #include <cfloat>
 
diff --git a/libstdc++-v3/include/c_compatibility/iso646.h b/libstdc++-v3/include/c_compatibility/iso646.h
index 25b6140ba53..c7a5fbba251 100644
--- a/libstdc++-v3/include/c_compatibility/iso646.h
+++ b/libstdc++-v3/include/c_compatibility/iso646.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_ISO646_H_
-#define _CPP_ISO646_H_ 1
+#ifndef _GLIBCXX_ISO646_H
+#define _GLIBCXX_ISO646_H 1
 
 #include <ciso646>
 
diff --git a/libstdc++-v3/include/c_compatibility/limits.h b/libstdc++-v3/include/c_compatibility/limits.h
index 9ddbce8990e..75fb82b58c0 100644
--- a/libstdc++-v3/include/c_compatibility/limits.h
+++ b/libstdc++-v3/include/c_compatibility/limits.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_LIMITS_H_
-#define _CPP_LIMITS_H_ 1
+#ifndef _GLIBCXX_LIMITS_H
+#define _GLIBCXX_LIMITS_H 1
 
 #include <climits>
 
diff --git a/libstdc++-v3/include/c_compatibility/locale.h b/libstdc++-v3/include/c_compatibility/locale.h
index 4d7d72da7ab..d93e0ec7017 100644
--- a/libstdc++-v3/include/c_compatibility/locale.h
+++ b/libstdc++-v3/include/c_compatibility/locale.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_LOCALE_H_
-#define _CPP_LOCALE_H_ 1
+#ifndef _GLIBCXX_LOCALE_H
+#define _GLIBCXX_LOCALE_H 1
 
 #include <clocale>
 
diff --git a/libstdc++-v3/include/c_compatibility/math.h b/libstdc++-v3/include/c_compatibility/math.h
index 4c4fd0a2178..1cd48cf45db 100644
--- a/libstdc++-v3/include/c_compatibility/math.h
+++ b/libstdc++-v3/include/c_compatibility/math.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_MATH_H_
-#define _CPP_MATH_H_ 1
+#ifndef _GLIBCXX_MATH_H
+#define _GLIBCXX_MATH_H 1
 
 #include <cmath>
 
@@ -56,7 +56,7 @@ using std::fabs;
 using std::floor;
 using std::fmod;
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 using std::fpclassify;
 using std::isfinite;
 using std::isinf;
diff --git a/libstdc++-v3/include/c_compatibility/setjmp.h b/libstdc++-v3/include/c_compatibility/setjmp.h
index f194253f868..0bcad031867 100644
--- a/libstdc++-v3/include/c_compatibility/setjmp.h
+++ b/libstdc++-v3/include/c_compatibility/setjmp.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_SETJMP_H_
-#define _CPP_SETJMP_H_ 1
+#ifndef _GLIBCXX_SETJMP_H
+#define _GLIBCXX_SETJMP_H 1
 
 #include <csetjmp>
 
diff --git a/libstdc++-v3/include/c_compatibility/signal.h b/libstdc++-v3/include/c_compatibility/signal.h
index 724ac8a1d66..b43deb5968a 100644
--- a/libstdc++-v3/include/c_compatibility/signal.h
+++ b/libstdc++-v3/include/c_compatibility/signal.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_SIGNAL_H_
-#define _CPP_SIGNAL_H_ 1
+#ifndef _GLIBCXX_SIGNAL_H
+#define _GLIBCXX_SIGNAL_H 1
 
 #include <csignal>
 
diff --git a/libstdc++-v3/include/c_compatibility/stdarg.h b/libstdc++-v3/include/c_compatibility/stdarg.h
index a1a62b1699e..76d6c74b2a2 100644
--- a/libstdc++-v3/include/c_compatibility/stdarg.h
+++ b/libstdc++-v3/include/c_compatibility/stdarg.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_STDARG_H_
-#define _CPP_STDARG_H_ 1
+#ifndef _GLIBCXX_STDARG_H
+#define _GLIBCXX_STDARG_H 1
 
 #include <cstdarg>
 
diff --git a/libstdc++-v3/include/c_compatibility/stddef.h b/libstdc++-v3/include/c_compatibility/stddef.h
index 094c380ad02..4dac7db2989 100644
--- a/libstdc++-v3/include/c_compatibility/stddef.h
+++ b/libstdc++-v3/include/c_compatibility/stddef.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_STDDEF_H_
-#define _CPP_STDDEF_H_ 1
+#ifndef _GLIBCXX_STDDEF_H
+#define _GLIBCXX_STDDEF_H 1
 
 #include <cstddef>
 
diff --git a/libstdc++-v3/include/c_compatibility/stdio.h b/libstdc++-v3/include/c_compatibility/stdio.h
index 930ffd4861d..97171407e34 100644
--- a/libstdc++-v3/include/c_compatibility/stdio.h
+++ b/libstdc++-v3/include/c_compatibility/stdio.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_STDIO_H_
-#define _CPP_STDIO_H_ 1
+#ifndef _GLIBCXX_STDIO_H
+#define _GLIBCXX_STDIO_H 1
 
 #include <cstdio>
 
diff --git a/libstdc++-v3/include/c_compatibility/stdlib.h b/libstdc++-v3/include/c_compatibility/stdlib.h
index d516034d9d7..2b05c1a3b44 100644
--- a/libstdc++-v3/include/c_compatibility/stdlib.h
+++ b/libstdc++-v3/include/c_compatibility/stdlib.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_STDLIB_H_
-#define _CPP_STDLIB_H_ 1
+#ifndef _GLIBCXX_STDLIB_H
+#define _GLIBCXX_STDLIB_H 1
 
 #include <cstdlib>
 
diff --git a/libstdc++-v3/include/c_compatibility/string.h b/libstdc++-v3/include/c_compatibility/string.h
index b639157ee59..ebbf6f5c298 100644
--- a/libstdc++-v3/include/c_compatibility/string.h
+++ b/libstdc++-v3/include/c_compatibility/string.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_STRING_H_
-#define _CPP_STRING_H_ 1
+#ifndef _GLIBCXX_STRING_H
+#define _GLIBCXX_STRING_H 1
 
 #include <cstring>
 
diff --git a/libstdc++-v3/include/c_compatibility/time.h b/libstdc++-v3/include/c_compatibility/time.h
index 6d07aa1aed6..5d330c7ab3f 100644
--- a/libstdc++-v3/include/c_compatibility/time.h
+++ b/libstdc++-v3/include/c_compatibility/time.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_TIME_H_
-#define _CPP_TIME_H_ 1
+#ifndef _GLIBCXX_TIME_H
+#define _GLIBCXX_TIME_H 1
 
 #include <ctime>
  
diff --git a/libstdc++-v3/include/c_compatibility/wchar.h b/libstdc++-v3/include/c_compatibility/wchar.h
index e9485a54ded..9130b5f4441 100644
--- a/libstdc++-v3/include/c_compatibility/wchar.h
+++ b/libstdc++-v3/include/c_compatibility/wchar.h
@@ -27,14 +27,14 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_WCHAR_H_
-#define _CPP_WCHAR_H_ 1
+#ifndef _GLIBCXX_WCHAR_H
+#define _GLIBCXX_WCHAR_H 1
 
 #include <cwchar>
 
 using std::mbstate_t;
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 using std::wint_t;
 
 using std::btowc;
@@ -95,12 +95,12 @@ using std::wmemmove;
 using std::wmemset;
 using std::wcsftime;
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 using std::wcstold;
 using std::wcstoll;
 using std::wcstoull;
 #endif
 
-#endif  //_GLIBCPP_USE_WCHAR_T
+#endif  //_GLIBCXX_USE_WCHAR_T
 
 #endif
diff --git a/libstdc++-v3/include/c_compatibility/wctype.h b/libstdc++-v3/include/c_compatibility/wctype.h
index 2c75ec8e960..16b7c750d39 100644
--- a/libstdc++-v3/include/c_compatibility/wctype.h
+++ b/libstdc++-v3/include/c_compatibility/wctype.h
@@ -27,8 +27,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _CPP_CWCTYPE_H_
-#define _CPP_CWCTYPE_H_ 1
+#ifndef _GLIBCXX_CWCTYPE_H
+#define _GLIBCXX_CWCTYPE_H 1
 
 #include <cwctype>
 
diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc
index 9b86bbb9da6..be7502d3c46 100644
--- a/libstdc++-v3/include/c_std/cmath.tcc
+++ b/libstdc++-v3/include/c_std/cmath.tcc
@@ -29,8 +29,8 @@
 
 // This file was written by Gabriel Dos Reis <gdr@codesourcery.com>
 
-#ifndef _CPP_BITS_CMATH_TCC
-#define _CPP_BITS_CMATH_TCC 1
+#ifndef _CMATH_TCC
+#define _CMATH_TCC 1
 
 namespace std 
 {
diff --git a/libstdc++-v3/include/c_std/std_cctype.h b/libstdc++-v3/include/c_std/std_cctype.h
index 4700809f3aa..8b903eaf76a 100644
--- a/libstdc++-v3/include/c_std/std_cctype.h
+++ b/libstdc++-v3/include/c_std/std_cctype.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CCTYPE
-#define _CPP_CCTYPE 1
+#ifndef _CCTYPE
+#define _CCTYPE 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cerrno.h b/libstdc++-v3/include/c_std/std_cerrno.h
index 7fcecd43917..b9a0743e79a 100644
--- a/libstdc++-v3/include/c_std/std_cerrno.h
+++ b/libstdc++-v3/include/c_std/std_cerrno.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CERRNO
-#define _CPP_CERRNO 1
+#ifndef _CERRNO
+#define _CERRNO 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cfloat.h b/libstdc++-v3/include/c_std/std_cfloat.h
index 3cc8d7218da..ab7283e7802 100644
--- a/libstdc++-v3/include/c_std/std_cfloat.h
+++ b/libstdc++-v3/include/c_std/std_cfloat.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CFLOAT
-#define _CPP_CFLOAT 1
+#ifndef _CFLOAT
+#define _CFLOAT 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_climits.h b/libstdc++-v3/include/c_std/std_climits.h
index 242913e60df..7f2b0125f23 100644
--- a/libstdc++-v3/include/c_std/std_climits.h
+++ b/libstdc++-v3/include/c_std/std_climits.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CLIMITS
-#define _CPP_CLIMITS	1
+#ifndef _CLIMITS
+#define _CLIMITS 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_clocale.h b/libstdc++-v3/include/c_std/std_clocale.h
index 66747d9244c..c6a882b6fe1 100644
--- a/libstdc++-v3/include/c_std/std_clocale.h
+++ b/libstdc++-v3/include/c_std/std_clocale.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CLOCALE
-#define _CPP_CLOCALE 1
+#ifndef _CLOCALE
+#define _CLOCALE 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cmath.h b/libstdc++-v3/include/c_std/std_cmath.h
index 04d300a01c6..b34e172167c 100644
--- a/libstdc++-v3/include/c_std/std_cmath.h
+++ b/libstdc++-v3/include/c_std/std_cmath.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CMATH
-#define _CPP_CMATH 1
+#ifndef _CMATH
+#define _CMATH 1
 
 #pragma GCC system_header
 
@@ -82,8 +82,8 @@ namespace __gnu_cxx
 {
   namespace  __c99_binding
   {
-#if _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_CHECK || \
-    _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
+#if _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK || \
+    _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
     extern "C" float (acosf)(float);
     extern "C" float (asinf)(float);
     extern "C" float (atanf)(float);
@@ -103,62 +103,62 @@ namespace __gnu_cxx
     extern "C" float (tanf)(float);
     extern "C" float (tanhf)(float);
 #endif
-#if !_GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
-#if _GLIBCPP_HAVE_ACOSF
+#if !_GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC
+#if _GLIBCXX_HAVE_ACOSF
     using ::acosf;
 #endif
-#if _GLIBCPP_HAVE_ASINF
+#if _GLIBCXX_HAVE_ASINF
     using ::asinf;
 #endif
-#if _GLIBCPP_HAVE_ATANF
+#if _GLIBCXX_HAVE_ATANF
     using ::atanf;
 #endif
-#if _GLIBCPP_HAVE_ATAN2F
+#if _GLIBCXX_HAVE_ATAN2F
     using ::atan2f;
 #endif
-#if _GLIBCPP_HAVE_CEILF
+#if _GLIBCXX_HAVE_CEILF
     using ::ceilf;
 #endif
-#if _GLIBCPP_HAVE_COSHF
+#if _GLIBCXX_HAVE_COSHF
     using ::coshf;
 #endif
-#if _GLIBCPP_HAVE_EXPF
+#if _GLIBCXX_HAVE_EXPF
     using ::expf;
 #endif
-#if _GLIBCPP_HAVE_FLOORF
+#if _GLIBCXX_HAVE_FLOORF
     using ::floorf;
 #endif
-#if _GLIBCPP_HAVE_FMODF
+#if _GLIBCXX_HAVE_FMODF
     using ::fmodf;
 #endif
-#if _GLIBCPP_HAVE_FREXPF
+#if _GLIBCXX_HAVE_FREXPF
     using ::frexpf;
 #endif
-#if _GLIBCPP_HAVE_LDEXPF
+#if _GLIBCXX_HAVE_LDEXPF
     using ::ldexpf;
 #endif
-#if _GLIBCPP_HAVE_LOGF
+#if _GLIBCXX_HAVE_LOGF
     using ::logf;
 #endif
-#if _GLIBCPP_HAVE_LOG10F
+#if _GLIBCXX_HAVE_LOG10F
     using ::log10f;
 #endif
-#if _GLIBCPP_HAVE_MODFF
+#if _GLIBCXX_HAVE_MODFF
     using ::modff;
 #endif
-#if _GLIBCPP_HAVE_POWF
+#if _GLIBCXX_HAVE_POWF
     using ::powf;
 #endif
-#if _GLIBCPP_HAVE_SINHF
+#if _GLIBCXX_HAVE_SINHF
     using ::sinhf;
 #endif
-#if _GLIBCPP_HAVE_TANF
+#if _GLIBCXX_HAVE_TANF
     using ::tanf;
 #endif
-#if _GLIBCPP_HAVE_TANHF
+#if _GLIBCXX_HAVE_TANHF
     using ::tanhf;
 #endif
-#endif /* _GLIBCPP_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC */
+#endif /* _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC */
   }
 }
 
@@ -180,7 +180,7 @@ namespace std
   abs(long double __x)
   { return __builtin_fabsl(__x); }
 
-#if _GLIBCPP_HAVE_ACOSF
+#if _GLIBCXX_HAVE_ACOSF
   inline float 
   acos(float __x) { return __gnu_cxx::__c99_binding::acosf(__x); }
 #else
@@ -190,7 +190,7 @@ namespace std
 
   using ::acos;
   
-#if _GLIBCPP_HAVE_ACOSL
+#if _GLIBCXX_HAVE_ACOSL
   inline long double 
   acos(long double __x) { return ::acosl(__x); }
 #else
@@ -207,7 +207,7 @@ namespace std
   
   using ::asin;
 
-#if _GLIBCPP_HAVE_ASINF
+#if _GLIBCXX_HAVE_ASINF
   inline float 
   asin(float __x) { return __gnu_cxx::__c99_binding::asinf(__x); }
 #else
@@ -215,7 +215,7 @@ namespace std
   asin(float __x) { return ::asin(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_ASINL
+#if _GLIBCXX_HAVE_ASINL
   inline long double 
   asin(long double __x) { return ::asinl(__x); }
 #else
@@ -230,7 +230,7 @@ namespace std
 
   using ::atan;
 
-#if _GLIBCPP_HAVE_ATANF
+#if _GLIBCXX_HAVE_ATANF
   inline float 
   atan(float __x) { return __gnu_cxx::__c99_binding::atanf(__x); }
 #else
@@ -238,7 +238,7 @@ namespace std
   atan(float __x) { return ::atan(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_ATANL
+#if _GLIBCXX_HAVE_ATANL
   inline long double 
   atan(long double __x) { return ::atanl(__x); }
 #else
@@ -253,7 +253,7 @@ namespace std
   
   using ::atan2;
 
-#if _GLIBCPP_HAVE_ATAN2F
+#if _GLIBCXX_HAVE_ATAN2F
   inline float 
   atan2(float __y, float __x) { return __gnu_cxx::__c99_binding::atan2f(__y, __x); }
 #else
@@ -262,7 +262,7 @@ namespace std
   { return ::atan2(static_cast<double>(__y), static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_ATAN2L
+#if _GLIBCXX_HAVE_ATAN2L
   inline long double 
   atan2(long double __y, long double __x) { return ::atan2l(__y, __x); }
 #else
@@ -279,7 +279,7 @@ namespace std
 
   using ::ceil;
 
-#if _GLIBCPP_HAVE_CEILF
+#if _GLIBCXX_HAVE_CEILF
   inline float 
   ceil(float __x) { return __gnu_cxx::__c99_binding::ceilf(__x); }
 #else
@@ -287,7 +287,7 @@ namespace std
   ceil(float __x) { return ::ceil(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_CEILL
+#if _GLIBCXX_HAVE_CEILL
   inline long double 
   ceil(long double __x) { return ::ceill(__x); }
 #else
@@ -317,7 +317,7 @@ namespace std
 
   using ::cosh;
 
-#if _GLIBCPP_HAVE_COSHF
+#if _GLIBCXX_HAVE_COSHF
   inline float 
   cosh(float __x) { return __gnu_cxx::__c99_binding::coshf(__x); }
 #else
@@ -325,7 +325,7 @@ namespace std
   cosh(float __x) { return ::cosh(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_COSHL
+#if _GLIBCXX_HAVE_COSHL
   inline long double 
   cosh(long double __x) { return ::coshl(__x); }
 #else
@@ -340,7 +340,7 @@ namespace std
 
   using ::exp;
 
-#if _GLIBCPP_HAVE_EXPF
+#if _GLIBCXX_HAVE_EXPF
   inline float 
   exp(float __x) { return __gnu_cxx::__c99_binding::expf(__x); }
 #else
@@ -348,7 +348,7 @@ namespace std
   exp(float __x) { return ::exp(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_EXPL
+#if _GLIBCXX_HAVE_EXPL
   inline long double 
   exp(long double __x) { return ::expl(__x); }
 #else
@@ -378,7 +378,7 @@ namespace std
 
   using ::floor;
 
-#if _GLIBCPP_HAVE_FLOORF
+#if _GLIBCXX_HAVE_FLOORF
   inline float 
   floor(float __x) { return __gnu_cxx::__c99_binding::floorf(__x); }
 #else
@@ -386,7 +386,7 @@ namespace std
   floor(float __x) { return ::floor(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_FLOORL
+#if _GLIBCXX_HAVE_FLOORL
   inline long double 
   floor(long double __x) { return ::floorl(__x); }
 #else
@@ -401,7 +401,7 @@ namespace std
   
   using ::fmod;
 
-#if _GLIBCPP_HAVE_FMODF
+#if _GLIBCXX_HAVE_FMODF
   inline float 
   fmod(float __x, float __y) { return __gnu_cxx::__c99_binding::fmodf(__x, __y); }
 #else
@@ -410,7 +410,7 @@ namespace std
   { return ::fmod(static_cast<double>(__x), static_cast<double>(__y)); }
 #endif
 
-#if _GLIBCPP_HAVE_FMODL
+#if _GLIBCXX_HAVE_FMODL
   inline long double 
   fmod(long double __x, long double __y) { return ::fmodl(__x, __y); }
 #else
@@ -421,7 +421,7 @@ namespace std
 
   using ::frexp;
 
-#if _GLIBCPP_HAVE_FREXPF
+#if _GLIBCXX_HAVE_FREXPF
   inline float 
   frexp(float __x, int* __exp) { return __gnu_cxx::__c99_binding::frexpf(__x, __exp); }
 #else
@@ -429,7 +429,7 @@ namespace std
   frexp(float __x, int* __exp) { return ::frexp(__x, __exp); }
 #endif
 
-#if _GLIBCPP_HAVE_FREXPL
+#if _GLIBCXX_HAVE_FREXPL
   inline long double 
   frexp(long double __x, int* __exp) { return ::frexpl(__x, __exp); }
 #else
@@ -445,7 +445,7 @@ namespace std
   
   using ::ldexp;
 
-#if _GLIBCPP_HAVE_LDEXPF
+#if _GLIBCXX_HAVE_LDEXPF
   inline float 
   ldexp(float __x, int __exp) { return __gnu_cxx::__c99_binding::ldexpf(__x, __exp); }
 #else
@@ -454,7 +454,7 @@ namespace std
   { return ::ldexp(static_cast<double>(__x), __exp); }
 #endif
 
-#if _GLIBCPP_HAVE_LDEXPL
+#if _GLIBCXX_HAVE_LDEXPL
   inline long double 
   ldexp(long double __x, int __exp) { return ::ldexpl(__x, __exp); }
 #else
@@ -470,7 +470,7 @@ namespace std
 
   using ::log;
 
-#if _GLIBCPP_HAVE_LOGF
+#if _GLIBCXX_HAVE_LOGF
   inline float 
   log(float __x) { return __gnu_cxx::__c99_binding::logf(__x); }
 #else
@@ -478,7 +478,7 @@ namespace std
   { return ::log(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_LOGL
+#if _GLIBCXX_HAVE_LOGL
   inline long double 
   log(long double __x) { return ::logl(__x); }
 #else
@@ -493,7 +493,7 @@ namespace std
   
   using ::log10;
 
-#if _GLIBCPP_HAVE_LOG10F
+#if _GLIBCXX_HAVE_LOG10F
   inline float 
   log10(float __x) { return __gnu_cxx::__c99_binding::log10f(__x); }
 #else
@@ -501,7 +501,7 @@ namespace std
   log10(float __x) { return ::log10(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_LOG10L
+#if _GLIBCXX_HAVE_LOG10L
   inline long double 
   log10(long double __x) { return ::log10l(__x); }
 #else
@@ -516,7 +516,7 @@ namespace std
   
   using ::modf;
 
-#if _GLIBCPP_HAVE_MODFF
+#if _GLIBCXX_HAVE_MODFF
   inline float 
   modf(float __x, float* __iptr) { return __gnu_cxx::__c99_binding::modff(__x, __iptr); }
 #else
@@ -530,7 +530,7 @@ namespace std
   }
 #endif
 
-#if _GLIBCPP_HAVE_MODFL
+#if _GLIBCXX_HAVE_MODFL
   inline long double 
   modf(long double __x, long double* __iptr) { return ::modfl(__x, __iptr); }
 #else
@@ -555,7 +555,7 @@ namespace std
 
   using ::pow;
 
-#if _GLIBCPP_HAVE_POWF
+#if _GLIBCXX_HAVE_POWF
   inline float 
   pow(float __x, float __y) { return __gnu_cxx::__c99_binding::powf(__x, __y); }
 #else
@@ -564,7 +564,7 @@ namespace std
   { return ::pow(static_cast<double>(__x), static_cast<double>(__y)); }
 #endif
 
-#if _GLIBCPP_HAVE_POWL
+#if _GLIBCXX_HAVE_POWL
   inline long double 
   pow(long double __x, long double __y) { return ::powl(__x, __y); }
 #else
@@ -602,7 +602,7 @@ namespace std
 
   using ::sinh;
 
-#if _GLIBCPP_HAVE_SINHF
+#if _GLIBCXX_HAVE_SINHF
   inline float 
   sinh(float __x) { return __gnu_cxx::__c99_binding::sinhf(__x); }
 #else
@@ -610,7 +610,7 @@ namespace std
   sinh(float __x) { return ::sinh(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_SINHL
+#if _GLIBCXX_HAVE_SINHL
   inline long double 
   sinh(long double __x) { return ::sinhl(__x); }
 #else
@@ -640,7 +640,7 @@ namespace std
   
   using ::tan;
 
-#if _GLIBCPP_HAVE_TANF
+#if _GLIBCXX_HAVE_TANF
   inline float 
   tan(float __x) { return __gnu_cxx::__c99_binding::tanf(__x); }
 #else
@@ -648,7 +648,7 @@ namespace std
   tan(float __x) { return ::tan(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_TANL
+#if _GLIBCXX_HAVE_TANL
   inline long double 
   tan(long double __x) { return ::tanl(__x); }
 #else
@@ -663,7 +663,7 @@ namespace std
   
   using ::tanh;
 
-#if _GLIBCPP_HAVE_TANHF
+#if _GLIBCXX_HAVE_TANHF
   inline float 
   tanh(float __x) { return __gnu_cxx::__c99_binding::tanhf(__x); }
 #else
@@ -671,7 +671,7 @@ namespace std
   tanh(float __x) { return ::tanh(static_cast<double>(__x)); }
 #endif
 
-#if _GLIBCPP_HAVE_TANHL
+#if _GLIBCXX_HAVE_TANHL
   inline long double 
   tanh(long double __x) { return ::tanhl(__x); }
 #else
@@ -686,8 +686,8 @@ namespace std
 } 
 
 
-#if _GLIBCPP_USE_C99
-#if !_GLIBCPP_USE_C99_FP_MACROS_DYNAMIC
+#if _GLIBCXX_USE_C99
+#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
 // These are possible macros imported from C99-land. For strict
 // conformance, remove possible C99-injected names from the global
 // namespace, and sequester them in the __gnu_cxx extension namespace. 
@@ -760,11 +760,11 @@ namespace __gnu_cxx
 #undef islessequal
 #undef islessgreater
 #undef isunordered
-#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */
+#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
 #endif
 
-#if _GLIBCPP_USE_C99
-#if !_GLIBCPP_USE_C99_FP_MACROS_DYNAMIC
+#if _GLIBCXX_USE_C99
+#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
 namespace __gnu_cxx
 {
   template<typename _Tp>
@@ -835,10 +835,10 @@ namespace std
   using __gnu_cxx::islessgreater;
   using __gnu_cxx::isunordered;
 }
-#endif /* _GLIBCPP_USE_C99_FP_MACROS_DYNAMIC */
+#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
 #endif
   
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  define export
 #  include <bits/cmath.tcc>
 #endif
diff --git a/libstdc++-v3/include/c_std/std_csetjmp.h b/libstdc++-v3/include/c_std/std_csetjmp.h
index f6df5815001..c5b9119e0b8 100644
--- a/libstdc++-v3/include/c_std/std_csetjmp.h
+++ b/libstdc++-v3/include/c_std/std_csetjmp.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSETJMP
-#define _CPP_CSETJMP 1
+#ifndef _CSETJMP
+#define _CSETJMP 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_csignal.h b/libstdc++-v3/include/c_std/std_csignal.h
index 1017161d63f..8be03f05f4c 100644
--- a/libstdc++-v3/include/c_std/std_csignal.h
+++ b/libstdc++-v3/include/c_std/std_csignal.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSIGNAL
-#define _CPP_CSIGNAL 1
+#ifndef _CSIGNAL
+#define _CSIGNAL 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cstdarg.h b/libstdc++-v3/include/c_std/std_cstdarg.h
index 9383adee9a5..52979dffa6c 100644
--- a/libstdc++-v3/include/c_std/std_cstdarg.h
+++ b/libstdc++-v3/include/c_std/std_cstdarg.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDARG
-#define _CPP_CSTDARG 1
+#ifndef _CSTDARG
+#define _CSTDARG 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cstddef.h b/libstdc++-v3/include/c_std/std_cstddef.h
index 7a740afb398..b7e56100196 100644
--- a/libstdc++-v3/include/c_std/std_cstddef.h
+++ b/libstdc++-v3/include/c_std/std_cstddef.h
@@ -40,8 +40,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDDEF
-#define _CPP_CSTDDEF 1
+#ifndef _CSTDDEF
+#define _CSTDDEF 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cstdio.h b/libstdc++-v3/include/c_std/std_cstdio.h
index 3b4a6856739..732da5f9461 100644
--- a/libstdc++-v3/include/c_std/std_cstdio.h
+++ b/libstdc++-v3/include/c_std/std_cstdio.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDIO
-#define _CPP_CSTDIO 1
+#ifndef _CSTDIO
+#define _CSTDIO 1
 
 #pragma GCC system_header
 
@@ -142,7 +142,7 @@ namespace std
   using ::vsprintf;
 }
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 
 #undef snprintf
 #undef vfscanf
@@ -152,7 +152,7 @@ namespace std
 
 namespace __gnu_cxx
 {
-#if _GLIBCPP_USE_C99_CHECK || _GLIBCPP_USE_C99_DYNAMIC
+#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" int
     (snprintf)(char * restrict, size_t, const char * restrict, ...);
   extern "C" int
@@ -163,7 +163,7 @@ namespace __gnu_cxx
   extern "C" int
     (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list);
 #endif
-#if !_GLIBCPP_USE_C99_DYNAMIC
+#if !_GLIBCXX_USE_C99_DYNAMIC
   using ::snprintf;
   using ::vfscanf;
   using ::vscanf;
diff --git a/libstdc++-v3/include/c_std/std_cstdlib.h b/libstdc++-v3/include/c_std/std_cstdlib.h
index e1436be1d7a..5cac120edfd 100644
--- a/libstdc++-v3/include/c_std/std_cstdlib.h
+++ b/libstdc++-v3/include/c_std/std_cstdlib.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTDLIB
-#define _CPP_CSTDLIB 1
+#ifndef _CSTDLIB
+#define _CSTDLIB 1
 
 #pragma GCC system_header
 
@@ -122,7 +122,7 @@ namespace std
   div(long __i, long __j) { return ldiv(__i, __j); }
 } 
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 
 #undef _Exit
 #undef llabs
@@ -135,13 +135,13 @@ namespace std
 
 namespace __gnu_cxx
 {
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   using ::lldiv_t;
 #endif
-#if _GLIBCPP_USE_C99_CHECK || _GLIBCPP_USE_C99_DYNAMIC
+#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" void (_Exit)(int);
 #endif
-#if !_GLIBCPP_USE_C99_DYNAMIC
+#if !_GLIBCXX_USE_C99_DYNAMIC
   using ::_Exit;
 #endif
 
@@ -151,7 +151,7 @@ namespace __gnu_cxx
   inline long long 
   llabs(long long __x) { return __x >= 0 ? __x : -__x; }
 
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   inline lldiv_t 
   div(long long __n, long long __d)
   { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
@@ -161,14 +161,14 @@ namespace __gnu_cxx
   { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
 #endif
 
-#if _GLIBCPP_USE_C99_LONG_LONG_CHECK || _GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   extern "C" long long int (atoll)(const char *);
   extern "C" long long int
     (strtoll)(const char * restrict, char ** restrict, int);
   extern "C" unsigned long long int
     (strtoull)(const char * restrict, char ** restrict, int);
 #endif
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   using ::atoll;
   using ::strtoll;
   using ::strtoull;
@@ -179,13 +179,13 @@ namespace __gnu_cxx
 
 namespace std
 {
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC 
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC 
   using __gnu_cxx::lldiv_t;
 #endif
   using __gnu_cxx::_Exit;
   using __gnu_cxx::abs;
   using __gnu_cxx::llabs; 
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC 
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC 
   using __gnu_cxx::div;
   using __gnu_cxx::lldiv;
 #endif
diff --git a/libstdc++-v3/include/c_std/std_cstring.h b/libstdc++-v3/include/c_std/std_cstring.h
index 066342aaaba..934e491def6 100644
--- a/libstdc++-v3/include/c_std/std_cstring.h
+++ b/libstdc++-v3/include/c_std/std_cstring.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CSTRING
-#define _CPP_CSTRING 1
+#ifndef _CSTRING
+#define _CSTRING 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_ctime.h b/libstdc++-v3/include/c_std/std_ctime.h
index 1b4c09b77cc..b7ed90698a2 100644
--- a/libstdc++-v3/include/c_std/std_ctime.h
+++ b/libstdc++-v3/include/c_std/std_ctime.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CTIME
-#define _CPP_CTIME 1
+#ifndef _CTIME
+#define _CTIME 1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/c_std/std_cwchar.h b/libstdc++-v3/include/c_std/std_cwchar.h
index 8b33c52282f..b9e0965ce8e 100644
--- a/libstdc++-v3/include/c_std/std_cwchar.h
+++ b/libstdc++-v3/include/c_std/std_cwchar.h
@@ -41,8 +41,8 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CWCHAR
-#define _CPP_CWCHAR 1
+#ifndef _CWCHAR
+#define _CWCHAR 1
 
 #pragma GCC system_header
 
@@ -50,13 +50,13 @@
 #include <cstddef>
 #include <ctime>
 
-#if _GLIBCPP_HAVE_WCHAR_H
+#if _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
 #endif
 
 // Need to do a bit of trickery here with mbstate_t as char_traits
 // assumes it is in wchar.h, regardless of wchar_t specializations.
-#ifndef _GLIBCPP_HAVE_MBSTATE_T
+#ifndef _GLIBCXX_HAVE_MBSTATE_T
 extern "C" 
 {
   typedef struct 
@@ -129,7 +129,7 @@ namespace std
 #undef wprintf
 #undef wscanf
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 namespace std
 {
   using ::wint_t;
@@ -217,7 +217,7 @@ namespace std
   { return wmemchr(const_cast<const wchar_t*>(__p), __c, __n); }
 }
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 
 #undef wcstold
 #undef wcstoll
@@ -225,20 +225,20 @@ namespace std
 
 namespace __gnu_cxx
 {
-#if _GLIBCPP_USE_C99_CHECK || _GLIBCPP_USE_C99_DYNAMIC
+#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
   extern "C" long double
     (wcstold)(const wchar_t * restrict, wchar_t ** restrict);
 #endif
-#if !_GLIBCPP_USE_C99_DYNAMIC
+#if !_GLIBCXX_USE_C99_DYNAMIC
   using ::wcstold;
 #endif
-#if _GLIBCPP_USE_C99_LONG_LONG_CHECK || _GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   extern "C" long long int
     (wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int);
   extern "C" unsigned long long int
     (wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int);
 #endif
-#if !_GLIBCPP_USE_C99_LONG_LONG_DYNAMIC
+#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
   using ::wcstoll;
   using ::wcstoull;
 #endif
@@ -252,6 +252,6 @@ namespace std
 }
 #endif
 
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
 #endif 
diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h
index e469194aa19..f7639ed3843 100644
--- a/libstdc++-v3/include/c_std/std_cwctype.h
+++ b/libstdc++-v3/include/c_std/std_cwctype.h
@@ -41,14 +41,14 @@
  *  contained in the namespace @c std.
  */
 
-#ifndef _CPP_CWCTYPE
-#define _CPP_CWCTYPE 1
+#ifndef _CWCTYPE
+#define _CWCTYPE 1
 
 #pragma GCC system_header
 
 #include <bits/c++config.h>
 
-#if _GLIBCPP_HAVE_WCTYPE_H
+#if _GLIBCXX_HAVE_WCTYPE_H
 #include <wctype.h>
 #endif
 
@@ -73,7 +73,7 @@
 #undef wctrans
 #undef wctype
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 namespace std
 {
   using ::wint_t; 	  // cwchar
@@ -101,6 +101,6 @@ namespace std
   using ::wctrans;
   using ::wctype;
 }
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
 #endif 
diff --git a/libstdc++-v3/include/ext/algorithm b/libstdc++-v3/include/ext/algorithm
index 2d457503393..9cccec871ba 100644
--- a/libstdc++-v3/include/ext/algorithm
+++ b/libstdc++-v3/include/ext/algorithm
@@ -60,9 +60,10 @@
  */
 
 #ifndef _EXT_ALGORITHM
-#define _EXT_ALGORITHM
+#define _EXT_ALGORITHM 1
 
 #pragma GCC system_header
+
 #include <algorithm>
 
 namespace __gnu_cxx
@@ -121,8 +122,8 @@ namespace __gnu_cxx
     copy_n(_InputIterator __first, _Size __count, _OutputIterator __result)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 	    typename iterator_traits<_InputIterator>::value_type>)
 
       return __copy_n(__first, __count, __result,
@@ -201,11 +202,11 @@ namespace __gnu_cxx
 				 _InputIterator2 __first2, _InputIterator2 __last2)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_InputIterator2>::value_type>)
 
       return __lexicographical_compare_3way(__first1, __last1, __first2, __last2);
@@ -221,10 +222,10 @@ namespace __gnu_cxx
 	  _Size& __n)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_EqualityComparableConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_EqualityComparableConcept<
 	    typename iterator_traits<_InputIterator>::value_type >)
-      __glibcpp_function_requires(_EqualityComparableConcept<_Tp>)
+      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
       for ( ; __first != __last; ++__first)
 	if (*__first == __value)
 	  ++__n;
@@ -237,8 +238,8 @@ namespace __gnu_cxx
 	     _Size& __n)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_UnaryPredicateConcept<_Predicate,
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
 	    typename iterator_traits<_InputIterator>::value_type>)
       for ( ; __first != __last; ++__first)
 	if (__pred(*__first))
@@ -258,8 +259,8 @@ namespace __gnu_cxx
                     _OutputIterator __out, const _Distance __n)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 		typename iterator_traits<_ForwardIterator>::value_type>)
 
       _Distance __remaining = std::distance(__first, __last);
@@ -291,10 +292,10 @@ namespace __gnu_cxx
 		   _RandomNumberGenerator& __rand)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_OutputIteratorConcept<_OutputIterator,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
 		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcpp_function_requires(_UnaryFunctionConcept<
+      __glibcxx_function_requires(_UnaryFunctionConcept<
 		_RandomNumberGenerator, _Distance, _Distance>)
 
       _Distance __remaining = std::distance(__first, __last);
@@ -344,7 +345,7 @@ namespace __gnu_cxx
 		    const _Distance __n)
     {
       // concept requirements
-      __glibcpp_function_requires(_UnaryFunctionConcept<
+      __glibcxx_function_requires(_UnaryFunctionConcept<
 	    _RandomNumberGenerator, _Distance, _Distance>)
 
       _Distance __m = 0;
@@ -374,8 +375,8 @@ namespace __gnu_cxx
 		  _RandomAccessIterator __out_first, _RandomAccessIterator __out_last) 
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       return __random_sample(__first, __last,
@@ -395,8 +396,8 @@ namespace __gnu_cxx
 		  _RandomNumberGenerator& __rand) 
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcpp_function_requires(_Mutable_RandomAccessIteratorConcept<
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
 	    _RandomAccessIterator>)
 
       return __random_sample(__first, __last,
@@ -448,8 +449,8 @@ namespace __gnu_cxx
     is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_RandomAccessIterator>::value_type>)
 
       return __is_heap(__first, __last - __first);
@@ -466,8 +467,8 @@ namespace __gnu_cxx
 	    _StrictWeakOrdering __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
+      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
 	    typename iterator_traits<_RandomAccessIterator>::value_type, 
 	    typename iterator_traits<_RandomAccessIterator>::value_type>)
 
@@ -488,8 +489,8 @@ namespace __gnu_cxx
     is_sorted(_ForwardIterator __first, _ForwardIterator __last)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_LessThanComparableConcept<
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_LessThanComparableConcept<
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
       if (__first == __last)
@@ -514,8 +515,8 @@ namespace __gnu_cxx
     is_sorted(_ForwardIterator __first, _ForwardIterator __last, _StrictWeakOrdering __comp)
     {
       // concept requirements
-      __glibcpp_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcpp_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
+      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
+      __glibcxx_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
 	    typename iterator_traits<_ForwardIterator>::value_type, 
 	    typename iterator_traits<_ForwardIterator>::value_type>)
 
diff --git a/libstdc++-v3/include/ext/enc_filebuf.h b/libstdc++-v3/include/ext/enc_filebuf.h
index e1152bd26f9..a2b3d670570 100644
--- a/libstdc++-v3/include/ext/enc_filebuf.h
+++ b/libstdc++-v3/include/ext/enc_filebuf.h
@@ -53,7 +53,7 @@ namespace __gnu_cxx
 	// Set state type to something useful.
 	// Something more than copyconstructible is needed here, so
 	// require copyconstructible + assignment operator.
-	__glibcpp_class_requires(state_type, _SGIAssignableConcept);
+	__glibcxx_class_requires(state_type, _SGIAssignableConcept);
 	_M_state_cur = __state;
 	_M_state_cur._M_init();
       };
diff --git a/libstdc++-v3/include/ext/hash_map b/libstdc++-v3/include/ext/hash_map
index d35acf8496c..0de6b8d61c2 100644
--- a/libstdc++-v3/include/ext/hash_map
+++ b/libstdc++-v3/include/ext/hash_map
@@ -246,10 +246,10 @@ template <class _Key, class _Tp, class _HashFcn, class _EqualKey, class _Alloc>
 class hash_multimap
 {
   // concept requirements
-  __glibcpp_class_requires(_Key, _SGIAssignableConcept)
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
-  __glibcpp_class_requires3(_HashFcn, size_t, _Key, _UnaryFunctionConcept);
-  __glibcpp_class_requires3(_EqualKey, _Key, _Key, _BinaryPredicateConcept);
+  __glibcxx_class_requires(_Key, _SGIAssignableConcept)
+  __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
+  __glibcxx_class_requires3(_HashFcn, size_t, _Key, _UnaryFunctionConcept);
+  __glibcxx_class_requires3(_EqualKey, _Key, _Key, _BinaryPredicateConcept);
 
 private:
   typedef hashtable<pair<const _Key, _Tp>, _Key, _HashFcn,
diff --git a/libstdc++-v3/include/ext/hash_set b/libstdc++-v3/include/ext/hash_set
index acb0a3f4f9d..caf773fb9fc 100644
--- a/libstdc++-v3/include/ext/hash_set
+++ b/libstdc++-v3/include/ext/hash_set
@@ -93,9 +93,9 @@ template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
 class hash_set
 {
   // concept requirements
-  __glibcpp_class_requires(_Value, _SGIAssignableConcept)
-  __glibcpp_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept);
-  __glibcpp_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept);
+  __glibcxx_class_requires(_Value, _SGIAssignableConcept)
+  __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept);
+  __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept);
 
 private:
   typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>, 
@@ -249,9 +249,9 @@ template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
 class hash_multiset
 {
   // concept requirements
-  __glibcpp_class_requires(_Value, _SGIAssignableConcept)
-  __glibcpp_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept);
-  __glibcpp_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept);
+  __glibcxx_class_requires(_Value, _SGIAssignableConcept)
+  __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept);
+  __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept);
 
 private:
   typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>, 
diff --git a/libstdc++-v3/include/ext/iterator b/libstdc++-v3/include/ext/iterator
index 2a14a423282..e492e680f17 100644
--- a/libstdc++-v3/include/ext/iterator
+++ b/libstdc++-v3/include/ext/iterator
@@ -80,7 +80,7 @@ namespace __gnu_cxx
 	       _Distance& __n, std::input_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_InputIteratorConcept<_InputIterator>)
+      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
       while (__first != __last) { ++__first; ++__n; }
     }
 
@@ -90,7 +90,7 @@ namespace __gnu_cxx
 	       _Distance& __n, std::random_access_iterator_tag)
     {
       // concept requirements
-      __glibcpp_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
+      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
       __n += __last - __first;
     }
 
diff --git a/libstdc++-v3/include/ext/numeric b/libstdc++-v3/include/ext/numeric
index 8b40dabbaf6..a596d999015 100644
--- a/libstdc++-v3/include/ext/numeric
+++ b/libstdc++-v3/include/ext/numeric
@@ -135,8 +135,8 @@ namespace __gnu_cxx
     iota(_ForwardIter __first, _ForwardIter __last, _Tp __value)
     {
       // concept requirements
-      __glibcpp_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
-      __glibcpp_function_requires(_ConvertibleConcept<_Tp,
+      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
+      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
 	    typename std::iterator_traits<_ForwardIter>::value_type>)
 
       while (__first != __last)
diff --git a/libstdc++-v3/include/ext/pool_allocator.h b/libstdc++-v3/include/ext/pool_allocator.h
index 2c6f87e1673..9d1fc9b719f 100644
--- a/libstdc++-v3/include/ext/pool_allocator.h
+++ b/libstdc++-v3/include/ext/pool_allocator.h
@@ -284,7 +284,7 @@ namespace __gnu_cxx
       // to efficiently support threading found in basic_string.h.
       if (_S_force_new == 0)
 	{
-	  if (getenv("GLIBCPP_FORCE_NEW"))
+	  if (getenv("GLIBCXX_FORCE_NEW"))
 	    __atomic_add(&_S_force_new, 1);
 	  else
 	    __atomic_add(&_S_force_new, -1);
@@ -356,7 +356,7 @@ namespace __gnu_cxx
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.
   // NB: This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class __pool_alloc<true, 0>;
 #endif
 } // namespace __gnu_cxx
diff --git a/libstdc++-v3/include/ext/slist b/libstdc++-v3/include/ext/slist
index 875f7604de5..9bcfb716772 100644
--- a/libstdc++-v3/include/ext/slist
+++ b/libstdc++-v3/include/ext/slist
@@ -304,7 +304,7 @@ template <class _Tp, class _Alloc = allocator<_Tp> >
 class slist : private _Slist_base<_Tp,_Alloc>
 {
   // concept requirements
-  __glibcpp_class_requires(_Tp, _SGIAssignableConcept)
+  __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
 
 private:
   typedef _Slist_base<_Tp,_Alloc> _Base;
diff --git a/libstdc++-v3/include/ext/stdio_sync_filebuf.h b/libstdc++-v3/include/ext/stdio_sync_filebuf.h
index 136391c1ea3..64ec2d97340 100644
--- a/libstdc++-v3/include/ext/stdio_sync_filebuf.h
+++ b/libstdc++-v3/include/ext/stdio_sync_filebuf.h
@@ -39,16 +39,16 @@
 #include <fstream>
 #include <unistd.h>
 
-#if defined(_GLIBCPP_HAVE_S_ISREG) || defined(_GLIBCPP_HAVE_S_IFREG)
+#if defined(_GLIBCXX_HAVE_S_ISREG) || defined(_GLIBCXX_HAVE_S_IFREG)
 # include <sys/stat.h>
-# ifdef _GLIBCPP_HAVE_S_ISREG
-#  define _GLIBCPP_ISREG(x) S_ISREG(x)
+# ifdef _GLIBCXX_HAVE_S_ISREG
+#  define _GLIBCXX_ISREG(x) S_ISREG(x)
 # else
-#  define _GLIBCPP_ISREG(x) (((x) & S_IFMT) == S_IFREG)
+#  define _GLIBCXX_ISREG(x) (((x) & S_IFMT) == S_IFREG)
 # endif
 #endif
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 #include <cwchar>
 #endif
 
@@ -103,11 +103,11 @@ namespace __gnu_cxx
       virtual std::streamsize
       showmanyc()
       { 
-#if defined(_GLIBCPP_HAVE_S_ISREG) || defined(_GLIBCPP_HAVE_S_IFREG)
+#if defined(_GLIBCXX_HAVE_S_ISREG) || defined(_GLIBCXX_HAVE_S_IFREG)
 	// Regular files.
 	struct stat __buffer;
 	int __ret = fstat(fileno(_M_file), &__buffer);
-	if (!__ret && _GLIBCPP_ISREG(__buffer.st_mode))
+	if (!__ret && _GLIBCXX_ISREG(__buffer.st_mode))
 	  return __buffer.st_size - ftell(_M_file);
 #endif
 	return 0; 
@@ -186,7 +186,7 @@ namespace __gnu_cxx
     stdio_sync_filebuf<char>::xsputn(const char* __s, std::streamsize __n)
     { return std::fwrite(__s, 1, __n, _M_file); }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     inline stdio_sync_filebuf<wchar_t>::int_type
     stdio_sync_filebuf<wchar_t>::syncgetc()
@@ -236,9 +236,9 @@ namespace __gnu_cxx
     }
 #endif
 
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template class stdio_sync_filebuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template class stdio_sync_filebuf<wchar_t>;
 #endif
 #endif
diff --git a/libstdc++-v3/include/std/std_algorithm.h b/libstdc++-v3/include/std/std_algorithm.h
index bcc0c8a70cd..c7837b4fdb5 100644
--- a/libstdc++-v3/include/std/std_algorithm.h
+++ b/libstdc++-v3/include/std/std_algorithm.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_ALGORITHM
-#define _CPP_ALGORITHM 1
+#ifndef _ALGORITHM
+#define _ALGORITHM 1
 
 #pragma GCC system_header
 
@@ -68,7 +68,7 @@
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_algo.h>
 
-#endif /* _CPP_ALGORITHM */
+#endif /* _ALGORITHM */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h
index 558389207c1..f3abc8e3ad8 100644
--- a/libstdc++-v3/include/std/std_bitset.h
+++ b/libstdc++-v3/include/std/std_bitset.h
@@ -45,8 +45,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _GLIBCPP_BITSET_H
-#define _GLIBCPP_BITSET_H
+#ifndef _BITSET
+#define _BITSET 1
 
 #pragma GCC system_header
 
@@ -60,9 +60,9 @@
 #include <istream>     // for istream (operator>>)
 
 
-#define _GLIBCPP_BITSET_BITS_PER_WORD  numeric_limits<unsigned long>::digits
-#define _GLIBCPP_BITSET_WORDS(__n) \
- ((__n) < 1 ? 0 : ((__n) + _GLIBCPP_BITSET_BITS_PER_WORD - 1)/_GLIBCPP_BITSET_BITS_PER_WORD)
+#define _GLIBCXX_BITSET_BITS_PER_WORD  numeric_limits<unsigned long>::digits
+#define _GLIBCXX_BITSET_WORDS(__n) \
+ ((__n) < 1 ? 0 : ((__n) + _GLIBCXX_BITSET_BITS_PER_WORD - 1)/_GLIBCXX_BITSET_BITS_PER_WORD)
 
 namespace std
 {
@@ -91,15 +91,15 @@ namespace std
 
       static size_t
       _S_whichword(size_t __pos )
-      { return __pos / _GLIBCPP_BITSET_BITS_PER_WORD; }
+      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
 
       static size_t
       _S_whichbyte(size_t __pos )
-      { return (__pos % _GLIBCPP_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
+      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
 
       static size_t
       _S_whichbit(size_t __pos )
-      { return __pos % _GLIBCPP_BITSET_BITS_PER_WORD; }
+      { return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
 
       static _WordT
       _S_maskbit(size_t __pos )
@@ -213,15 +213,15 @@ namespace std
     {
       if (__builtin_expect(__shift != 0, 1))
 	{
-	  const size_t __wshift = __shift / _GLIBCPP_BITSET_BITS_PER_WORD;
-	  const size_t __offset = __shift % _GLIBCPP_BITSET_BITS_PER_WORD;
+	  const size_t __wshift = __shift / _GLIBCXX_BITSET_BITS_PER_WORD;
+	  const size_t __offset = __shift % _GLIBCXX_BITSET_BITS_PER_WORD;
 
 	  if (__offset == 0)
 	    for (size_t __n = _Nw - 1; __n >= __wshift; --__n)
 	      _M_w[__n] = _M_w[__n - __wshift];
 	  else
 	    {
-	      const size_t __sub_offset = _GLIBCPP_BITSET_BITS_PER_WORD - __offset;
+	      const size_t __sub_offset = _GLIBCXX_BITSET_BITS_PER_WORD - __offset;
 	      for (size_t __n = _Nw - 1; __n > __wshift; --__n)
 		_M_w[__n] = (_M_w[__n - __wshift] << __offset) |
 		  (_M_w[__n - __wshift - 1] >> __sub_offset);
@@ -238,8 +238,8 @@ namespace std
     {
       if (__builtin_expect(__shift != 0, 1))
 	{
-	  const size_t __wshift = __shift / _GLIBCPP_BITSET_BITS_PER_WORD;
-	  const size_t __offset = __shift % _GLIBCPP_BITSET_BITS_PER_WORD;
+	  const size_t __wshift = __shift / _GLIBCXX_BITSET_BITS_PER_WORD;
+	  const size_t __offset = __shift % _GLIBCXX_BITSET_BITS_PER_WORD;
 	  const size_t __limit = _Nw - __wshift - 1;
 
 	  if (__offset == 0)
@@ -247,7 +247,7 @@ namespace std
 	      _M_w[__n] = _M_w[__n + __wshift];
 	  else
 	    {
-	      const size_t __sub_offset = _GLIBCPP_BITSET_BITS_PER_WORD - __offset;
+	      const size_t __sub_offset = _GLIBCXX_BITSET_BITS_PER_WORD - __offset;
 	      for (size_t __n = 0; __n < __limit; ++__n)
 		_M_w[__n] = (_M_w[__n + __wshift] >> __offset) |
 		  (_M_w[__n + __wshift + 1] << __sub_offset);
@@ -276,7 +276,7 @@ namespace std
 	{
 	  _WordT __thisword = _M_w[__i];
 	  if (__thisword != static_cast<_WordT>(0))
-	    return __i * _GLIBCPP_BITSET_BITS_PER_WORD
+	    return __i * _GLIBCXX_BITSET_BITS_PER_WORD
 	      + __builtin_ctzl(__thisword);
 	}
       // not found, so return an indication of failure.
@@ -291,7 +291,7 @@ namespace std
       ++__prev;
 
       // check out of bounds
-      if ( __prev >= _Nw * _GLIBCPP_BITSET_BITS_PER_WORD )
+      if ( __prev >= _Nw * _GLIBCXX_BITSET_BITS_PER_WORD )
 	return __not_found;
 
       // search first word
@@ -302,7 +302,7 @@ namespace std
       __thisword >>= __prev + 1;
 
       if (__thisword != static_cast<_WordT>(0))
-	return __i * _GLIBCPP_BITSET_BITS_PER_WORD
+	return __i * _GLIBCXX_BITSET_BITS_PER_WORD
 	  + __builtin_ctzl(__thisword);
 
       // check subsequent words
@@ -311,7 +311,7 @@ namespace std
 	{
 	  __thisword = _M_w[__i];
 	  if (__thisword != static_cast<_WordT>(0))
-	    return __i * _GLIBCPP_BITSET_BITS_PER_WORD
+	    return __i * _GLIBCXX_BITSET_BITS_PER_WORD
 	      + __builtin_ctzl(__thisword);
 	}
       // not found, so return an indication of failure.
@@ -337,15 +337,15 @@ namespace std
 
       static size_t
       _S_whichword(size_t __pos )
-      { return __pos / _GLIBCPP_BITSET_BITS_PER_WORD; }
+      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
 
       static size_t
       _S_whichbyte(size_t __pos )
-      { return (__pos % _GLIBCPP_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
+      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
 
       static size_t
       _S_whichbit(size_t __pos )
-      {  return __pos % _GLIBCPP_BITSET_BITS_PER_WORD; }
+      {  return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
 
       static _WordT
       _S_maskbit(size_t __pos )
@@ -414,7 +414,7 @@ namespace std
       _M_do_find_next(size_t __prev, size_t __not_found) const
       {
 	++__prev;
-	if (__prev >= ((size_t) _GLIBCPP_BITSET_BITS_PER_WORD))
+	if (__prev >= ((size_t) _GLIBCXX_BITSET_BITS_PER_WORD))
 	  return __not_found;
 
 	_WordT __x = _M_w >> __prev;
@@ -443,15 +443,15 @@ namespace std
 
       static size_t
       _S_whichword(size_t __pos )
-      { return __pos / _GLIBCPP_BITSET_BITS_PER_WORD; }
+      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
 
       static size_t
       _S_whichbyte(size_t __pos )
-      { return (__pos % _GLIBCPP_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
+      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
 
       static size_t
       _S_whichbit(size_t __pos )
-      {  return __pos % _GLIBCPP_BITSET_BITS_PER_WORD; }
+      {  return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
 
       static _WordT
       _S_maskbit(size_t __pos )
@@ -601,16 +601,16 @@ namespace std
    *  @endif
   */
   template<size_t _Nb>
-    class bitset : private _Base_bitset<_GLIBCPP_BITSET_WORDS(_Nb)>
+    class bitset : private _Base_bitset<_GLIBCXX_BITSET_WORDS(_Nb)>
   {
   private:
-    typedef _Base_bitset<_GLIBCPP_BITSET_WORDS(_Nb)> _Base;
+    typedef _Base_bitset<_GLIBCXX_BITSET_WORDS(_Nb)> _Base;
     typedef unsigned long _WordT;
 
     void
     _M_do_sanitize()
     {
-      _Sanitize<_Nb%_GLIBCPP_BITSET_BITS_PER_WORD>::
+      _Sanitize<_Nb%_GLIBCXX_BITSET_BITS_PER_WORD>::
           _S_do_sanitize(this->_M_hiword());
     }
 
@@ -930,7 +930,7 @@ namespace std
      *         as required by DR 11 to the standard.
      *
      *  @if maint
-     *  _GLIBCPP_RESOLVE_LIB_DEFECTS Note that this implementation already
+     *  _GLIBCXX_RESOLVE_LIB_DEFECTS Note that this implementation already
      *  resolves DR 11 (items 1 and 2), but does not do the range-checking
      *  required by that DR's resolution.  -pme
      *  The DR has since been changed:  range-checking is a precondition
@@ -1209,7 +1209,7 @@ namespace std
   //@}
 } // namespace std
 
-#undef _GLIBCPP_BITSET_WORDS
-#undef _GLIBCPP_BITSET_BITS_PER_WORD
+#undef _GLIBCXX_BITSET_WORDS
+#undef _GLIBCXX_BITSET_BITS_PER_WORD
 
-#endif /* _GLIBCPP_BITSET_H */
+#endif /* _BITSET */
diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h
index e943f5edcee..97d764df96b 100644
--- a/libstdc++-v3/include/std/std_complex.h
+++ b/libstdc++-v3/include/std/std_complex.h
@@ -40,8 +40,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_COMPLEX
-#define _CPP_COMPLEX	1
+#ifndef _COMPLEX
+#define _COMPLEX 1
 
 #pragma GCC system_header
 
@@ -456,7 +456,7 @@ namespace std
     inline _Tp
     norm(const complex<_Tp>& __z)
     {
-      return _Norm_helper<__is_floating<_Tp>::_M_type && !_GLIBCPP_FAST_MATH>::_S_do_it(__z);
+      return _Norm_helper<__is_floating<_Tp>::_M_type && !_GLIBCXX_FAST_MATH>::_S_do_it(__z);
     }
 
   template<typename _Tp>
@@ -599,7 +599,7 @@ namespace std
     typedef float value_type;
     
     complex(float = 0.0f, float = 0.0f);
-#ifdef _GLIBCPP_BUGGY_COMPLEX
+#ifdef _GLIBCXX_BUGGY_COMPLEX
     complex(const complex& __z) : _M_value(__z._M_value) { }
 #endif
     explicit complex(const complex<double>&);
@@ -746,7 +746,7 @@ namespace std
     typedef double value_type;
 
     complex(double  =0.0, double =0.0);
-#ifdef _GLIBCPP_BUGGY_COMPLEX
+#ifdef _GLIBCXX_BUGGY_COMPLEX
     complex(const complex& __z) : _M_value(__z._M_value) { }
 #endif
     complex(const complex<float>&);
@@ -892,7 +892,7 @@ namespace std
     typedef long double value_type;
 
     complex(long double = 0.0L, long double = 0.0L);
-#ifdef _GLIBCPP_BUGGY_COMPLEX
+#ifdef _GLIBCXX_BUGGY_COMPLEX
     complex(const complex& __z) : _M_value(__z._M_value) { }
 #endif
     complex(const complex<float>&);
@@ -1062,4 +1062,4 @@ namespace std
   : _M_value(_ComplexT(__z._M_value)) { }
 } // namespace std
 
-#endif	/* _CPP_COMPLEX */
+#endif	/* _COMPLEX */
diff --git a/libstdc++-v3/include/std/std_deque.h b/libstdc++-v3/include/std/std_deque.h
index 774d334e8d7..588c7c5576f 100644
--- a/libstdc++-v3/include/std/std_deque.h
+++ b/libstdc++-v3/include/std/std_deque.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_DEQUE
-#define _CPP_DEQUE 1
+#ifndef _DEQUE
+#define _DEQUE 1
 
 #pragma GCC system_header
 
@@ -70,9 +70,9 @@
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_deque.h>
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  include <bits/deque.tcc>
 #endif
 
-#endif /* _CPP_DEQUE */
+#endif /* _DEQUE */
 
diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h
index b97c9443de9..2b2a88deeba 100644
--- a/libstdc++-v3/include/std/std_fstream.h
+++ b/libstdc++-v3/include/std/std_fstream.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_FSTREAM
-#define _CPP_FSTREAM	1
+#ifndef _FSTREAM
+#define _FSTREAM 1
 
 #pragma GCC system_header
 
@@ -808,10 +808,10 @@ namespace std
     };
 } // namespace std
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export
 #endif
-#ifdef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
+#ifdef  _GLIBCXX_FULLY_COMPLIANT_HEADERS
 # include <bits/fstream.tcc>
 #endif
 
diff --git a/libstdc++-v3/include/std/std_functional.h b/libstdc++-v3/include/std/std_functional.h
index 40080d95579..0d438589922 100644
--- a/libstdc++-v3/include/std/std_functional.h
+++ b/libstdc++-v3/include/std/std_functional.h
@@ -46,15 +46,15 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_FUNCTIONAL
-#define _CPP_FUNCTIONAL 1
+#ifndef _FUNCTIONAL
+#define _FUNCTIONAL 1
 
 #pragma GCC system_header
 #include <bits/c++config.h>
 #include <cstddef>
 #include <bits/stl_function.h>
 
-#endif /* _CPP_FUNCTIONAL */
+#endif /* _FUNCTIONAL */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_iomanip.h b/libstdc++-v3/include/std/std_iomanip.h
index 490d5ac1cfb..3adb0dd2bf2 100644
--- a/libstdc++-v3/include/std/std_iomanip.h
+++ b/libstdc++-v3/include/std/std_iomanip.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_IOMANIP
-#define _CPP_IOMANIP 1
+#ifndef _IOMANIP
+#define _IOMANIP 1
 
 #pragma GCC system_header
 
@@ -266,7 +266,7 @@ namespace std
   // Inhibit implicit instantiations for required instantiations,
   // which are defined via explicit instantiations elsewhere.  
   // NB:  This syntax is a GNU extension.
-#if _GLIBCPP_EXTERN_TEMPLATE
+#if _GLIBCXX_EXTERN_TEMPLATE
   extern template ostream& operator<<(ostream&, _Setfill<char>);
   extern template ostream& operator<<(ostream&, _Setiosflags);
   extern template ostream& operator<<(ostream&, _Resetiosflags);
@@ -280,7 +280,7 @@ namespace std
   extern template istream& operator>>(istream&, _Setprecision);
   extern template istream& operator>>(istream&, _Setw);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern template wostream& operator<<(wostream&, _Setfill<wchar_t>);
   extern template wostream& operator<<(wostream&, _Setiosflags);
   extern template wostream& operator<<(wostream&, _Resetiosflags);
diff --git a/libstdc++-v3/include/std/std_ios.h b/libstdc++-v3/include/std/std_ios.h
index a7764c89cdd..76d10d759ae 100644
--- a/libstdc++-v3/include/std/std_ios.h
+++ b/libstdc++-v3/include/std/std_ios.h
@@ -36,8 +36,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_IOS
-#define _CPP_IOS	1
+#ifndef _IOS
+#define _IOS 1
 
 #pragma GCC system_header
 
@@ -50,5 +50,5 @@
 #include <streambuf> 
 #include <bits/basic_ios.h>
 
-#endif	/* _CPP_IOS */
+#endif	/* _IOS */
 
diff --git a/libstdc++-v3/include/std/std_iosfwd.h b/libstdc++-v3/include/std/std_iosfwd.h
index 55b0e0b19fa..a4877ef1677 100644
--- a/libstdc++-v3/include/std/std_iosfwd.h
+++ b/libstdc++-v3/include/std/std_iosfwd.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_IOSFWD
-#define _CPP_IOSFWD 1
+#ifndef _IOSFWD
+#define _IOSFWD 1
 
 #pragma GCC system_header
 
@@ -100,7 +100,7 @@ namespace std
   template<typename _CharT, typename _Traits = char_traits<_CharT> >
     class ostreambuf_iterator;
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
   // Not included.   (??? Apparently no LWG number?)
   class ios_base; 
 #endif
@@ -147,7 +147,7 @@ namespace std
   typedef basic_ofstream<char> 		ofstream;	///< @isiosfwd
   typedef basic_fstream<char> 		fstream;	///< @isiosfwd
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   typedef basic_ios<wchar_t> 		wios;		///< @isiosfwd
   typedef basic_streambuf<wchar_t> 	wstreambuf;	///< @isiosfwd
   typedef basic_istream<wchar_t> 	wistream;	///< @isiosfwd
diff --git a/libstdc++-v3/include/std/std_iostream.h b/libstdc++-v3/include/std/std_iostream.h
index d70949377df..4b025f7287c 100644
--- a/libstdc++-v3/include/std/std_iostream.h
+++ b/libstdc++-v3/include/std/std_iostream.h
@@ -36,8 +36,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_IOSTREAM
-#define _CPP_IOSTREAM	1
+#ifndef _IOSTREAM
+#define _IOSTREAM 1
 
 #pragma GCC system_header
 
@@ -65,7 +65,7 @@ namespace std
   extern ostream cerr;		///< Linked to standard error (unbuffered)
   extern ostream clog;		///< Linked to standard error (buffered)
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern wistream wcin;		///< Linked to standard input
   extern wostream wcout;	///< Linked to standard output
   extern wostream wcerr;	///< Linked to standard error (unbuffered)
diff --git a/libstdc++-v3/include/std/std_istream.h b/libstdc++-v3/include/std/std_istream.h
index 1612cb4a932..a8621f6c15f 100644
--- a/libstdc++-v3/include/std/std_istream.h
+++ b/libstdc++-v3/include/std/std_istream.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_ISTREAM
-#define _CPP_ISTREAM	1
+#ifndef _ISTREAM
+#define _ISTREAM 1
 
 #pragma GCC system_header
 
@@ -187,7 +187,7 @@ namespace std
       __istream_type& 
       operator>>(unsigned long& __n);
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
       __istream_type& 
       operator>>(long long& __n);
 
@@ -705,7 +705,7 @@ namespace std
       public basic_ostream<_CharT, _Traits>
     {
     public:
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 271. basic_iostream missing typedefs
       // Types (inherited):
       typedef _CharT                     		char_type;
@@ -768,11 +768,11 @@ namespace std
     ws(basic_istream<_CharT, _Traits>& __is);
 } // namespace std
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export
 #endif
-#ifdef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
+#ifdef  _GLIBCXX_FULLY_COMPLIANT_HEADERS
 # include <bits/istream.tcc>
 #endif
 
-#endif	/* _CPP_ISTREAM */
+#endif	/* _ISTREAM */
diff --git a/libstdc++-v3/include/std/std_iterator.h b/libstdc++-v3/include/std/std_iterator.h
index 7b1709409b1..2936cda86ac 100644
--- a/libstdc++-v3/include/std/std_iterator.h
+++ b/libstdc++-v3/include/std/std_iterator.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_ITERATOR
-#define _CPP_ITERATOR 1
+#ifndef _ITERATOR
+#define _ITERATOR 1
 
 #pragma GCC system_header
 #include <bits/c++config.h>
@@ -72,7 +72,7 @@
 #include <bits/stream_iterator.h>
 #include <bits/streambuf_iterator.h>
 
-#endif /* _CPP_ITERATOR */
+#endif /* _ITERATOR */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_limits.h b/libstdc++-v3/include/std/std_limits.h
index eaf3c8663da..dd3bf9de3a6 100644
--- a/libstdc++-v3/include/std/std_limits.h
+++ b/libstdc++-v3/include/std/std_limits.h
@@ -40,8 +40,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_NUMERIC_LIMITS
-#define _CPP_NUMERIC_LIMITS 1
+#ifndef _NUMERIC_LIMITS
+#define _NUMERIC_LIMITS 1
 
 #pragma GCC system_header
 
@@ -278,7 +278,7 @@ namespace std
    *  members will all be @c false.
    *
    *  @if maint
-   *  _GLIBCPP_RESOLVE_LIB_DEFECTS:  DRs 201 and 184 (hi Gaby!) are
+   *  _GLIBCXX_RESOLVE_LIB_DEFECTS:  DRs 201 and 184 (hi Gaby!) are
    *  noted, but not incorporated in this documented (yet).
    *  @endif
   */
@@ -1140,4 +1140,4 @@ namespace std
 #undef __glibcpp_digits
 #undef __glibcpp_digits10
 
-#endif // _CPP_NUMERIC_LIMITS
+#endif // _NUMERIC_LIMITS
diff --git a/libstdc++-v3/include/std/std_list.h b/libstdc++-v3/include/std/std_list.h
index 61c6dfa88eb..9a8e8a9a162 100644
--- a/libstdc++-v3/include/std/std_list.h
+++ b/libstdc++-v3/include/std/std_list.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_LIST
-#define _CPP_LIST 1
+#ifndef _LIST
+#define _LIST 1
 
 #pragma GCC system_header
 
@@ -70,9 +70,9 @@
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_list.h>
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  include <bits/list.tcc>
 #endif
 
-#endif /* _CPP_LIST */
+#endif /* _LIST */
 
diff --git a/libstdc++-v3/include/std/std_locale.h b/libstdc++-v3/include/std/std_locale.h
index 29602560766..9c3a101159e 100644
--- a/libstdc++-v3/include/std/std_locale.h
+++ b/libstdc++-v3/include/std/std_locale.h
@@ -36,8 +36,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_LOCALE
-#define _CPP_LOCALE	1
+#ifndef _LOCALE
+#define _LOCALE	1
 
 #pragma GCC system_header
 
diff --git a/libstdc++-v3/include/std/std_map.h b/libstdc++-v3/include/std/std_map.h
index c04cbd542a6..7965394dc51 100644
--- a/libstdc++-v3/include/std/std_map.h
+++ b/libstdc++-v3/include/std/std_map.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_MAP
-#define _CPP_MAP 1
+#ifndef _MAP
+#define _MAP 1
 
 #pragma GCC system_header
 
@@ -67,7 +67,7 @@
 #include <bits/stl_map.h>
 #include <bits/stl_multimap.h>
 
-#endif /* _CPP_MAP */
+#endif /* _MAP */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_memory.h b/libstdc++-v3/include/std/std_memory.h
index b508351c8b5..49cf008cf88 100644
--- a/libstdc++-v3/include/std/std_memory.h
+++ b/libstdc++-v3/include/std/std_memory.h
@@ -46,8 +46,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_MEMORY
-#define _CPP_MEMORY 1
+#ifndef _MEMORY
+#define _MEMORY 1
 
 #pragma GCC system_header
 
@@ -158,7 +158,7 @@ namespace std
    *  in the libstdc++ testsuite.
    *
    *  @if maint
-   *  _GLIBCPP_RESOLVE_LIB_DEFECTS
+   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
    *  127.  auto_ptr<> conversion issues
    *  These resolutions have all been incorporated.
    *  @endif
diff --git a/libstdc++-v3/include/std/std_numeric.h b/libstdc++-v3/include/std/std_numeric.h
index 936eaa78945..c287f925a16 100644
--- a/libstdc++-v3/include/std/std_numeric.h
+++ b/libstdc++-v3/include/std/std_numeric.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_NUMERIC
-#define _CPP_NUMERIC 1
+#ifndef _NUMERIC
+#define _NUMERIC 1
 
 #pragma GCC system_header
 #include <bits/c++config.h>
@@ -68,7 +68,7 @@
 #include <bits/stl_function.h>
 #include <bits/stl_numeric.h>
 
-#endif /* _CPP_NUMERIC */
+#endif /* _NUMERIC */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_ostream.h b/libstdc++-v3/include/std/std_ostream.h
index 36169ca97f0..b20354dc520 100644
--- a/libstdc++-v3/include/std/std_ostream.h
+++ b/libstdc++-v3/include/std/std_ostream.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_OSTREAM
-#define _CPP_OSTREAM	1
+#ifndef _OSTREAM
+#define _OSTREAM 1
 
 #pragma GCC system_header
 
@@ -203,7 +203,7 @@ namespace std
       operator<<(unsigned int __n)
       { return this->operator<<(static_cast<unsigned long>(__n)); }
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
       __ostream_type& 
       operator<<(long long __n);
 
@@ -541,11 +541,11 @@ namespace std
 
 } // namespace std
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export
 #endif
-#ifdef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
+#ifdef  _GLIBCXX_FULLY_COMPLIANT_HEADERS
 # include <bits/ostream.tcc>
 #endif
 
-#endif	/* _CPP_OSTREAM */
+#endif	/* _OSTREAM */
diff --git a/libstdc++-v3/include/std/std_queue.h b/libstdc++-v3/include/std/std_queue.h
index 33eb9449727..cd6e5ec6dfe 100644
--- a/libstdc++-v3/include/std/std_queue.h
+++ b/libstdc++-v3/include/std/std_queue.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_QUEUE
-#define _CPP_QUEUE 1
+#ifndef _QUEUE
+#define _QUEUE 1
 
 #pragma GCC system_header
 #include <bits/c++config.h>
@@ -74,9 +74,9 @@
 #include <bits/stl_function.h>
 #include <bits/stl_queue.h>
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  include <bits/deque.tcc>
 #  include <bits/vector.tcc>
 #endif
 
-#endif /* _CPP_QUEUE */
+#endif /* _QUEUE */
diff --git a/libstdc++-v3/include/std/std_set.h b/libstdc++-v3/include/std/std_set.h
index 249f396f1af..d59af35b8c5 100644
--- a/libstdc++-v3/include/std/std_set.h
+++ b/libstdc++-v3/include/std/std_set.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_SET
-#define _CPP_SET 1
+#ifndef _SET
+#define _SET 1
 
 #pragma GCC system_header
 
@@ -67,7 +67,7 @@
 #include <bits/stl_set.h>
 #include <bits/stl_multiset.h>
 
-#endif /* _CPP_SET */
+#endif /* _SET */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_sstream.h b/libstdc++-v3/include/std/std_sstream.h
index 4d6d2604619..dcdb7a713bf 100644
--- a/libstdc++-v3/include/std/std_sstream.h
+++ b/libstdc++-v3/include/std/std_sstream.h
@@ -36,8 +36,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_SSTREAM
-#define _CPP_SSTREAM	1
+#ifndef _SSTREAM
+#define _SSTREAM 1
 
 #pragma GCC system_header
 
@@ -65,7 +65,7 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 251. basic_stringbuf missing allocator_type
       typedef _Alloc				       	allocator_type;
 #endif
@@ -304,7 +304,7 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 251. basic_stringbuf missing allocator_type
       typedef _Alloc				       	allocator_type;
 #endif
@@ -423,7 +423,7 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 251. basic_stringbuf missing allocator_type
       typedef _Alloc				       	allocator_type;
 #endif
@@ -542,7 +542,7 @@ namespace std
       // Types:
       typedef _CharT 					char_type;
       typedef _Traits 					traits_type;
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
 // 251. basic_stringbuf missing allocator_type
       typedef _Alloc				       	allocator_type;
 #endif
@@ -641,10 +641,10 @@ namespace std
     };
 } // namespace std
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export
 #endif
-#ifdef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
+#ifdef  _GLIBCXX_FULLY_COMPLIANT_HEADERS
 # include <bits/sstream.tcc>
 #endif
 
diff --git a/libstdc++-v3/include/std/std_stack.h b/libstdc++-v3/include/std/std_stack.h
index fb111d4d4df..1da582ee957 100644
--- a/libstdc++-v3/include/std/std_stack.h
+++ b/libstdc++-v3/include/std/std_stack.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_STACK
-#define _CPP_STACK 1
+#ifndef _STACK
+#define _STACK 1
 
 #pragma GCC system_header
 
@@ -70,8 +70,8 @@
 #include <bits/stl_deque.h>
 #include <bits/stl_stack.h>
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  include <bits/deque.tcc>
 #endif
 
-#endif /* _CPP_STACK */
+#endif /* _STACK */
diff --git a/libstdc++-v3/include/std/std_stdexcept.h b/libstdc++-v3/include/std/std_stdexcept.h
index 07a15e466ce..38ff1ad219d 100644
--- a/libstdc++-v3/include/std/std_stdexcept.h
+++ b/libstdc++-v3/include/std/std_stdexcept.h
@@ -36,8 +36,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_STDEXCEPT
-#define _CPP_STDEXCEPT 	  1
+#ifndef _STDEXCEPT
+#define _STDEXCEPT 1
 
 #pragma GCC system_header
 
@@ -145,4 +145,4 @@ namespace std
   };
 } // namespace std
 
-#endif // _CPP_STDEXCEPT
+#endif // _STDEXCEPT
diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h
index 0943739a1c8..1946d50cd12 100644
--- a/libstdc++-v3/include/std/std_streambuf.h
+++ b/libstdc++-v3/include/std/std_streambuf.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_STREAMBUF
-#define _CPP_STREAMBUF	1
+#ifndef _STREAMBUF
+#define _STREAMBUF 1
 
 #pragma GCC system_header
 
@@ -741,7 +741,7 @@ namespace std
       overflow(int_type /* __c */ = traits_type::eof())
       { return traits_type::eof(); }
 
-#ifdef _GLIBCPP_DEPRECATED
+#ifdef _GLIBCXX_DEPRECATED
     // Annex D.6
     public:
       /**
@@ -753,7 +753,7 @@ namespace std
        *  See http://gcc.gnu.org/ml/libstdc++/2002-05/msg00168.html
        *
        *  @note  This function has been deprecated by the standard.  You
-       *         must define @c _GLIBCPP_DEPRECATED to make this visible; see
+       *         must define @c _GLIBCXX_DEPRECATED to make this visible; see
        *         c++config.h.
       */
       void 
@@ -766,7 +766,7 @@ namespace std
       }
 #endif
 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
     // Side effect of DR 50. 
     private:
       basic_streambuf(const __streambuf_type&) { }; 
@@ -777,10 +777,10 @@ namespace std
     };
 } // namespace std
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # define export
 #endif
-#ifdef  _GLIBCPP_FULLY_COMPLIANT_HEADERS
+#ifdef  _GLIBCXX_FULLY_COMPLIANT_HEADERS
 #include <bits/streambuf.tcc>
 #endif
 
diff --git a/libstdc++-v3/include/std/std_string.h b/libstdc++-v3/include/std/std_string.h
index 6b82f8ecb0c..f365a32dc93 100644
--- a/libstdc++-v3/include/std/std_string.h
+++ b/libstdc++-v3/include/std/std_string.h
@@ -37,8 +37,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_STRING
-#define _CPP_STRING	1
+#ifndef _STRING
+#define _STRING	1
 
 #pragma GCC system_header
 
@@ -52,10 +52,10 @@
 #include <bits/stl_function.h>  // For less
 #include <bits/basic_string.h>
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 # include <algorithm> // for find_if
 # include <bits/basic_string.tcc> 
 #endif
 
-#endif /* _CPP_STRING */
+#endif /* _STRING */
 
diff --git a/libstdc++-v3/include/std/std_utility.h b/libstdc++-v3/include/std/std_utility.h
index b9c6c09ff64..a0d7bbe8d57 100644
--- a/libstdc++-v3/include/std/std_utility.h
+++ b/libstdc++-v3/include/std/std_utility.h
@@ -58,15 +58,15 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_UTILITY
-#define _CPP_UTILITY 1
+#ifndef _UTILITY
+#define _UTILITY 1
 
 #pragma GCC system_header
 #include <bits/c++config.h>
 #include <bits/stl_relops.h>
 #include <bits/stl_pair.h>
 
-#endif /* _CPP_UTILITY */
+#endif /* _UTILITY */
 
 // Local Variables:
 // mode:C++
diff --git a/libstdc++-v3/include/std/std_valarray.h b/libstdc++-v3/include/std/std_valarray.h
index 31b84399c72..d5bdd557483 100644
--- a/libstdc++-v3/include/std/std_valarray.h
+++ b/libstdc++-v3/include/std/std_valarray.h
@@ -35,8 +35,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_VALARRAY
-#define _CPP_VALARRAY 1
+#ifndef _VALARRAY
+#define _VALARRAY 1
 
 #pragma GCC system_header
 
@@ -689,7 +689,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal)
 
 } // namespace std
 
-#endif // _CPP_VALARRAY
+#endif // _VALARRAY
 
 // Local Variables:
 // mode:c++
diff --git a/libstdc++-v3/include/std/std_vector.h b/libstdc++-v3/include/std/std_vector.h
index 5f700495b4c..336f7bf2ddb 100644
--- a/libstdc++-v3/include/std/std_vector.h
+++ b/libstdc++-v3/include/std/std_vector.h
@@ -58,8 +58,8 @@
  *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
  */
 
-#ifndef _CPP_VECTOR
-#define _CPP_VECTOR 1
+#ifndef _VECTOR
+#define _VECTOR 1
 
 #pragma GCC system_header
 
@@ -71,9 +71,9 @@
 #include <bits/stl_vector.h>
 #include <bits/stl_bvector.h> 
 
-#ifdef _GLIBCPP_NO_TEMPLATE_EXPORT
+#ifdef _GLIBCXX_NO_TEMPLATE_EXPORT
 #  include <bits/vector.tcc>
 #endif
 
-#endif /* _CPP_VECTOR */
+#endif /* _VECTOR */
 
diff --git a/libstdc++-v3/libmath/Makefile.am b/libstdc++-v3/libmath/Makefile.am
index 30d3dce0d16..7a254011899 100644
--- a/libstdc++-v3/libmath/Makefile.am
+++ b/libstdc++-v3/libmath/Makefile.am
@@ -34,7 +34,7 @@ libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
 libmath_la_SOURCES = stubs.c
 
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
+# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
 INCLUDES = \
diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in
index ff621b164c9..b2f688d990c 100644
--- a/libstdc++-v3/libmath/Makefile.in
+++ b/libstdc++-v3/libmath/Makefile.in
@@ -92,10 +92,12 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
+FPOS_H = @FPOS_H@
+FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
@@ -123,18 +125,18 @@ baseline_dir = @baseline_dir@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_builddir = @glibcpp_builddir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_srcdir = @glibcpp_srcdir@
-glibcpp_thread_h = @glibcpp_thread_h@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_builddir = @glibcxx_builddir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_srcdir = @glibcxx_srcdir@
+glibcxx_thread_h = @glibcxx_thread_h@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
@@ -152,7 +154,7 @@ libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
 
 libmath_la_SOURCES = stubs.c
 
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
+# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
 INCLUDES = \
diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am
index da26ec97def..344c50c8480 100644
--- a/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@ -28,9 +28,9 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 # Cross compiler and multilib support.
 CC = @CC@
-CXX = @glibcpp_CXX@
-toolexecdir = @glibcpp_toolexecdir@
-toolexeclibdir = @glibcpp_toolexeclibdir@
+CXX = @glibcxx_CXX@
+toolexecdir = @glibcxx_toolexecdir@
+toolexeclibdir = @glibcxx_toolexeclibdir@
 
 
 # Need this library to both be part of libstdc++.a, and installed
@@ -46,7 +46,7 @@ noinst_LTLIBRARIES = libsupc++convenience.la
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 
 # These bits are all figured out from configure. Look in acinclude.m4
-# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
+# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 CONFIG_CXXFLAGS = \
 	@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
@@ -57,13 +57,13 @@ WARN_CXXFLAGS = \
 
 LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@
 
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include
 
 INCLUDES = \
-	$(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
+	$(GCC_INCLUDES) $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES)
 
 headers = \
 	exception new typeinfo cxxabi.h exception_defines.h 
@@ -99,8 +99,8 @@ sources = \
 libsupc___la_SOURCES = $(sources) 
 libsupc__convenience_la_SOURCES = $(sources) 
 
-glibcppinstalldir = $(gxx_include_dir)
-glibcppinstall_HEADERS = $(headers)
+glibcxxinstalldir = $(gxx_include_dir)
+glibcxxinstall_HEADERS = $(headers)
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
@@ -153,20 +153,20 @@ CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
           @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 # We have to have rules modified from the default to counteract SUN make
-# prepending each of $(glibcppinstall_HEADERS) with VPATH below.
-install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
+# prepending each of $(glibcxxinstall_HEADERS) with VPATH below.
+install-glibcxxinstallHEADERS: $(glibcxxinstall_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
-	@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(glibcxxinstalldir)
+	@list='$(glibcxxinstall_HEADERS)'; for p in $$list; do \
 	  q=`echo $$p | sed -e 's,.*/,,'`; \
 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcxxinstalldir)/$$q"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcxxinstalldir)/$$q; \
 	done
 
-uninstall-glibcppinstallHEADERS:
+uninstall-glibcxxinstallHEADERS:
 	@$(NORMAL_UNINSTALL)
-	list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
+	list='$(glibcxxinstall_HEADERS)'; for p in $$list; do \
 	  q=`echo $$p | sed -e 's,.*/,,'`; \
-	  rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \
+	  rm -f $(DESTDIR)$(glibcxxinstalldir)/$$q; \
 	done
diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in
index b1eaa7f075f..0d7bcb1bd2b 100644
--- a/libstdc++-v3/libsupc++/Makefile.in
+++ b/libstdc++-v3/libsupc++/Makefile.in
@@ -90,9 +90,11 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
+FPOS_H = @FPOS_H@
+FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
@@ -120,18 +122,18 @@ baseline_dir = @baseline_dir@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_builddir = @glibcpp_builddir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_srcdir = @glibcpp_srcdir@
-glibcpp_thread_h = @glibcpp_thread_h@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_builddir = @glibcxx_builddir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_srcdir = @glibcxx_srcdir@
+glibcxx_thread_h = @glibcxx_thread_h@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
@@ -144,9 +146,9 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 # Cross compiler and multilib support.
 CC = @CC@
-CXX = @glibcpp_CXX@
-toolexecdir = @glibcpp_toolexecdir@
-toolexeclibdir = @glibcpp_toolexeclibdir@
+CXX = @glibcxx_CXX@
+toolexecdir = @glibcxx_toolexecdir@
+toolexeclibdir = @glibcxx_toolexeclibdir@
 
 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
@@ -160,7 +162,7 @@ noinst_LTLIBRARIES = libsupc++convenience.la
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 
 # These bits are all figured out from configure. Look in acinclude.m4
-# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
+# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
 # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
 CONFIG_CXXFLAGS = \
 	@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
@@ -173,13 +175,13 @@ WARN_CXXFLAGS = \
 
 LIBSUPCXX_CXXFLAGS = @LIBSUPCXX_PICFLAGS@
 
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 GCC_INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include
 
 INCLUDES = \
-	$(GCC_INCLUDES) $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES)
+	$(GCC_INCLUDES) $(GLIBCXX_INCLUDES) $(LIBSUPCXX_INCLUDES)
 
 
 headers = \
@@ -218,8 +220,8 @@ sources = \
 libsupc___la_SOURCES = $(sources) 
 libsupc__convenience_la_SOURCES = $(sources) 
 
-glibcppinstalldir = $(gxx_include_dir)
-glibcppinstall_HEADERS = $(headers)
+glibcxxinstalldir = $(gxx_include_dir)
+glibcxxinstall_HEADERS = $(headers)
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
@@ -302,7 +304,7 @@ vterminate.lo
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-HEADERS =  $(glibcppinstall_HEADERS)
+HEADERS =  $(glibcxxinstall_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in
 
@@ -472,14 +474,14 @@ install-info: install-info-am
 install-exec-am: install-toolexeclibLTLIBRARIES
 install-exec: install-exec-am
 
-install-data-am: install-glibcppinstallHEADERS
+install-data-am: install-glibcxxinstallHEADERS
 install-data: install-data-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 uninstall-am: uninstall-toolexeclibLTLIBRARIES \
-		uninstall-glibcppinstallHEADERS
+		uninstall-glibcxxinstallHEADERS
 uninstall: uninstall-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 all-redirect: all-am
@@ -487,7 +489,7 @@ install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(toolexeclibdir) \
-		$(DESTDIR)$(glibcppinstalldir)
+		$(DESTDIR)$(glibcxxinstalldir)
 
 
 mostlyclean-generic:
@@ -537,8 +539,8 @@ clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
 uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool uninstall-glibcppinstallHEADERS \
-install-glibcppinstallHEADERS tags mostlyclean-tags distclean-tags \
+clean-libtool maintainer-clean-libtool uninstall-glibcxxinstallHEADERS \
+install-glibcxxinstallHEADERS tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
 check-am installcheck-am installcheck install-info-am install-info \
 install-exec-am install-exec install-data-am install-data install-am \
@@ -548,22 +550,22 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # We have to have rules modified from the default to counteract SUN make
-# prepending each of $(glibcppinstall_HEADERS) with VPATH below.
-install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS)
+# prepending each of $(glibcxxinstall_HEADERS) with VPATH below.
+install-glibcxxinstallHEADERS: $(glibcxxinstall_HEADERS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir)
-	@list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(glibcxxinstalldir)
+	@list='$(glibcxxinstall_HEADERS)'; for p in $$list; do \
 	  q=`echo $$p | sed -e 's,.*/,,'`; \
 	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcxxinstalldir)/$$q"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcxxinstalldir)/$$q; \
 	done
 
-uninstall-glibcppinstallHEADERS:
+uninstall-glibcxxinstallHEADERS:
 	@$(NORMAL_UNINSTALL)
-	list='$(glibcppinstall_HEADERS)'; for p in $$list; do \
+	list='$(glibcxxinstall_HEADERS)'; for p in $$list; do \
 	  q=`echo $$p | sed -e 's,.*/,,'`; \
-	  rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \
+	  rm -f $(DESTDIR)$(glibcxxinstalldir)/$$q; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/libstdc++-v3/libsupc++/cxxabi.h b/libstdc++-v3/libsupc++/cxxabi.h
index 0858aa71bcc..1cad2058059 100644
--- a/libstdc++-v3/libsupc++/cxxabi.h
+++ b/libstdc++-v3/libsupc++/cxxabi.h
@@ -39,8 +39,8 @@
    is includable from both C and C++. Though the C++ specific parts are not
    available in C, naturally enough.  */
 
-#ifndef __CXXABI_H
-#define __CXXABI_H 1
+#ifndef _CXXABI_H
+#define _CXXABI_H 1
 
 #ifdef __cplusplus
 
diff --git a/libstdc++-v3/libsupc++/eh_personality.cc b/libstdc++-v3/libsupc++/eh_personality.cc
index 6ae40a06521..9cf96f4b37d 100644
--- a/libstdc++-v3/libsupc++/eh_personality.cc
+++ b/libstdc++-v3/libsupc++/eh_personality.cc
@@ -170,7 +170,7 @@ empty_exception_spec (lsda_header_info *info, _Unwind_Sword filter_value)
 
 // Using a different personality function name causes link failures
 // when trying to mix code using different exception handling models.
-#ifdef _GLIBCPP_SJLJ_EXCEPTIONS
+#ifdef _GLIBCXX_SJLJ_EXCEPTIONS
 #define PERSONALITY_FUNCTION	__gxx_personality_sj0
 #define __builtin_eh_return_data_regno(x) x
 #else
@@ -232,7 +232,7 @@ PERSONALITY_FUNCTION (int version,
   action_record = 0;
   handler_switch_value = 0;
 
-#ifdef _GLIBCPP_SJLJ_EXCEPTIONS
+#ifdef _GLIBCXX_SJLJ_EXCEPTIONS
   // The given "IP" is an index into the call-site table, with two
   // exceptions -- -1 means no-action, and 0 means terminate.  But
   // since we're using uleb128 values, we've not got random access
@@ -285,7 +285,7 @@ PERSONALITY_FUNCTION (int version,
 	  goto found_something;
 	}
     }
-#endif // _GLIBCPP_SJLJ_EXCEPTIONS
+#endif // _GLIBCXX_SJLJ_EXCEPTIONS
 
   // If ip is not present in the table, call terminate.  This is for
   // a destructor inside a cleanup, or a library routine the compiler
diff --git a/libstdc++-v3/libsupc++/eh_throw.cc b/libstdc++-v3/libsupc++/eh_throw.cc
index 54d10fbc4f5..55af4eedfa7 100644
--- a/libstdc++-v3/libsupc++/eh_throw.cc
+++ b/libstdc++-v3/libsupc++/eh_throw.cc
@@ -69,7 +69,7 @@ __cxa_throw (void *obj, std::type_info *tinfo, void (*dest) (void *))
   __cxa_eh_globals *globals = __cxa_get_globals ();
   globals->uncaughtExceptions += 1;
 
-#ifdef _GLIBCPP_SJLJ_EXCEPTIONS
+#ifdef _GLIBCXX_SJLJ_EXCEPTIONS
   _Unwind_SjLj_RaiseException (&header->unwindHeader);
 #else
   _Unwind_RaiseException (&header->unwindHeader);
@@ -95,7 +95,7 @@ __cxa_rethrow ()
       else
 	header->handlerCount = -header->handlerCount;
 
-#ifdef _GLIBCPP_SJLJ_EXCEPTIONS
+#ifdef _GLIBCXX_SJLJ_EXCEPTIONS
       _Unwind_SjLj_Resume_or_Rethrow (&header->unwindHeader);
 #else
 #ifdef _LIBUNWIND_STD_ABI
diff --git a/libstdc++-v3/libsupc++/exception_defines.h b/libstdc++-v3/libsupc++/exception_defines.h
index 1178f224527..1466486dc6b 100644
--- a/libstdc++-v3/libsupc++/exception_defines.h
+++ b/libstdc++-v3/libsupc++/exception_defines.h
@@ -31,8 +31,8 @@
 // ISO C++ 14882: 19.1  Exception classes
 //
 
-#ifndef __EXCEPTION_DEFINES_H
-#define __EXCEPTION_DEFINES_H 1
+#ifndef _EXCEPTION_DEFINES_H
+#define _EXCEPTION_DEFINES_H 1
 
 #ifndef __EXCEPTIONS
 // Iff -fno-exceptions, transform error handling code to work without it.
diff --git a/libstdc++-v3/libsupc++/new b/libstdc++-v3/libsupc++/new
index 3bfc3ddecbd..00e99464b90 100644
--- a/libstdc++-v3/libsupc++/new
+++ b/libstdc++-v3/libsupc++/new
@@ -35,8 +35,8 @@
  *  http://gcc.gnu.org/onlinedocs/libstdc++/18_support/howto.html#4 for more.
  */
 
-#ifndef __NEW__
-#define __NEW__
+#ifndef _NEW
+#define _NEW
 
 #include <cstddef>
 #include <exception>
diff --git a/libstdc++-v3/libsupc++/pure.cc b/libstdc++-v3/libsupc++/pure.cc
index c8e3bdb0f40..66ccb7d12dd 100644
--- a/libstdc++-v3/libsupc++/pure.cc
+++ b/libstdc++-v3/libsupc++/pure.cc
@@ -30,7 +30,7 @@
 #include <bits/c++config.h>
 #include "unwind-cxx.h"
 
-#ifdef _GLIBCPP_HAVE_UNISTD_H
+#ifdef _GLIBCXX_HAVE_UNISTD_H
 # include <unistd.h>
 # define writestr(str)	write(2, str, sizeof(str) - 1)
 # ifdef __GNU_LIBRARY__
diff --git a/libstdc++-v3/libsupc++/tinfo.cc b/libstdc++-v3/libsupc++/tinfo.cc
index a8d1d14f664..c2821765946 100644
--- a/libstdc++-v3/libsupc++/tinfo.cc
+++ b/libstdc++-v3/libsupc++/tinfo.cc
@@ -100,7 +100,7 @@ struct vtable_prefix
   ptrdiff_t whole_object;
 
   // Additional padding if necessary.
-#ifdef _GLIBCPP_VTABLE_PADDING
+#ifdef _GLIBCXX_VTABLE_PADDING
   ptrdiff_t padding1;               
 #endif
 
@@ -108,7 +108,7 @@ struct vtable_prefix
   const __class_type_info *whole_type;  
 
   // Additional padding if necessary.
-#ifdef _GLIBCPP_VTABLE_PADDING
+#ifdef _GLIBCXX_VTABLE_PADDING
   ptrdiff_t padding2;               
 #endif
 
diff --git a/libstdc++-v3/libsupc++/typeinfo b/libstdc++-v3/libsupc++/typeinfo
index 01ec3fa8edf..1396baa6fc2 100644
--- a/libstdc++-v3/libsupc++/typeinfo
+++ b/libstdc++-v3/libsupc++/typeinfo
@@ -32,8 +32,8 @@
  *  This header provides RTTI support.
  */
 
-#ifndef __TYPEINFO__
-#define __TYPEINFO__
+#ifndef _TYPEINFO
+#define _TYPEINFO
 
 #include <exception>
 
diff --git a/libstdc++-v3/libsupc++/unwind-cxx.h b/libstdc++-v3/libsupc++/unwind-cxx.h
index 2bfe2cccd5c..1e17972ba50 100644
--- a/libstdc++-v3/libsupc++/unwind-cxx.h
+++ b/libstdc++-v3/libsupc++/unwind-cxx.h
@@ -30,8 +30,8 @@
 // This is derived from the C++ ABI for IA-64.  Where we diverge
 // for cross-architecture compatibility are noted with "@@@".
 
-#ifndef __UNWIND_CXX_H
-#define __UNWIND_CXX_H 1
+#ifndef _UNWIND_CXX_H
+#define _UNWIND_CXX_H 1
 
 // Level 2: C++ ABI
 
@@ -168,4 +168,4 @@ __get_exception_header_from_ue (_Unwind_Exception *exc)
 
 } /* namespace __cxxabiv1 */
 
-#endif // __UNWIND_CXX_H
+#endif // _UNWIND_CXX_H
diff --git a/libstdc++-v3/libsupc++/vterminate.cc b/libstdc++-v3/libsupc++/vterminate.cc
index 324e0d31cc5..38f6f617868 100644
--- a/libstdc++-v3/libsupc++/vterminate.cc
+++ b/libstdc++-v3/libsupc++/vterminate.cc
@@ -33,7 +33,7 @@
 #include <exception_defines.h>
 #include <cxxabi.h>
 
-#ifdef _GLIBCPP_HAVE_UNISTD_H
+#ifdef _GLIBCXX_HAVE_UNISTD_H
 # include <unistd.h>
 # define writestr(str)  write(2, str, __builtin_strlen(str))
 #else
diff --git a/libstdc++-v3/po/Makefile.am b/libstdc++-v3/po/Makefile.am
index 9065757c32b..a0a73b43bdd 100644
--- a/libstdc++-v3/po/Makefile.am
+++ b/libstdc++-v3/po/Makefile.am
@@ -22,18 +22,18 @@
 ## USA.
 
 PACKAGE = @PACKAGE@
-glibcpp_srcdir = @glibcpp_srcdir@
+glibcxx_srcdir = @glibcxx_srcdir@
 
 # Location of installation directories.
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 locale_installdir = $(DESTDIR)$(datadir)/locale
-locale_builddir = @glibcpp_localedir@
+locale_builddir = @glibcxx_localedir@
 
 # Tell automake that foo.po makes foo.mo
 SUFFIXES = .po .mo
 
-LOCALE_IN = @glibcpp_POFILES@
-LOCALE_OUT = @glibcpp_MOFILES@
+LOCALE_IN = @glibcxx_POFILES@
+LOCALE_OUT = @glibcxx_MOFILES@
 
 MSGFMT = msgfmt
 
@@ -81,7 +81,7 @@ install-data-local-yes: all-local-yes
 # Maintainence of the .po template file.  This rule is never run automatically,
 # and updates the source directory.
 pot:
-	cd $(glibcpp_srcdir); \
+	cd $(glibcxx_srcdir); \
 	xgettext --default-domain=$(PACKAGE) --add-comments --c++ --debug \
 	  --join-existing -o po/$(PACKAGE).pot --keyword=__N \
 	  `grep -r -l '__N(".*")' .`
diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in
index 74159f1a31b..447a5ca59f7 100644
--- a/libstdc++-v3/po/Makefile.in
+++ b/libstdc++-v3/po/Makefile.in
@@ -92,10 +92,12 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
+FPOS_H = @FPOS_H@
+FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
@@ -124,35 +126,35 @@ baseline_dir = @baseline_dir@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_builddir = @glibcpp_builddir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_thread_h = @glibcpp_thread_h@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_builddir = @glibcxx_builddir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_thread_h = @glibcxx_thread_h@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
 toplevel_srcdir = @toplevel_srcdir@
 
 PACKAGE = @PACKAGE@
-glibcpp_srcdir = @glibcpp_srcdir@
+glibcxx_srcdir = @glibcxx_srcdir@
 
 # Location of installation directories.
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 locale_installdir = $(DESTDIR)$(datadir)/locale
-locale_builddir = @glibcpp_localedir@
+locale_builddir = @glibcxx_localedir@
 
 # Tell automake that foo.po makes foo.mo
 SUFFIXES = .po .mo
 
-LOCALE_IN = @glibcpp_POFILES@
-LOCALE_OUT = @glibcpp_MOFILES@
+LOCALE_IN = @glibcxx_POFILES@
+LOCALE_OUT = @glibcxx_MOFILES@
 
 MSGFMT = msgfmt
 
@@ -310,7 +312,7 @@ install-data-local-yes: all-local-yes
 # Maintainence of the .po template file.  This rule is never run automatically,
 # and updates the source directory.
 pot:
-	cd $(glibcpp_srcdir); \
+	cd $(glibcxx_srcdir); \
 	xgettext --default-domain=$(PACKAGE) --add-comments --c++ --debug \
 	  --join-existing -o po/$(PACKAGE).pot --keyword=__N \
 	  `grep -r -l '__N(".*")' .`
diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in
index 4858c2e6606..8e8f93970ee 100755
--- a/libstdc++-v3/scripts/testsuite_flags.in
+++ b/libstdc++-v3/scripts/testsuite_flags.in
@@ -21,9 +21,9 @@ EOF
 }
 
 # Establish configure-generated directory structure.
-BUILD_DIR=@glibcpp_builddir@
-SRC_DIR=@glibcpp_srcdir@
-PREFIX_DIR=@glibcpp_prefixdir@
+BUILD_DIR=@glibcxx_builddir@
+SRC_DIR=@glibcxx_srcdir@
+PREFIX_DIR=@glibcxx_prefixdir@
 query=$1
 
 case ${query} in
@@ -32,7 +32,7 @@ case ${query} in
       echo ${INCLUDES}
       ;;
     --build-includes)
-      INCLUDES="-nostdinc++ @GLIBCPP_INCLUDES@
+      INCLUDES="-nostdinc++ @GLIBCXX_INCLUDES@
 	        -I${SRC_DIR}/libsupc++ -I${SRC_DIR}/libio 
 		-I${SRC_DIR}/include/backward 
 		-I${SRC_DIR}/testsuite"
@@ -43,15 +43,15 @@ case ${query} in
       echo ${CXX}
       ;;
     --build-cxx)
-      PCHFLAGS="@glibcpp_PCHFLAGS@"
-      CXX_build="@glibcpp_CXX@ ${PCHFLAGS}"
+      PCHFLAGS="@glibcxx_PCHFLAGS@"
+      CXX_build="@glibcxx_CXX@ ${PCHFLAGS}"
       CXX=`echo "$CXX_build" | sed 's,gcc/xgcc ,gcc/g++ ,'`
       echo ${CXX}
       ;;
     --cxxflags)
       CXXFLAGS_save="-g -O2"
       CXXFLAGS_config='@SECTION_FLAGS@ @SECTION_LDFLAGS@ -fmessage-length=0 
- 		      @EXTRA_CXX_FLAGS@ -DLOCALEDIR="@glibcpp_localedir@" '
+ 		      @EXTRA_CXX_FLAGS@ -DLOCALEDIR="@glibcxx_localedir@" '
       echo ${CXXFLAGS_save} ${CXXFLAGS_config}
       ;;
     *)
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am
index 2dbf697440e..2322a6737f4 100644
--- a/libstdc++-v3/src/Makefile.am
+++ b/libstdc++-v3/src/Makefile.am
@@ -28,18 +28,18 @@ MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 # Cross compiler support.
-CXX = @glibcpp_CXX@
-glibcpp_srcdir=@glibcpp_srcdir@
-glibcpp_builddir=@glibcpp_builddir@
-toolexecdir = @glibcpp_toolexecdir@
-toolexeclibdir = @glibcpp_toolexeclibdir@
+CXX = @glibcxx_CXX@
+glibcxx_srcdir=@glibcxx_srcdir@
+glibcxx_builddir=@glibcxx_builddir@
+toolexecdir = @glibcxx_toolexecdir@
+toolexeclibdir = @glibcxx_toolexeclibdir@
 toolexeclib_LTLIBRARIES = libstdc++.la
 
 # Symbol versioning for shared libraries.
-if GLIBCPP_BUILD_VERSIONED_SHLIB
+if GLIBCXX_BUILD_VERSIONED_SHLIB
 version_arg = -Wl,--version-script=libstdc++-symbol.ver
-libstdc++-symbol.ver:  ${glibcpp_srcdir}/@SYMVER_MAP@
-	@LN_S@  ${glibcpp_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true
+libstdc++-symbol.ver:  ${glibcxx_srcdir}/@SYMVER_MAP@
+	@LN_S@  ${glibcxx_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true
 else
 version_arg =
 libstdc++-symbol.ver:
@@ -50,7 +50,7 @@ endif
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 
 # These bits are all figured out from configure. Look in acinclude.m4
-# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
+# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
 CONFIG_CXXFLAGS = \
 	@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
 
@@ -58,15 +58,15 @@ CONFIG_CXXFLAGS = \
 WARN_CXXFLAGS = \
 	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
 
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
 INCLUDES = \
 	-nostdinc++ \
-	$(GLIBCPP_INCLUDES) \
+	$(GLIBCXX_INCLUDES) \
 	$(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) \
 	$(TOPLEVEL_INCLUDES)
 
@@ -81,26 +81,26 @@ host_sources = \
 	numeric_members.cc \
 	time_members.cc
 
-codecvt_members.cc: ${glibcpp_srcdir}/@CCODECVT_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CCODECVT_CC@ . || true
+codecvt_members.cc: ${glibcxx_srcdir}/@CCODECVT_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CCODECVT_CC@ . || true
 
-collate_members.cc: ${glibcpp_srcdir}/@CCOLLATE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CCOLLATE_CC@ . || true
+collate_members.cc: ${glibcxx_srcdir}/@CCOLLATE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CCOLLATE_CC@ . || true
 
-ctype_members.cc: ${glibcpp_srcdir}/@CCTYPE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CCTYPE_CC@ . || true
+ctype_members.cc: ${glibcxx_srcdir}/@CCTYPE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CCTYPE_CC@ . || true
 
-messages_members.cc: ${glibcpp_srcdir}/@CMESSAGES_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CMESSAGES_CC@ . || true
+messages_members.cc: ${glibcxx_srcdir}/@CMESSAGES_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CMESSAGES_CC@ . || true
 
-monetary_members.cc: ${glibcpp_srcdir}/@CMONEY_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CMONEY_CC@ . || true
+monetary_members.cc: ${glibcxx_srcdir}/@CMONEY_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CMONEY_CC@ . || true
 
-numeric_members.cc: ${glibcpp_srcdir}/@CNUMERIC_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CNUMERIC_CC@ . || true
+numeric_members.cc: ${glibcxx_srcdir}/@CNUMERIC_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CNUMERIC_CC@ . || true
 
-time_members.cc: ${glibcpp_srcdir}/@CTIME_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CTIME_CC@ . || true
+time_members.cc: ${glibcxx_srcdir}/@CTIME_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CTIME_CC@ . || true
 
 # Source files linked in via configuration/make substitution for a
 # particular host, but with ad hoc naming rules.
@@ -108,11 +108,11 @@ host_sources_extra = \
 	basic_file.cc \
 	c++locale.cc 
 
-c++locale.cc: ${glibcpp_srcdir}/@CLOCALE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CLOCALE_CC@ ./$@ || true
+c++locale.cc: ${glibcxx_srcdir}/@CLOCALE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CLOCALE_CC@ ./$@ || true
 
-basic_file.cc: ${glibcpp_srcdir}/@BASIC_FILE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_CC@ ./$@ || true
+basic_file.cc: ${glibcxx_srcdir}/@BASIC_FILE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_CC@ ./$@ || true
 
 # Sources present in the src directory.
 sources = \
@@ -162,19 +162,19 @@ libstdc___la_LDFLAGS = \
 
 # Use special rules for the deprecated source files so that they find
 # deprecated include files.
-GLIBCPP_INCLUDE_DIR=@glibcpp_builddir@/include
+GLIBCXX_INCLUDE_DIR=@glibcxx_builddir@/include
 strstream.lo: strstream.cc
-	$(LTCXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated -c $<
+	$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
 strstream.o: strstream.cc
-	$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated -c $<
+	$(CXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
 
 # Use special rules for the concept-checking instantiations so that all
 # the generated template functions are also instantiated.  Force the checks
 # to be on so that the instantiations are actually seen.
 concept-inst.lo: concept-inst.cc
-	$(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+	$(LTCXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 concept-inst.o: concept-inst.cc
-	$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+	$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 
 # Use special rules for the demangler, so that an additional implicit
 # instantiation file is not necessary.
@@ -229,7 +229,7 @@ CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
 
 
 # Added bits to build debug library.
-if GLIBCPP_BUILD_DEBUG
+if GLIBCXX_BUILD_DEBUG
 all-local: build_debug
 install-data-local: install_debug
 else
@@ -246,7 +246,7 @@ stamp-debug:
 	  (cd ${debugdir}; \
 	  sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
 	      -e 's/srcdir = \.\./srcdir = ..\/../' \
-	      -e 's/glibcpp_basedir = \.\./glibcpp_basedir = ..\/../' \
+	      -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \
 	      -e 's/all-local: build_debug/all-local:/' \
 	      -e 's/install-data-local: install_debug/install-data-local:/' \
 	  < ../Makefile > Makefile) ; \
@@ -259,4 +259,4 @@ build_debug: stamp-debug
 # Install debug library here.
 install_debug: 
 	(cd ${debugdir} && $(MAKE) \
-	toolexeclibdir=@glibcpp_toolexeclibdir@/debug install)
+	toolexeclibdir=@glibcxx_toolexeclibdir@/debug install)
diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in
index 764da3fabb7..d86cc4b57a8 100644
--- a/libstdc++-v3/src/Makefile.in
+++ b/libstdc++-v3/src/Makefile.in
@@ -94,7 +94,7 @@ FPOS_H = @FPOS_H@
 FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
@@ -120,16 +120,16 @@ baseline_dir = @baseline_dir@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_thread_h = @glibcpp_thread_h@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_thread_h = @glibcxx_thread_h@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
@@ -141,21 +141,21 @@ MAINT_CHARSET = latin1
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 # Cross compiler support.
-CXX = @glibcpp_CXX@
-glibcpp_srcdir = @glibcpp_srcdir@
-glibcpp_builddir = @glibcpp_builddir@
-toolexecdir = @glibcpp_toolexecdir@
-toolexeclibdir = @glibcpp_toolexeclibdir@
+CXX = @glibcxx_CXX@
+glibcxx_srcdir = @glibcxx_srcdir@
+glibcxx_builddir = @glibcxx_builddir@
+toolexecdir = @glibcxx_toolexecdir@
+toolexeclibdir = @glibcxx_toolexeclibdir@
 toolexeclib_LTLIBRARIES = libstdc++.la
-@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver
-@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg = 
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver
+@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg = 
 
 # Compile flags that should be constant throughout the build, both for
 # SUBDIRS and for libstdc++-v3 in general.
 OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
 
 # These bits are all figured out from configure. Look in acinclude.m4
-# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
+# or configure.in to see how they are set. See GLIBCXX_EXPORT_FLAGS
 CONFIG_CXXFLAGS = \
 	@SECTION_FLAGS@ @EXTRA_CXX_FLAGS@
 
@@ -165,15 +165,15 @@ WARN_CXXFLAGS = \
 	@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
 
 
-# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+# Use common includes from acinclude.m4/GLIBCXX_EXPORT_INCLUDES
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 
 INCLUDES = \
 	-nostdinc++ \
-	$(GLIBCPP_INCLUDES) \
+	$(GLIBCXX_INCLUDES) \
 	$(LIBSUPCXX_INCLUDES) $(LIBMATH_INCLUDES) \
 	$(TOPLEVEL_INCLUDES)
 
@@ -247,7 +247,7 @@ libstdc___la_LDFLAGS = \
 
 # Use special rules for the deprecated source files so that they find
 # deprecated include files.
-GLIBCPP_INCLUDE_DIR = @glibcpp_builddir@/include
+GLIBCXX_INCLUDE_DIR = @glibcxx_builddir@/include
 
 # AM_CXXFLAGS needs to be in each subdirectory so that it can be
 # modified in a per-library or per-sub-library way.  Need to manually
@@ -539,48 +539,48 @@ all-local all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
-@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver:  ${glibcpp_srcdir}/@SYMVER_MAP@
-@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@	@LN_S@  ${glibcpp_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true
-@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver:
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver:  ${glibcxx_srcdir}/@SYMVER_MAP@
+@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@	@LN_S@  ${glibcxx_srcdir}/@SYMVER_MAP@ ./libstdc++-symbol.ver || true
+@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@libstdc++-symbol.ver:
 
-codecvt_members.cc: ${glibcpp_srcdir}/@CCODECVT_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CCODECVT_CC@ . || true
+codecvt_members.cc: ${glibcxx_srcdir}/@CCODECVT_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CCODECVT_CC@ . || true
 
-collate_members.cc: ${glibcpp_srcdir}/@CCOLLATE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CCOLLATE_CC@ . || true
+collate_members.cc: ${glibcxx_srcdir}/@CCOLLATE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CCOLLATE_CC@ . || true
 
-ctype_members.cc: ${glibcpp_srcdir}/@CCTYPE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CCTYPE_CC@ . || true
+ctype_members.cc: ${glibcxx_srcdir}/@CCTYPE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CCTYPE_CC@ . || true
 
-messages_members.cc: ${glibcpp_srcdir}/@CMESSAGES_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CMESSAGES_CC@ . || true
+messages_members.cc: ${glibcxx_srcdir}/@CMESSAGES_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CMESSAGES_CC@ . || true
 
-monetary_members.cc: ${glibcpp_srcdir}/@CMONEY_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CMONEY_CC@ . || true
+monetary_members.cc: ${glibcxx_srcdir}/@CMONEY_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CMONEY_CC@ . || true
 
-numeric_members.cc: ${glibcpp_srcdir}/@CNUMERIC_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CNUMERIC_CC@ . || true
+numeric_members.cc: ${glibcxx_srcdir}/@CNUMERIC_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CNUMERIC_CC@ . || true
 
-time_members.cc: ${glibcpp_srcdir}/@CTIME_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CTIME_CC@ . || true
+time_members.cc: ${glibcxx_srcdir}/@CTIME_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CTIME_CC@ . || true
 
-c++locale.cc: ${glibcpp_srcdir}/@CLOCALE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@CLOCALE_CC@ ./$@ || true
+c++locale.cc: ${glibcxx_srcdir}/@CLOCALE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@CLOCALE_CC@ ./$@ || true
 
-basic_file.cc: ${glibcpp_srcdir}/@BASIC_FILE_CC@
-	@LN_S@ ${glibcpp_srcdir}/@BASIC_FILE_CC@ ./$@ || true
+basic_file.cc: ${glibcxx_srcdir}/@BASIC_FILE_CC@
+	@LN_S@ ${glibcxx_srcdir}/@BASIC_FILE_CC@ ./$@ || true
 strstream.lo: strstream.cc
-	$(LTCXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated -c $<
+	$(LTCXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
 strstream.o: strstream.cc
-	$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated -c $<
+	$(CXXCOMPILE) -I$(GLIBCXX_INCLUDE_DIR)/backward -Wno-deprecated -c $<
 
 # Use special rules for the concept-checking instantiations so that all
 # the generated template functions are also instantiated.  Force the checks
 # to be on so that the instantiations are actually seen.
 concept-inst.lo: concept-inst.cc
-	$(LTCXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+	$(LTCXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 concept-inst.o: concept-inst.cc
-	$(CXXCOMPILE) -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates -c $<
+	$(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $<
 
 # Use special rules for the demangler, so that an additional implicit
 # instantiation file is not necessary.
@@ -590,10 +590,10 @@ demangle.o: demangle.cc
 	$(CXXCOMPILE) -fimplicit-templates -c $<
 
 # Added bits to build debug library.
-@GLIBCPP_BUILD_DEBUG_TRUE@all-local: build_debug
-@GLIBCPP_BUILD_DEBUG_TRUE@install-data-local: install_debug
-@GLIBCPP_BUILD_DEBUG_FALSE@all-local:
-@GLIBCPP_BUILD_DEBUG_FALSE@install-data-local: 
+@GLIBCXX_BUILD_DEBUG_TRUE@all-local: build_debug
+@GLIBCXX_BUILD_DEBUG_TRUE@install-data-local: install_debug
+@GLIBCXX_BUILD_DEBUG_FALSE@all-local:
+@GLIBCXX_BUILD_DEBUG_FALSE@install-data-local: 
 
 # Build parallel set of debug objects here.
 stamp-debug: 
@@ -602,7 +602,7 @@ stamp-debug:
 	  (cd ${debugdir}; \
 	  sed -e 's/top_builddir = \.\./top_builddir = ..\/../' \
 	      -e 's/srcdir = \.\./srcdir = ..\/../' \
-	      -e 's/glibcpp_basedir = \.\./glibcpp_basedir = ..\/../' \
+	      -e 's/glibcxx_basedir = \.\./glibcxx_basedir = ..\/../' \
 	      -e 's/all-local: build_debug/all-local:/' \
 	      -e 's/install-data-local: install_debug/install-data-local:/' \
 	  < ../Makefile > Makefile) ; \
@@ -615,7 +615,7 @@ build_debug: stamp-debug
 # Install debug library here.
 install_debug: 
 	(cd ${debugdir} && $(MAKE) \
-	toolexeclibdir=@glibcpp_toolexeclibdir@/debug install)
+	toolexeclibdir=@glibcxx_toolexeclibdir@/debug install)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libstdc++-v3/src/codecvt.cc b/libstdc++-v3/src/codecvt.cc
index a44256d5f7a..08aa8b48032 100644
--- a/libstdc++-v3/src/codecvt.cc
+++ b/libstdc++-v3/src/codecvt.cc
@@ -34,11 +34,11 @@ namespace std
   // Definitions for locale::id of standard facets that are specialized.
  locale::id codecvt<char, char, mbstate_t>::id;
 
-#ifdef _GLIBCPP_USE_WCHAR_T  
+#ifdef _GLIBCXX_USE_WCHAR_T  
   locale::id codecvt<wchar_t, char, mbstate_t>::id;
 #endif
 
-#ifdef _GLIBCPP_USE___ENC_TRAITS
+#ifdef _GLIBCXX_USE___ENC_TRAITS
   // Definitions for static const data members of __enc_traits.
   const int __enc_traits::_S_max_size;
 #endif 
@@ -64,7 +64,7 @@ namespace std
 	 extern_type* __to, extern_type*, 
 	 extern_type*& __to_next) const
   { 
-    // _GLIBCPP_RESOLVE_LIB_DEFECTS
+    // _GLIBCXX_RESOLVE_LIB_DEFECTS
     // According to the resolution of DR19, "If returns noconv [...]
     // there are no changes to the values in [to, to_limit)."
     __from_next = __from; 
@@ -88,7 +88,7 @@ namespace std
 	intern_type* __to, intern_type*, 
 	intern_type*& __to_next) const
   {
-    // _GLIBCPP_RESOLVE_LIB_DEFECTS
+    // _GLIBCXX_RESOLVE_LIB_DEFECTS
     // According to the resolution of DR19, "If returns noconv [...]
     // there are no changes to the values in [to, to_limit)."
     __from_next = __from; 
@@ -117,7 +117,7 @@ namespace std
   do_max_length() const throw() 
   { return 1; }
   
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   // codecvt<wchar_t, char, mbstate_t> required specialization
   codecvt<wchar_t, char, mbstate_t>::
   codecvt(size_t __refs)
@@ -147,5 +147,5 @@ namespace std
   codecvt<wchar_t, char, mbstate_t>::
   do_always_noconv() const throw()
   { return false; }
-#endif //  _GLIBCPP_USE_WCHAR_T
+#endif //  _GLIBCXX_USE_WCHAR_T
 } // namespace std
diff --git a/libstdc++-v3/src/complex_io.cc b/libstdc++-v3/src/complex_io.cc
index a6d502f2dad..6d2ca56fad9 100644
--- a/libstdc++-v3/src/complex_io.cc
+++ b/libstdc++-v3/src/complex_io.cc
@@ -59,7 +59,7 @@ namespace std
     operator<<(basic_ostream<char, char_traits<char> >&,
                const complex<long double>&);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     basic_istream<wchar_t, char_traits<wchar_t> >&
     operator>>(basic_istream<wchar_t, char_traits<wchar_t> >&,
@@ -89,5 +89,5 @@ namespace std
     basic_ostream<wchar_t, char_traits<wchar_t> >&
     operator<<(basic_ostream<wchar_t, char_traits<wchar_t> >&,
                const complex<long double>&);
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 } // namespace std
diff --git a/libstdc++-v3/src/concept-inst.cc b/libstdc++-v3/src/concept-inst.cc
index e173549105d..c8a3dd41b27 100644
--- a/libstdc++-v3/src/concept-inst.cc
+++ b/libstdc++-v3/src/concept-inst.cc
@@ -36,7 +36,7 @@
 
 #include <bits/concept_check.h>
 
-#ifdef _GLIBCPP_CONCEPT_CHECKS
+#ifdef _GLIBCXX_CONCEPT_CHECKS
 
 #include <memory>
 #include <iterator>
@@ -54,7 +54,7 @@ namespace __gnu_cxx
 
   _Instantiate(_InputIteratorConcept<char const*> );
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   _Instantiate(_InputIteratorConcept<wchar_t*> );
 
   _Instantiate(_InputIteratorConcept<wchar_t const*> );
@@ -75,7 +75,7 @@ namespace __gnu_cxx
   _Instantiate(_OutputIteratorConcept<std::ostreambuf_iterator<
     char, std::char_traits<char> >, char> );
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   _Instantiate(_OutputIteratorConcept<std::ostreambuf_iterator<
     wchar_t, std::char_traits<wchar_t> >, wchar_t> );
 #endif
@@ -90,7 +90,7 @@ namespace __gnu_cxx
   _Instantiate(_RandomAccessIteratorConcept<
     __normal_iterator<char*, std::string> > );
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   _Instantiate(_RandomAccessIteratorConcept<
     __normal_iterator<wchar_t const*,
     std::basic_string<wchar_t, std::char_traits<wchar_t>,
diff --git a/libstdc++-v3/src/ctype.cc b/libstdc++-v3/src/ctype.cc
index 3d5ee618c53..5ddbd4137a8 100644
--- a/libstdc++-v3/src/ctype.cc
+++ b/libstdc++-v3/src/ctype.cc
@@ -38,7 +38,7 @@ namespace std
   // Definitions for locale::id of standard facets that are specialized.
   locale::id ctype<char>::id;
 
-#ifdef _GLIBCPP_USE_WCHAR_T  
+#ifdef _GLIBCXX_USE_WCHAR_T  
   locale::id ctype<wchar_t>::id;
 #endif
 
@@ -51,7 +51,7 @@ namespace std
       return static_cast<const ctype<char>&>(*(__tmp->_M_facets[__i]));
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     const ctype<wchar_t>&
     use_facet<ctype<wchar_t> >(const locale& __loc)
@@ -124,7 +124,7 @@ namespace std
     return __hi;
   }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   ctype<wchar_t>::ctype(size_t __refs) 
   : __ctype_abstract_base<wchar_t>(__refs)
   { _M_c_locale_ctype = _S_c_locale; }
diff --git a/libstdc++-v3/src/ext-inst.cc b/libstdc++-v3/src/ext-inst.cc
index 4896b110d42..f28d9124d56 100644
--- a/libstdc++-v3/src/ext-inst.cc
+++ b/libstdc++-v3/src/ext-inst.cc
@@ -47,7 +47,7 @@ namespace __gnu_cxx
 
   template class stdio_filebuf<char>;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     const unsigned long
     rope<wchar_t, std::allocator<wchar_t> >::_S_min_len;
diff --git a/libstdc++-v3/src/fstream-inst.cc b/libstdc++-v3/src/fstream-inst.cc
index 8b866c0c927..4d9eae5460b 100644
--- a/libstdc++-v3/src/fstream-inst.cc
+++ b/libstdc++-v3/src/fstream-inst.cc
@@ -38,25 +38,25 @@ namespace std
 {
   // filebuf
   template class basic_filebuf<char, char_traits<char> >;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_filebuf<wchar_t, char_traits<wchar_t> >;
 #endif
 
   // ifstream
   template class basic_ifstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_ifstream<wchar_t>;
 #endif
 
   // ofstream
   template class basic_ofstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_ofstream<wchar_t>;
 #endif
 
   // fstream
   template class basic_fstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_fstream<wchar_t>;
 #endif
 } // namespace std
diff --git a/libstdc++-v3/src/functexcept.cc b/libstdc++-v3/src/functexcept.cc
index f9fc13c94e6..fb158a61242 100644
--- a/libstdc++-v3/src/functexcept.cc
+++ b/libstdc++-v3/src/functexcept.cc
@@ -32,7 +32,7 @@
 #include <new>
 #include <typeinfo>
 #include <ios>
-#ifdef _GLIBCPP_USE_NLS
+#ifdef _GLIBCXX_USE_NLS
 # include <libintl.h>
 # define _(msgid)   gettext (msgid)
 #else
diff --git a/libstdc++-v3/src/globals.cc b/libstdc++-v3/src/globals.cc
index 6793a9b5da1..5cfa621086e 100644
--- a/libstdc++-v3/src/globals.cc
+++ b/libstdc++-v3/src/globals.cc
@@ -46,9 +46,9 @@
 // __gnu_cxx symbols into exported, namespace std symbols with the
 // appropriate symbol version name.
 // The rename syntax is 
-//   asm (".symver currentname,oldname@@GLIBCPP_3.2")
+//   asm (".symver currentname,oldname@@GLIBCXX_3.2")
 // In macro form:
-// _GLIBCPP_ASM_SYMVER(currentname, oldname, GLIBCPP_3.2)
+// _GLIBCXX_ASM_SYMVER(currentname, oldname, GLIBCXX_3.2)
 
 namespace std
 {
@@ -63,7 +63,7 @@ namespace std
   fake_ostream cerr;
   fake_ostream clog;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   typedef char fake_wistream[sizeof(wistream)] 
   __attribute__ ((aligned(__alignof__(wistream))));
   typedef char fake_wostream[sizeof(wostream)] 
@@ -93,7 +93,7 @@ namespace __gnu_cxx
   fake_filebuf buf_cin;
   fake_filebuf buf_cerr;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   typedef char fake_wstdiobuf[sizeof(stdio_sync_filebuf<wchar_t>)]
   __attribute__ ((aligned(__alignof__(stdio_sync_filebuf<wchar_t>))));
   fake_wstdiobuf buf_wcout_sync;
@@ -117,19 +117,19 @@ namespace __gnu_cxx
 
   typedef char fake_name_vec[sizeof(char*)]
   __attribute__ ((aligned(__alignof__(char*))));
-  fake_name_vec name_vec[6 + _GLIBCPP_NUM_CATEGORIES];
+  fake_name_vec name_vec[6 + _GLIBCXX_NUM_CATEGORIES];
 
   typedef char fake_names[sizeof(char[2])]
   __attribute__ ((aligned(__alignof__(char[2]))));
-  fake_names name_c[6 + _GLIBCPP_NUM_CATEGORIES];
+  fake_names name_c[6 + _GLIBCXX_NUM_CATEGORIES];
 
   typedef char fake_facet_vec[sizeof(locale::facet*)]
   __attribute__ ((aligned(__alignof__(locale::facet*))));
-  fake_facet_vec facet_vec[_GLIBCPP_NUM_FACETS];
+  fake_facet_vec facet_vec[_GLIBCXX_NUM_FACETS];
 
   typedef char fake_cache_vec[sizeof(locale::facet*)]
   __attribute__ ((aligned(__alignof__(locale::facet*))));
-  fake_cache_vec cache_vec[_GLIBCPP_NUM_FACETS];
+  fake_cache_vec cache_vec[_GLIBCXX_NUM_FACETS];
 
   typedef char fake_ctype_c[sizeof(std::ctype<char>)]
   __attribute__ ((aligned(__alignof__(std::ctype<char>))));
@@ -184,7 +184,7 @@ namespace __gnu_cxx
   __attribute__ ((aligned(__alignof__(messages<char>))));
   fake_messages_c messages_c;
 
-#ifdef  _GLIBCPP_USE_WCHAR_T
+#ifdef  _GLIBCXX_USE_WCHAR_T
   typedef char fake_wtype_w[sizeof(std::ctype<wchar_t>)]
   __attribute__ ((aligned(__alignof__(std::ctype<wchar_t>))));
   fake_wtype_w ctype_w;
@@ -244,7 +244,7 @@ namespace __gnu_cxx
   __attribute__ ((aligned(__alignof__(std::__numpunct_cache<char>))));
   fake_locale_cache_c numpunct_cache_c;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   typedef char fake_locale_cache_w[sizeof(std::__numpunct_cache<wchar_t>)]
   __attribute__ ((aligned(__alignof__(std::__numpunct_cache<wchar_t>))));
   fake_locale_cache_w numpunct_cache_w;
@@ -255,18 +255,18 @@ namespace __gnu_cxx
   // function call to initialize a mutex.  For example, see stl_threads.h.
 #ifdef __GTHREAD_MUTEX_INIT
 #elif defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-  __gthread_once_t _GLIBCPP_once = __GTHREAD_ONCE_INIT;
-  __gthread_mutex_t _GLIBCPP_mutex;
-  __gthread_mutex_t *_GLIBCPP_mutex_address;
+  __gthread_once_t _GLIBCXX_once = __GTHREAD_ONCE_INIT;
+  __gthread_mutex_t _GLIBCXX_mutex;
+  __gthread_mutex_t *_GLIBCXX_mutex_address;
   
-  // Once-only initializer function for _GLIBCPP_mutex.  
+  // Once-only initializer function for _GLIBCXX_mutex.  
   void
-  _GLIBCPP_mutex_init ()
-  { __GTHREAD_MUTEX_INIT_FUNCTION (&_GLIBCPP_mutex); }
+  _GLIBCXX_mutex_init ()
+  { __GTHREAD_MUTEX_INIT_FUNCTION (&_GLIBCXX_mutex); }
 
-  // Once-only initializer function for _GLIBCPP_mutex_address.  
+  // Once-only initializer function for _GLIBCXX_mutex_address.  
   void
-  _GLIBCPP_mutex_address_init ()
-  { __GTHREAD_MUTEX_INIT_FUNCTION (_GLIBCPP_mutex_address); }
+  _GLIBCXX_mutex_address_init ()
+  { __GTHREAD_MUTEX_INIT_FUNCTION (_GLIBCXX_mutex_address); }
 #endif
 } // namespace __gnu_cxx
diff --git a/libstdc++-v3/src/io-inst.cc b/libstdc++-v3/src/io-inst.cc
index 31f53b4e395..2b0e29c3e2f 100644
--- a/libstdc++-v3/src/io-inst.cc
+++ b/libstdc++-v3/src/io-inst.cc
@@ -40,21 +40,21 @@ namespace std
 {
   // basic_ios
   template class basic_ios<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_ios<wchar_t>;
 #endif
 
   // iomanip
   template class _Setfill<char>;
   template _Setfill<char> setfill(char);
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class _Setfill<wchar_t>;
   template _Setfill<wchar_t> setfill(wchar_t);
 #endif
 
   // iostream
   template class basic_iostream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_iostream<wchar_t>; 
 #endif
 } // namespace std
diff --git a/libstdc++-v3/src/ios.cc b/libstdc++-v3/src/ios.cc
index ee969b5d9c7..daecdd48236 100644
--- a/libstdc++-v3/src/ios.cc
+++ b/libstdc++-v3/src/ios.cc
@@ -51,7 +51,7 @@ namespace __gnu_cxx
   extern stdio_filebuf<char> buf_cin;
   extern stdio_filebuf<char> buf_cerr;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern stdio_sync_filebuf<wchar_t> buf_wcout_sync;
   extern stdio_sync_filebuf<wchar_t> buf_wcin_sync;
   extern stdio_sync_filebuf<wchar_t> buf_wcerr_sync;
@@ -71,7 +71,7 @@ namespace std
   extern ostream cerr;
   extern ostream clog;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   extern wistream wcin;
   extern wostream wcout;
   extern wostream wcerr;
@@ -182,7 +182,7 @@ namespace std
 	cin.tie(&cout);
 	cerr.flags(ios_base::unitbuf);
 	
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 	new (&buf_wcout_sync) stdio_sync_filebuf<wchar_t>(stdout);
 	new (&buf_wcin_sync) stdio_sync_filebuf<wchar_t>(stdin);
 	new (&buf_wcerr_sync) stdio_sync_filebuf<wchar_t>(stderr);
@@ -212,7 +212,7 @@ namespace std
 	    cerr.flush();
 	    clog.flush();
     
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 	    wcout.flush();
 	    wcerr.flush();
 	    wclog.flush();    
@@ -351,7 +351,7 @@ namespace std
   bool 
   ios_base::sync_with_stdio(bool __sync)
   { 
-#ifdef _GLIBCPP_RESOLVE_LIB_DEFECTS
+#ifdef _GLIBCXX_RESOLVE_LIB_DEFECTS
     // 49.  Underspecification of ios_base::sync_with_stdio
     bool __ret = ios_base::Init::_S_synced_with_stdio;
 #endif
@@ -369,7 +369,7 @@ namespace std
 	buf_cin_sync.~stdio_sync_filebuf<char>();
 	buf_cerr_sync.~stdio_sync_filebuf<char>();
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 	buf_wcout_sync.~stdio_sync_filebuf<wchar_t>();
 	buf_wcin_sync.~stdio_sync_filebuf<wchar_t>();
 	buf_wcerr_sync.~stdio_sync_filebuf<wchar_t>();
@@ -386,7 +386,7 @@ namespace std
 	cerr.rdbuf(&buf_cerr);
 	clog.rdbuf(&buf_cerr);
     
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 	new (&buf_wcout) stdio_filebuf<wchar_t>(stdout, ios_base::out);
 	new (&buf_wcin) stdio_filebuf<wchar_t>(stdin, ios_base::in);
 	new (&buf_wcerr) stdio_filebuf<wchar_t>(stderr, ios_base::out);
diff --git a/libstdc++-v3/src/istream-inst.cc b/libstdc++-v3/src/istream-inst.cc
index f2c72fde198..6b454eed83b 100644
--- a/libstdc++-v3/src/istream-inst.cc
+++ b/libstdc++-v3/src/istream-inst.cc
@@ -54,7 +54,7 @@ namespace std
   template istream& operator>>(istream&, _Setprecision);
   template istream& operator>>(istream&, _Setw);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_istream<wchar_t>;
   template wistream& ws(wistream&);
   template wistream& operator>>(wistream&, wchar_t&);
diff --git a/libstdc++-v3/src/limits.cc b/libstdc++-v3/src/limits.cc
index 294673ea186..700009cb463 100644
--- a/libstdc++-v3/src/limits.cc
+++ b/libstdc++-v3/src/limits.cc
@@ -159,7 +159,7 @@ namespace std
 
   // wchar_t
   // This used to be problematic...
-#ifdef _GLIBCPP_USE_WCHAR_T  
+#ifdef _GLIBCXX_USE_WCHAR_T  
   const bool numeric_limits<wchar_t>::is_specialized;
   const int  numeric_limits<wchar_t>::digits;
   const int  numeric_limits<wchar_t>::digits10;
@@ -182,7 +182,7 @@ namespace std
   const bool numeric_limits<wchar_t>::traps;
   const bool numeric_limits<wchar_t>::tinyness_before;
   const float_round_style numeric_limits<wchar_t>::round_style;
-#endif // _GLIBCPP_USE_WCHAR_T
+#endif // _GLIBCXX_USE_WCHAR_T
 
   // short
   const bool numeric_limits<short>::is_specialized;
diff --git a/libstdc++-v3/src/locale-inst.cc b/libstdc++-v3/src/locale-inst.cc
index 0936102a916..deeb35eeb98 100644
--- a/libstdc++-v3/src/locale-inst.cc
+++ b/libstdc++-v3/src/locale-inst.cc
@@ -46,7 +46,7 @@ namespace std
   template class money_get<char, istreambuf_iterator<char> >;
   template class money_put<char, ostreambuf_iterator<char> >;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class moneypunct<wchar_t, false>;
   template class moneypunct<wchar_t, true>;
   template class moneypunct_byname<wchar_t, false>;
@@ -73,7 +73,7 @@ namespace std
     _M_convert_int(ostreambuf_iterator<char>, ios_base&, char, 
 		   unsigned long) const;
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template
     ostreambuf_iterator<char>
     num_put<char, ostreambuf_iterator<char> >::
@@ -99,7 +99,7 @@ namespace std
     _M_convert_float(ostreambuf_iterator<char>, ios_base&, char, char, 
 		     long double) const;
   
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class numpunct<wchar_t>;
   template struct __numpunct_cache<wchar_t>;
   template class numpunct_byname<wchar_t>;
@@ -118,7 +118,7 @@ namespace std
     _M_convert_int(ostreambuf_iterator<wchar_t>, ios_base&, wchar_t, 
 		   unsigned long) const;
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template
     ostreambuf_iterator<wchar_t>
     num_put<wchar_t, ostreambuf_iterator<wchar_t> >::
@@ -152,7 +152,7 @@ namespace std
   template class time_get<char, istreambuf_iterator<char> >;
   template class time_get_byname<char, istreambuf_iterator<char> >;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class __timepunct<wchar_t>;
   template class time_put<wchar_t, ostreambuf_iterator<wchar_t> >;
   template class time_put_byname<wchar_t, ostreambuf_iterator<wchar_t> >;
@@ -163,7 +163,7 @@ namespace std
   // messages
   template class messages<char>;
   template class messages_byname<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class messages<wchar_t>;
   template class messages_byname<wchar_t>;
 #endif
@@ -171,7 +171,7 @@ namespace std
   // ctype
   inline template class __ctype_abstract_base<char>;
   template class ctype_byname<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   inline template class __ctype_abstract_base<wchar_t>;
   template class ctype_byname<wchar_t>;
 #endif
@@ -179,7 +179,7 @@ namespace std
   // codecvt
   inline template class __codecvt_abstract_base<char, char, mbstate_t>;
   template class codecvt_byname<char, char, mbstate_t>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   inline template class __codecvt_abstract_base<wchar_t, char, mbstate_t>;
   template class codecvt_byname<wchar_t, char, mbstate_t>;
 #endif
@@ -187,7 +187,7 @@ namespace std
   // collate
   template class collate<char>;
   template class collate_byname<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class collate<wchar_t>;
   template class collate_byname<wchar_t>;
 #endif
@@ -246,7 +246,7 @@ namespace std
     const messages<char>& 
     use_facet<messages<char> >(const locale&);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     const codecvt<wchar_t, char, mbstate_t>& 
     use_facet<codecvt<wchar_t, char, mbstate_t> >(locale const&);
@@ -353,7 +353,7 @@ namespace std
     bool
     has_facet<messages<char> >(const locale&);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
  template 
     bool
     has_facet<ctype<wchar_t> >(const locale&);
@@ -419,7 +419,7 @@ namespace std
 
   template class __pad<char, char_traits<char> >;
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     wchar_t*
     __add_grouping<wchar_t>(wchar_t*, wchar_t, char const*, char const*, 
@@ -452,7 +452,7 @@ namespace std
     __convert_from_v(char*, const int, const char*, unsigned long, 
 		     const __c_locale&, int);
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template
     int
     __convert_from_v(char*, const int, const char*, long long, 
@@ -469,20 +469,20 @@ namespace std
     __int_to_char(char*, const int, unsigned long, const char*, 
 		  ios_base::fmtflags, bool);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     int
     __int_to_char(wchar_t*, const int, unsigned long, const wchar_t*, 
 		  ios_base::fmtflags, bool);
 #endif
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   template
     int
     __int_to_char(char*, const int, unsigned long long, const char*, 
 		  ios_base::fmtflags, bool);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     int
     __int_to_char(wchar_t*, const int, unsigned long long, const wchar_t*,
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index 7788a58419d..e10abee991c 100644
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -55,7 +55,7 @@ namespace std
   const locale::category 	locale::all;
 
   // In the future, GLIBCXX_ABI > 5 should remove all uses of
-  // _GLIBCPP_ASM_SYMVER in this file, and remove exports of any
+  // _GLIBCXX_ASM_SYMVER in this file, and remove exports of any
   // static data members of locale.
 
   // These are no longer exported.
@@ -72,7 +72,7 @@ namespace std
   {
     &std::ctype<char>::id, 
     &codecvt<char, char, mbstate_t>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
     &std::ctype<wchar_t>::id,
     &codecvt<wchar_t, char, mbstate_t>::id,
 #endif
@@ -85,7 +85,7 @@ namespace std
     &num_get<char>::id,  
     &num_put<char>::id,  
     &numpunct<char>::id, 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
     &num_get<wchar_t>::id,
     &num_put<wchar_t>::id,
     &numpunct<wchar_t>::id,
@@ -97,7 +97,7 @@ namespace std
   locale::_Impl::_S_id_collate[] =
   {
     &std::collate<char>::id,
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
     &std::collate<wchar_t>::id,
 #endif
     0
@@ -109,7 +109,7 @@ namespace std
     &__timepunct<char>::id, 
     &time_get<char>::id, 
     &time_put<char>::id, 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
     &__timepunct<wchar_t>::id, 
     &time_get<wchar_t>::id,
     &time_put<wchar_t>::id,
@@ -124,7 +124,7 @@ namespace std
     &money_put<char>::id,        
     &moneypunct<char, false>::id, 
     &moneypunct<char, true >::id, 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
     &money_get<wchar_t>::id,
     &money_put<wchar_t>::id,
     &moneypunct<wchar_t, false>::id,
@@ -137,7 +137,7 @@ namespace std
   locale::_Impl::_S_id_messages[] =
   {
     &std::messages<char>::id, 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
     &std::messages<wchar_t>::id,
 #endif
     0
@@ -425,7 +425,7 @@ namespace std
 	  case LC_TIME:     
 	    __ret = time; 
 	    break;
-#ifdef _GLIBCPP_HAVE_LC_MESSAGES
+#ifdef _GLIBCXX_HAVE_LC_MESSAGES
 	  case LC_MESSAGES: 
 	    __ret = messages;
 	    break;
@@ -464,7 +464,7 @@ namespace std
       return static_cast<const __numpunct_cache<char>&>(*__caches[__i]);
     }
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<>
     const __numpunct_cache<wchar_t>&
     __use_cache(const locale& __loc)
@@ -490,7 +490,7 @@ namespace std
       "IST", "EET", "CST", "JST"  
     };
  
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template<> 
     const wchar_t*
     __timepunct<wchar_t>::_S_timezones[14] =
@@ -507,7 +507,7 @@ namespace std
   const char* __num_base::_S_atoms_in = "0123456789eEabcdfABCDF";
   const char* __num_base::_S_atoms_out ="-+xX0123456789abcdef0123456789ABCDEF";
 
-  // _GLIBCPP_RESOLVE_LIB_DEFECTS
+  // _GLIBCXX_RESOLVE_LIB_DEFECTS
   // According to the resolution of DR 231, about 22.2.2.2.2, p11,
   // "str.precision() is specified in the conversion specification".
   void
diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc
index 424bc64fec7..3f4d18d1af9 100644
--- a/libstdc++-v3/src/localename.cc
+++ b/libstdc++-v3/src/localename.cc
@@ -35,9 +35,9 @@ namespace __gnu_cxx
   using namespace std;
 
   // Defined in globals.cc.
-  extern locale::facet* facet_vec[_GLIBCPP_NUM_FACETS];
-  extern char* name_vec[6 + _GLIBCPP_NUM_CATEGORIES];
-  extern char name_c[6 + _GLIBCPP_NUM_CATEGORIES][2];
+  extern locale::facet* facet_vec[_GLIBCXX_NUM_FACETS];
+  extern char* name_vec[6 + _GLIBCXX_NUM_CATEGORIES];
+  extern char name_c[6 + _GLIBCXX_NUM_CATEGORIES][2];
 
   extern std::ctype<char>			ctype_c;
   extern std::collate<char> 			collate_c;
@@ -53,7 +53,7 @@ namespace __gnu_cxx
   extern time_get<char> 			time_get_c;
   extern time_put<char> 			time_put_c;
   extern std::messages<char> 			messages_c;
-#ifdef  _GLIBCPP_USE_WCHAR_T
+#ifdef  _GLIBCXX_USE_WCHAR_T
   extern std::ctype<wchar_t>			ctype_w;
   extern std::collate<wchar_t> 			collate_w;
   extern numpunct<wchar_t> 			numpunct_w;
@@ -70,9 +70,9 @@ namespace __gnu_cxx
   extern std::messages<wchar_t> 		messages_w;
 #endif
 
-  extern locale::facet* cache_vec[_GLIBCPP_NUM_FACETS];
+  extern locale::facet* cache_vec[_GLIBCXX_NUM_FACETS];
   extern std::__numpunct_cache<char>		numpunct_cache_c;
-#ifdef  _GLIBCPP_USE_WCHAR_T
+#ifdef  _GLIBCXX_USE_WCHAR_T
   extern std::__numpunct_cache<wchar_t>		numpunct_cache_w;
 #endif
 } // namespace __gnu_cxx
@@ -158,7 +158,7 @@ namespace std
   // Construct named _Impl.
   locale::_Impl::
   _Impl(const char* __s, size_t __refs) 
-  : _M_references(__refs), _M_facets_size(_GLIBCPP_NUM_FACETS)
+  : _M_references(__refs), _M_facets_size(_GLIBCXX_NUM_FACETS)
   {
     // Initialize the underlying locale model, which also checks to
     // see if the given name is valid.
@@ -240,7 +240,7 @@ namespace std
     _M_init_facet(new time_put<char>);
     _M_init_facet(new std::messages<char>(__cloc, __s));
 	
-#ifdef  _GLIBCPP_USE_WCHAR_T
+#ifdef  _GLIBCXX_USE_WCHAR_T
     _M_init_facet(new std::ctype<wchar_t>(__cloc));
     _M_init_facet(new codecvt<wchar_t, char, mbstate_t>(__cloc));
     _M_init_facet(new numpunct<wchar_t>(__cloc));
@@ -262,7 +262,7 @@ namespace std
   // Construct "C" _Impl.
   locale::_Impl::
   _Impl(facet**, size_t __refs, bool) 
-  : _M_references(__refs), _M_facets_size(_GLIBCPP_NUM_FACETS)
+  : _M_references(__refs), _M_facets_size(_GLIBCXX_NUM_FACETS)
   {
     // Initialize the underlying locale model.
     locale::facet::_S_c_name[0] = 'C';
@@ -313,7 +313,7 @@ namespace std
     _M_init_facet(new (&time_put_c) time_put<char>(1));
     _M_init_facet(new (&messages_c) std::messages<char>(1));	
 
-#ifdef  _GLIBCPP_USE_WCHAR_T
+#ifdef  _GLIBCXX_USE_WCHAR_T
     _M_init_facet(new (&ctype_w) std::ctype<wchar_t>(1));
     _M_init_facet(new (&codecvt_w) codecvt<wchar_t, char, mbstate_t>(1));
 
@@ -337,7 +337,7 @@ namespace std
     // This locale is safe to pre-cache, after all the facets have
     // been installed.
     _M_caches[numpunct<char>::id._M_id()] = __npc;
-#ifdef  _GLIBCPP_USE_WCHAR_T
+#ifdef  _GLIBCXX_USE_WCHAR_T
     _M_caches[numpunct<wchar_t>::id._M_id()] = __npw;
 #endif
   }
diff --git a/libstdc++-v3/src/misc-inst.cc b/libstdc++-v3/src/misc-inst.cc
index ab597975900..e08ad9f88db 100644
--- a/libstdc++-v3/src/misc-inst.cc
+++ b/libstdc++-v3/src/misc-inst.cc
@@ -55,7 +55,7 @@ namespace std
   template 
     basic_istream<char>& 
     getline(basic_istream<char>&, string&);
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template 
     basic_istream<wchar_t>& 
     operator>>(basic_istream<wchar_t>&, wstring&);
@@ -69,7 +69,7 @@ namespace std
     basic_istream<wchar_t>& 
     getline(basic_istream<wchar_t>&, wstring&);
 #endif
-#ifdef _GLIBCPP_INST_ATOMICITY_LOCK
+#ifdef _GLIBCXX_INST_ATOMICITY_LOCK
   template volatile int __Atomicity_lock<0>::_S_atomicity_lock;
 #endif
 } // namespace std
@@ -77,7 +77,7 @@ namespace std
 
 namespace __gnu_cxx
 {
-#ifdef _GLIBCPP_NEED_GENERIC_MUTEX
+#ifdef _GLIBCXX_NEED_GENERIC_MUTEX
 #ifdef __GTHREAD_MUTEX_INIT
   __gthread_mutex_t _Atomic_add_mutex = __GTHREAD_MUTEX_INIT;
 #else
@@ -89,10 +89,10 @@ namespace __gnu_cxx
     __GTHREAD_MUTEX_INIT_FUNCTION (&_Atomic_add_mutex);
   }
 #endif
-#endif // _GLIBCPP_NEED_GLOBAL_MUTEX
+#endif // _GLIBCXX_NEED_GLOBAL_MUTEX
 
   template class stdio_sync_filebuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class stdio_sync_filebuf<wchar_t>;
 #endif
 } // namespace __gnu_cxx
diff --git a/libstdc++-v3/src/ostream-inst.cc b/libstdc++-v3/src/ostream-inst.cc
index b834640646b..c4e2394f786 100644
--- a/libstdc++-v3/src/ostream-inst.cc
+++ b/libstdc++-v3/src/ostream-inst.cc
@@ -56,7 +56,7 @@ namespace std
   template ostream& operator<<(ostream&, _Setprecision);
   template ostream& operator<<(ostream&, _Setw);
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_ostream<wchar_t>;
   template wostream& endl(wostream&);
   template wostream& ends(wostream&);
diff --git a/libstdc++-v3/src/sstream-inst.cc b/libstdc++-v3/src/sstream-inst.cc
index 6c0272ba289..3295c2f0f12 100644
--- a/libstdc++-v3/src/sstream-inst.cc
+++ b/libstdc++-v3/src/sstream-inst.cc
@@ -38,25 +38,25 @@ namespace std
 {
   // stringbuf
   template class basic_stringbuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_stringbuf<wchar_t>;
 #endif
 
   // istringstream
   template class basic_istringstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_istringstream<wchar_t>; 
 #endif
 
   // ostringstream
   template class basic_ostringstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_ostringstream<wchar_t>; 
 #endif
 
   // stringstream
   template class basic_stringstream<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_stringstream<wchar_t>; 
 #endif
 } // namespace std
diff --git a/libstdc++-v3/src/streambuf-inst.cc b/libstdc++-v3/src/streambuf-inst.cc
index 438752e7e5b..49cb6052560 100644
--- a/libstdc++-v3/src/streambuf-inst.cc
+++ b/libstdc++-v3/src/streambuf-inst.cc
@@ -39,7 +39,7 @@ namespace std
 {
   // streambuf
   template class basic_streambuf<char>;
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template class basic_streambuf<wchar_t>;
 #endif
 
@@ -47,7 +47,7 @@ namespace std
     streamsize
     __copy_streambufs(basic_ios<char>&, basic_streambuf<char>*,
 		      basic_streambuf<char>*); 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   template
     streamsize
     __copy_streambufs(basic_ios<wchar_t>&, basic_streambuf<wchar_t>*,
diff --git a/libstdc++-v3/src/wstring-inst.cc b/libstdc++-v3/src/wstring-inst.cc
index 0200fd42d67..bbfbe337eef 100644
--- a/libstdc++-v3/src/wstring-inst.cc
+++ b/libstdc++-v3/src/wstring-inst.cc
@@ -1,6 +1,6 @@
 #include <bits/c++config.h>
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 #define C wchar_t
 #include "string-inst.cc"
 #endif
diff --git a/libstdc++-v3/testsuite/17_intro/header_cwctype.cc b/libstdc++-v3/testsuite/17_intro/header_cwctype.cc
index ba315b49ce0..6fdea9faf17 100644
--- a/libstdc++-v3/testsuite/17_intro/header_cwctype.cc
+++ b/libstdc++-v3/testsuite/17_intro/header_cwctype.cc
@@ -20,7 +20,7 @@
 
 // 17.4.1.2 Headers, cwctype
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 #include <cwctype>
 // Make sure wint_t is in namespace std
 std::wint_t i = 5;
diff --git a/libstdc++-v3/testsuite/17_intro/headers.cc b/libstdc++-v3/testsuite/17_intro/headers.cc
index 4694079ed29..9f0303e675b 100644
--- a/libstdc++-v3/testsuite/17_intro/headers.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers.cc
@@ -78,7 +78,7 @@
 
 // "C" headers that might not work if wchar_t support is disabled.
 #include <bits/c++config.h>
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
   #include <cwchar>
   #include <cwctype>
 #endif
diff --git a/libstdc++-v3/testsuite/17_intro/headers_c++.cc b/libstdc++-v3/testsuite/17_intro/headers_c++.cc
index cb6a71d9e13..eb5d9c53ac5 100644
--- a/libstdc++-v3/testsuite/17_intro/headers_c++.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers_c++.cc
@@ -60,7 +60,7 @@
 
 // "C++" headers that might not work if wchar_t support is disabled.
 #include <bits/c++config.h>
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
   #include <cwchar>
   #include <cwctype>
   #include <wchar.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers_c.cc b/libstdc++-v3/testsuite/17_intro/headers_c.cc
index b4fe65895d9..17aa083c538 100644
--- a/libstdc++-v3/testsuite/17_intro/headers_c.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers_c.cc
@@ -60,7 +60,7 @@
 
 // "C" headers that might not work if wchar_t support is disabled.
 #include <bits/c++config.h>
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
   #include <wchar.h>
   #include <wctype.h>
   #include <cwchar>
diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits.cc b/libstdc++-v3/testsuite/18_support/numeric_limits.cc
index 540b4b7759f..1643625cb3e 100644
--- a/libstdc++-v3/testsuite/18_support/numeric_limits.cc
+++ b/libstdc++-v3/testsuite/18_support/numeric_limits.cc
@@ -49,9 +49,9 @@ DEFINE_EXTREMA(unsigned, 0U, UINT_MAX);
 DEFINE_EXTREMA(long, LONG_MIN, LONG_MAX);
 DEFINE_EXTREMA(unsigned long, 0UL, ULONG_MAX);
 
-#if _GLIBCPP_USE_WCHAR_T
+#if _GLIBCXX_USE_WCHAR_T
 DEFINE_EXTREMA(wchar_t, WCHAR_MIN, WCHAR_MAX);
-#endif //_GLIBCPP_USE_WCHAR_T
+#endif //_GLIBCXX_USE_WCHAR_T
 
 DEFINE_EXTREMA(float, FLT_MIN, FLT_MAX);
 DEFINE_EXTREMA(double, DBL_MIN, DBL_MAX);
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc
index b96b22c5991..b1dc652d6d4 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc
@@ -25,7 +25,7 @@
 
 
 
-#ifdef _GLIBCPP_USE___ENC_TRAITS
+#ifdef _GLIBCXX_USE___ENC_TRAITS
 
 // Need some char_traits specializations for this to work.
 typedef unsigned short			unicode_t;
@@ -135,11 +135,11 @@ void test01()
   cvt.length(state04, e_lit, e_lit + size, 5);
   VERIFY( length_called );
 }
-#endif // _GLIBCPP_USE___ENC_TRAITS
+#endif // _GLIBCXX_USE___ENC_TRAITS
 
 int main ()
 {
-#if _GLIBCPP_USE___ENC_TRAITS
+#if _GLIBCXX_USE___ENC_TRAITS
   test01();
 #endif 
 
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc
index 76f67b70aa3..1fa9648f5e8 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc
@@ -22,7 +22,7 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-#ifdef _GLIBCPP_USE___ENC_TRAITS
+#ifdef _GLIBCXX_USE___ENC_TRAITS
 
 // Need some char_traits specializations for this to work.
 typedef unsigned short			unicode_t;
@@ -288,11 +288,11 @@ void test02()
   delete [] i_arr;
 }
 
-#endif // _GLIBCPP_USE___ENC_TRAITS
+#endif // _GLIBCXX_USE___ENC_TRAITS
 
 int main ()
 {
-#if _GLIBCPP_USE___ENC_TRAITS
+#if _GLIBCXX_USE___ENC_TRAITS
   test01();
   test02();
 #endif 
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/wchar_t.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/wchar_t.cc
index a03ce95983f..5f3d76cfe64 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/wchar_t.cc
@@ -23,7 +23,7 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-#ifdef _GLIBCPP_USE___ENC_TRAITS
+#ifdef _GLIBCXX_USE___ENC_TRAITS
 
 // Need some char_traits specializations for this to work.
 typedef unsigned short			unicode_t;
@@ -186,11 +186,11 @@ void test01()
   delete [] e_arr;
   delete [] i_arr;
 }
-#endif // _GLIBCPP_USE___ENC_TRAITS
+#endif // _GLIBCXX_USE___ENC_TRAITS
 
 int main ()
 {
-#ifdef _GLIBCPP_USE___ENC_TRAITS
+#ifdef _GLIBCXX_USE___ENC_TRAITS
   test01();
 #endif 
   return 0;
diff --git a/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/1.cc
index 7af4fae26b2..afe99f378b7 100644
--- a/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/1.cc
@@ -47,7 +47,7 @@ class gnu_ctype: public std::ctype<char_type> { };
   VERIFY(gctype.scan_not((MASK), (STRING), \
 			 (STRING) + traits_type::length(STRING)) == (EXPECTED))
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 // Sanity check scan_is() and scan_not().
 void test01()
 {
@@ -345,7 +345,7 @@ void test01()
 
 int main() 
 {
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   test01();
 #endif
   return 0;
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
index 1c03e4df29e..15ea686141e 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
@@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <testsuite_hooks.h>
 
-#if _GLIBCPP_USE___ENC_TRAITS
+#if _GLIBCXX_USE___ENC_TRAITS
 typedef std::codecvt<char, char, std::mbstate_t> 	      c_codecvt;
 typedef std::codecvt_byname<char, char, std::mbstate_t>       c_codecvt_byname;
 typedef std::codecvt<wchar_t, char, std::mbstate_t>	      w_codecvt;
@@ -287,11 +287,11 @@ void test01()
     VERIFY (loc15 != loc09);  
   }
 }
-#endif // _GLIBCPP_USE___ENC_TRAITS
+#endif // _GLIBCXX_USE___ENC_TRAITS
 
 int main()
 {
-#if _GLIBCPP_USE___ENC_TRAITS
+#if _GLIBCXX_USE___ENC_TRAITS
   test01();
 #endif 
   return 0;
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
index f20542a137c..f6fc08adaf3 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
@@ -29,7 +29,7 @@
 void test03()
 {
   bool test = true;
-#ifdef _GLIBCPP_HAVE_SETENV 
+#ifdef _GLIBCXX_HAVE_SETENV 
   const char* LC_ALL_orig = getenv("LC_ALL");
   if (!setenv("LC_ALL", "it_IT", 1))
     {
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
index 55ace6eaf82..c24f6a42a79 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
@@ -31,7 +31,7 @@ void test04()
   bool test = true;
   using namespace std;
 
-#ifdef _GLIBCPP_HAVE_SETENV
+#ifdef _GLIBCXX_HAVE_SETENV
 
   const char* LANG_orig = getenv("LANG") ? strdup(getenv("LANG")) : "";
   const char* LC_ALL_orig = getenv("LC_ALL") ? strdup(getenv("LC_ALL")) : "";
@@ -47,7 +47,7 @@ void test04()
     getenv("LC_MONETARY") ? strdup(getenv("LC_MONETARY")) : "";
   const char* LC_MESSAGES_orig = 
     getenv("LC_MESSAGES") ? strdup(getenv("LC_MESSAGES")) : "";
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   const char* LC_PAPER_orig = 
     getenv("LC_PAPER") ? strdup(getenv("LC_PAPER")) : "";
   const char* LC_NAME_orig = 
@@ -100,7 +100,7 @@ void test04()
   setenv("LC_COLLATE", "", 1);
   setenv("LC_MONETARY", "", 1);
   setenv("LC_MESSAGES", "", 1);
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   setenv("LC_PAPER", "", 1);
   setenv("LC_NAME", "", 1);
   setenv("LC_ADDRESS", "", 1);
@@ -128,7 +128,7 @@ void test04()
     {
       locale loc = __gnu_cxx_test::try_named_locale("");
 
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
       VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
               "LC_COLLATE=de_DE;LC_MONETARY=C;LC_MESSAGES=C;LC_PAPER=C;"
 	      "LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;LC_MEASUREMENT=C;"
@@ -143,7 +143,7 @@ void test04()
   if (!setenv("LANG", "fr_FR", 1))
     {
       locale loc = __gnu_cxx_test::try_named_locale("");
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
       VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
 	      "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
 	      "LC_MESSAGES=fr_FR;LC_PAPER=fr_FR;LC_NAME=fr_FR;"
@@ -157,7 +157,7 @@ void test04()
     }
   
   // Changing another (C only) category.
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   if (!setenv("LC_IDENTIFICATION", "it_IT", 1))
     {
       locale loc = __gnu_cxx_test::try_named_locale("");
@@ -178,7 +178,7 @@ void test04()
   setenv("LC_COLLATE", LC_COLLATE_orig ? LC_COLLATE_orig : "", 1);
   setenv("LC_MONETARY", LC_MONETARY_orig ? LC_MONETARY_orig : "", 1);
   setenv("LC_MESSAGES", LC_MESSAGES_orig ? LC_MESSAGES_orig : "", 1);
-#if _GLIBCPP_NUM_CATEGORIES
+#if _GLIBCXX_NUM_CATEGORIES
   setenv("LC_PAPER", LC_PAPER_orig ? LC_PAPER_orig : "", 1);
   setenv("LC_NAME", LC_NAME_orig ? LC_NAME_orig : "", 1);
   setenv("LC_ADDRESS", LC_ADDRESS_orig ? LC_ADDRESS_orig : "", 1);
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc
index 6f972c57824..6d4de201f24 100644
--- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc
@@ -146,7 +146,7 @@ void test01()
   VERIFY( &v != &cv );
   VERIFY( err == goodbit );
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   long long ll1 = 9223372036854775807LL;
   long long ll2 = -9223372036854775807LL;
   long long ll;
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
index ef055b3d3e5..784f83cb6fd 100644
--- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
@@ -145,7 +145,7 @@ void test01()
   VERIFY( &v != &cv );
   VERIFY( err == goodbit );
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   long long ll1 = 9223372036854775807LL;
   long long ll2 = -9223372036854775807LL;
   long long ll;
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc
index b34fce2b672..bffab3fefe6 100644
--- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc
@@ -155,7 +155,7 @@ void test01()
   // Should contain an 'x'.
   VERIFY( result1.find('x') == 1 );
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   long long ll1 = 9223372036854775807LL;
   long long ll2 = -9223372036854775807LL;
 
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/7.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/7.cc
index 43dcb53aadb..d5586cc3ada 100644
--- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/7.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/7.cc
@@ -23,7 +23,7 @@
 #include <locale>
 #include <testsuite_hooks.h>
 
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
 // libstdc++/9828
 void test01()
 {
@@ -42,7 +42,7 @@ void test01()
 
 int main()
 {
-#ifdef _GLIBCPP_USE_WCHAR_T
+#ifdef _GLIBCXX_USE_WCHAR_T
   test01();
 #endif
   return 0;
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc
index 28ed5d7e4f3..a8a5da15e0f 100644
--- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc
@@ -155,7 +155,7 @@ void test01()
   // Should contain an 'x'.
   VERIFY( result1.find(L'x') == 1 );
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   long long ll1 = 9223372036854775807LL;
   long long ll2 = -9223372036854775807LL;
 
diff --git a/libstdc++-v3/testsuite/25_algorithms/min_max.cc b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
index c6e8001df70..ef8acfd249f 100644
--- a/libstdc++-v3/testsuite/25_algorithms/min_max.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/min_max.cc
@@ -88,7 +88,7 @@ void test02()
   VERIFY( 2ul == std::min(A<unsigned long>::a, 2ul) );
   VERIFY( 3ul == std::min(A<unsigned long>::a, 4ul) );
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   VERIFY( 2ll == std::min(A<long long>::a, 2ll) );
   VERIFY( 3ll == std::min(A<long long>::a, 4ll) );
 
@@ -136,7 +136,7 @@ void test02()
   VERIFY( 3ul == std::max(A<unsigned long>::a, 2ul) );
   VERIFY( 4ul == std::max(A<unsigned long>::a, 4ul) );
 
-#ifdef _GLIBCPP_USE_LONG_LONG
+#ifdef _GLIBCXX_USE_LONG_LONG
   VERIFY( 3ll == std::max(A<long long>::a, 2ll) );
   VERIFY( 4ll == std::max(A<long long>::a, 4ll) );
 
diff --git a/libstdc++-v3/testsuite/26_numerics/c99_classification_macros_c++.cc b/libstdc++-v3/testsuite/26_numerics/c99_classification_macros_c++.cc
index 132cebf5ab7..095a7bc990e 100644
--- a/libstdc++-v3/testsuite/26_numerics/c99_classification_macros_c++.cc
+++ b/libstdc++-v3/testsuite/26_numerics/c99_classification_macros_c++.cc
@@ -55,7 +55,7 @@ void islessgreater() { }
 
 void isunordered() { }
 
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
 template <typename _Tp>
   void test_c99_classify()
   {
@@ -83,7 +83,7 @@ template <typename _Tp>
 
 int main()
 {
-#if _GLIBCPP_USE_C99
+#if _GLIBCXX_USE_C99
   test_c99_classify<float>();
   //test_c99_classify<double>();
 #endif
diff --git a/libstdc++-v3/testsuite/27_io/types/1.cc b/libstdc++-v3/testsuite/27_io/types/1.cc
index 9ec9bb75755..cfd5b9527ae 100644
--- a/libstdc++-v3/testsuite/27_io/types/1.cc
+++ b/libstdc++-v3/testsuite/27_io/types/1.cc
@@ -25,7 +25,7 @@
 // Annex D, deprecated.
 void test01()
 {
-#if _GLIBCPP_DEPRECATED
+#if _GLIBCXX_DEPRECATED
   std::ios_base::streampos spos;
   std::ios_base::streamoff soff;
 #endif
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 20707ba6635..1261e3d1262 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -27,12 +27,12 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 DEJATOOL = libstdc++-v3
 
-EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
-            echo @glibcpp_builddir@/../../expect/expect ; \
+EXPECT = `if [ -f @glibcxx_builddir@/../../expect/expect ] ; then \
+            echo @glibcxx_builddir@/../../expect/expect ; \
           else echo expect ; fi`
 
-RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
-	       echo @glibcpp_srcdir@/../dejagnu/runtest ; \
+RUNTEST = `if [ -f @glibcxx_srcdir@/../dejagnu/runtest ] ; then \
+	       echo @glibcxx_srcdir@/../dejagnu/runtest ; \
 	    else echo runtest; fi`
 
 AM_MAKEFLAGS = -j1
@@ -40,29 +40,29 @@ AM_RUNTESTFLAGS =
 RUNTESTFLAGS =
 
 ## CXX is actually a "C" compiler. These are real C++ programs.
-glibcpp_srcdir=@glibcpp_srcdir@
-glibcpp_builddir=@glibcpp_builddir@
-testsuite_flags_script=${glibcpp_builddir}/scripts/testsuite_flags
+glibcxx_srcdir=@glibcxx_srcdir@
+glibcxx_builddir=@glibcxx_builddir@
+testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags
 CXX=`${testsuite_flags_script} --build-cxx`
 
 CXXLINK = \
-	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
+	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcxx_builddir}/src/.libs\
 	$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
 INCLUDES = \
 	-nostdinc++ \
-	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
+	@GLIBCXX_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
 
 ## Build support library.
 noinst_LIBRARIES = libv3test.a
 libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
 
 ## Build support utilities.
-if GLIBCPP_TEST_ABI
+if GLIBCXX_TEST_ABI
 noinst_PROGRAMS = abi_check
 else
 noinst_PROGRAMS = 
@@ -72,7 +72,7 @@ abi_check_SOURCES = abi_check.cc
 all-local: stamp_wchar
 
 # Enable wchar_t tests if capable.
-if GLIBCPP_TEST_WCHAR_T
+if GLIBCXX_TEST_WCHAR_T
 stamp_wchar:
 	touch testsuite_wchar_t
 else
@@ -84,7 +84,7 @@ check-local: check-abi
 
 baseline_dir = @baseline_dir@
 baseline_file = ${baseline_dir}/baseline_symbols.txt
-extract_symvers = @glibcpp_srcdir@/scripts/extract_symvers
+extract_symvers = @glibcxx_srcdir@/scripts/extract_symvers
 
 current_symbols.txt: ${extract_symvers} ../src/.libs/libstdc++.so
 	  -@(${extract_symvers} ../src/.libs/libstdc++.so current_symbols.txt)
@@ -107,7 +107,7 @@ new-abi-baseline:
 	  fi; \
 	  ${extract_symvers} ../src/.libs/libstdc++.so $${output})
 
-if GLIBCPP_TEST_ABI
+if GLIBCXX_TEST_ABI
 # Use 'new-abi-baseline' to create an initial symbol file.  Then run
 # 'check-abi' to test for changes against that file.
 check-abi: abi_check baseline_symbols current_symbols.txt
@@ -129,7 +129,7 @@ endif
 # dejagnu test harness, and is thus off by default. It does produce
 # interesting output however, including various performance analysis
 # items like compile time, execution time, and binary size.
-survey_script = ${glibcpp_builddir}/scripts/check_survey
+survey_script = ${glibcxx_builddir}/scripts/check_survey
 check-script: ${survey_script}
 	-@(chmod + ${survey_script}; \
 	  ${survey_script} 0)
@@ -143,10 +143,10 @@ check-script-install: ${survey_script}
 # Some of these tests create large (~75MB) files, allocate huge
 # ammounts of memory, or otherwise tie up machine resources. Thus,
 # running this is off by default.
-performance_script=${glibcpp_srcdir}/scripts/check_performance
+performance_script=${glibcxx_srcdir}/scripts/check_performance
 check-performance: ${performance_script}
 	-@(chmod + ${performance_script}; \
-	  ${performance_script} ${glibcpp_srcdir} ${glibcpp_builddir})
+	  ${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
 
 .PHONY: baseline_symbols new-abi-baseline check-abi check-abi-verbose \
 check-script check-script-install check-performance
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index dac378c6033..c4fe41e9673 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -91,9 +91,11 @@ DEBUG_FLAGS = @DEBUG_FLAGS@
 DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
+FPOS_H = @FPOS_H@
+FPOS_INC_SRCDIR = @FPOS_INC_SRCDIR@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
-GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
+GLIBCXX_IS_CROSS_COMPILING = @GLIBCXX_IS_CROSS_COMPILING@
 LIBMATHOBJS = @LIBMATHOBJS@
 LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
@@ -120,16 +122,16 @@ WERROR = @WERROR@
 check_msgfmt = @check_msgfmt@
 enable_shared = @enable_shared@
 enable_static = @enable_static@
-glibcpp_CXX = @glibcpp_CXX@
-glibcpp_MOFILES = @glibcpp_MOFILES@
-glibcpp_PCHFLAGS = @glibcpp_PCHFLAGS@
-glibcpp_POFILES = @glibcpp_POFILES@
-glibcpp_basedir = @glibcpp_basedir@
-glibcpp_localedir = @glibcpp_localedir@
-glibcpp_prefixdir = @glibcpp_prefixdir@
-glibcpp_thread_h = @glibcpp_thread_h@
-glibcpp_toolexecdir = @glibcpp_toolexecdir@
-glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
+glibcxx_CXX = @glibcxx_CXX@
+glibcxx_MOFILES = @glibcxx_MOFILES@
+glibcxx_PCHFLAGS = @glibcxx_PCHFLAGS@
+glibcxx_POFILES = @glibcxx_POFILES@
+glibcxx_basedir = @glibcxx_basedir@
+glibcxx_localedir = @glibcxx_localedir@
+glibcxx_prefixdir = @glibcxx_prefixdir@
+glibcxx_thread_h = @glibcxx_thread_h@
+glibcxx_toolexecdir = @glibcxx_toolexecdir@
+glibcxx_toolexeclibdir = @glibcxx_toolexeclibdir@
 gxx_include_dir = @gxx_include_dir@
 ifGNUmake = @ifGNUmake@
 libtool_VERSION = @libtool_VERSION@
@@ -141,55 +143,65 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
 DEJATOOL = libstdc++-v3
 
-EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then             echo @glibcpp_builddir@/../../expect/expect ;           else echo expect ; fi`
+EXPECT = `if [ -f @glibcxx_builddir@/../../expect/expect ] ; then \
+            echo @glibcxx_builddir@/../../expect/expect ; \
+          else echo expect ; fi`
 
 
-RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then 	       echo @glibcpp_srcdir@/../dejagnu/runtest ; 	    else echo runtest; fi`
+RUNTEST = `if [ -f @glibcxx_srcdir@/../dejagnu/runtest ] ; then \
+	       echo @glibcxx_srcdir@/../dejagnu/runtest ; \
+	    else echo runtest; fi`
 
 
 AM_MAKEFLAGS = -j1
 AM_RUNTESTFLAGS = 
 RUNTESTFLAGS = 
 
-glibcpp_srcdir = @glibcpp_srcdir@
-glibcpp_builddir = @glibcpp_builddir@
-testsuite_flags_script = ${glibcpp_builddir}/scripts/testsuite_flags
+glibcxx_srcdir = @glibcxx_srcdir@
+glibcxx_builddir = @glibcxx_builddir@
+testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags
 CXX = `${testsuite_flags_script} --build-cxx`
 
-CXXLINK =  	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs 	$(LIBTOOL) --tag=CXX --mode=link $(CXX) 	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = \
+	LD_RUN_PATH=$${LD_RUN_PATH:+$$LD_RUN_PATH:}${glibcxx_builddir}/src/.libs\
+	$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
+	$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 
 
-GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
+GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@
 LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
 TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
-INCLUDES =  	-nostdinc++ 	@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
+INCLUDES = \
+	-nostdinc++ \
+	@GLIBCXX_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@ 
 
 
 noinst_LIBRARIES = libv3test.a
 libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc
-@GLIBCPP_TEST_ABI_TRUE@noinst_PROGRAMS = abi_check
-@GLIBCPP_TEST_ABI_FALSE@noinst_PROGRAMS = 
+@GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS = @GLIBCXX_TEST_ABI_TRUE@abi_check
+@GLIBCXX_TEST_ABI_FALSE@noinst_PROGRAMS = 
 abi_check_SOURCES = abi_check.cc
 
 baseline_dir = @baseline_dir@
 baseline_file = ${baseline_dir}/baseline_symbols.txt
-extract_symvers = @glibcpp_srcdir@/scripts/extract_symvers
+extract_symvers = @glibcxx_srcdir@/scripts/extract_symvers
 
 # These two special 'check-script' rules use the bash script
 # 'check_survey' to do testing. This script is not as portable as the
 # dejagnu test harness, and is thus off by default. It does produce
 # interesting output however, including various performance analysis
 # items like compile time, execution time, and binary size.
-survey_script = ${glibcpp_builddir}/scripts/check_survey
+survey_script = ${glibcxx_builddir}/scripts/check_survey
 
 # Runs the testsuite/performance tests.  
 # Some of these tests create large (~75MB) files, allocate huge
 # ammounts of memory, or otherwise tie up machine resources. Thus,
 # running this is off by default.
-performance_script = ${glibcpp_srcdir}/scripts/check_performance
+performance_script = ${glibcxx_srcdir}/scripts/check_performance
 
 # By adding these files here, automake will remove them for 'make clean'
-CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum 	     testsuite_* site.exp abi_check baseline_symbols 
+CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \
+	     testsuite_* site.exp abi_check baseline_symbols 
 
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -203,7 +215,7 @@ LIBS = @LIBS@
 libv3test_a_LIBADD = 
 libv3test_a_OBJECTS =  testsuite_hooks.$(OBJEXT) \
 testsuite_allocator.$(OBJEXT)
-@GLIBCPP_TEST_ABI_FALSE@noinst_PROGRAMS = 
+@GLIBCXX_TEST_ABI_TRUE@noinst_PROGRAMS =  abi_check$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)
 
 abi_check_OBJECTS =  abi_check.$(OBJEXT)
@@ -219,7 +231,7 @@ DIST_COMMON =  Makefile.am Makefile.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES)
 OBJECTS = $(libv3test_a_OBJECTS) $(abi_check_OBJECTS)
@@ -330,7 +342,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	  awk '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
@@ -387,7 +399,7 @@ site.exp: Makefile
 	@echo 'set build_alias $(build_alias)' >> $@-t
 	@echo 'set build_triplet $(build_triplet)' >> $@-t
 	@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-	@test ! -f $(srcdir)/site.exp || sed '1,/^## All variables above are.*##/ d' $(srcdir)/site.exp >> $@-t
+	@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
 	@test ! -f site.exp || mv site.exp site.bak
 	@mv $@-t site.exp
 info-am:
@@ -476,9 +488,9 @@ mostlyclean distclean maintainer-clean
 all-local: stamp_wchar
 
 # Enable wchar_t tests if capable.
-@GLIBCPP_TEST_WCHAR_T_TRUE@stamp_wchar:
-@GLIBCPP_TEST_WCHAR_T_TRUE@	touch testsuite_wchar_t
-@GLIBCPP_TEST_WCHAR_T_FALSE@stamp_wchar:
+@GLIBCXX_TEST_WCHAR_T_TRUE@stamp_wchar:
+@GLIBCXX_TEST_WCHAR_T_TRUE@	touch testsuite_wchar_t
+@GLIBCXX_TEST_WCHAR_T_FALSE@stamp_wchar:
 
 # This is automatically run after the generated check-DEJAGNU rule.
 check-local: check-abi
@@ -506,16 +518,16 @@ new-abi-baseline:
 
 # Use 'new-abi-baseline' to create an initial symbol file.  Then run
 # 'check-abi' to test for changes against that file.
-@GLIBCPP_TEST_ABI_TRUE@check-abi: abi_check baseline_symbols current_symbols.txt
-@GLIBCPP_TEST_ABI_TRUE@	-@(./abi_check --check ./current_symbols.txt ${baseline_file} \
-@GLIBCPP_TEST_ABI_TRUE@	2>&1 | tee libstdc++-v3-abi.sum)
+@GLIBCXX_TEST_ABI_TRUE@check-abi: abi_check baseline_symbols current_symbols.txt
+@GLIBCXX_TEST_ABI_TRUE@	-@(./abi_check --check ./current_symbols.txt ${baseline_file} \
+@GLIBCXX_TEST_ABI_TRUE@	2>&1 | tee libstdc++-v3-abi.sum)
 
-@GLIBCPP_TEST_ABI_TRUE@check-abi-verbose: abi_check baseline_symbols current_symbols.txt 
-@GLIBCPP_TEST_ABI_TRUE@	-@(./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \
-@GLIBCPP_TEST_ABI_TRUE@	2>&1 | tee libstdc++-v3-abi.sum)
+@GLIBCXX_TEST_ABI_TRUE@check-abi-verbose: abi_check baseline_symbols current_symbols.txt 
+@GLIBCXX_TEST_ABI_TRUE@	-@(./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \
+@GLIBCXX_TEST_ABI_TRUE@	2>&1 | tee libstdc++-v3-abi.sum)
 
-@GLIBCPP_TEST_ABI_FALSE@check-abi:
-@GLIBCPP_TEST_ABI_FALSE@check-abi-verbose:
+@GLIBCXX_TEST_ABI_FALSE@check-abi:
+@GLIBCXX_TEST_ABI_FALSE@check-abi-verbose:
 check-script: ${survey_script}
 	-@(chmod + ${survey_script}; \
 	  ${survey_script} 0)
@@ -525,7 +537,7 @@ check-script-install: ${survey_script}
 	  ${survey_script} 0)
 check-performance: ${performance_script}
 	-@(chmod + ${performance_script}; \
-	  ${performance_script} ${glibcpp_srcdir} ${glibcpp_builddir})
+	  ${performance_script} ${glibcxx_srcdir} ${glibcxx_builddir})
 
 .PHONY: baseline_symbols new-abi-baseline check-abi check-abi-verbose \
 check-script check-script-install check-performance
diff --git a/libstdc++-v3/testsuite/abi_check.cc b/libstdc++-v3/testsuite/abi_check.cc
index c4d7805e086..7b98319707b 100644
--- a/libstdc++-v3/testsuite/abi_check.cc
+++ b/libstdc++-v3/testsuite/abi_check.cc
@@ -87,7 +87,7 @@ check_version(const symbol_info& test, bool added = false)
       known_versions.push_back("GLIBCPP_3.2.1");
       known_versions.push_back("GLIBCPP_3.2.2");
       known_versions.push_back("GLIBCPP_3.2.3"); // gcc-3.3.0
-      known_versions.push_back("GLIBCPP_3.4");
+      known_versions.push_back("GLIBCXX_3.4");
       known_versions.push_back("CXXABI_1.2");
       known_versions.push_back("CXXABI_1.2.1");
       known_versions.push_back("CXXABI_1.3");
diff --git a/libstdc++-v3/testsuite/ext/concept_checks.cc b/libstdc++-v3/testsuite/ext/concept_checks.cc
index 8109985d1ca..3ef7e6ecc59 100644
--- a/libstdc++-v3/testsuite/ext/concept_checks.cc
+++ b/libstdc++-v3/testsuite/ext/concept_checks.cc
@@ -20,7 +20,7 @@
 
 // Concept checking must remain sane.
 
-// { dg-options "-D_GLIBCPP_CONCEPT_CHECKS" }
+// { dg-options "-D_GLIBCXX_CONCEPT_CHECKS" }
 
 #include <vector>
 #include <string>
diff --git a/libstdc++-v3/testsuite/testsuite_allocator.h b/libstdc++-v3/testsuite/testsuite_allocator.h
index 3c77260f5d5..675830eca97 100644
--- a/libstdc++-v3/testsuite/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/testsuite_allocator.h
@@ -32,8 +32,8 @@
 // used to verify allocation functionality of standard library
 // containers.  2002.11.25 smw
 
-#ifndef _GLIBCPP_TESTSUITE_ALLOCATOR_H
-#define _GLIBCPP_TESTSUITE_ALLOCATOR_H
+#ifndef _GLIBCXX_TESTSUITE_ALLOCATOR_H
+#define _GLIBCXX_TESTSUITE_ALLOCATOR_H
 
 #include <cstddef>
 #include <limits>
@@ -171,5 +171,5 @@ namespace __gnu_cxx_test
     { return false; }
 }; // namespace __gnu_cxx_test
 
-#endif // _GLIBCPP_TESTSUITE_ALLOCATOR_H
+#endif // _GLIBCXX_TESTSUITE_ALLOCATOR_H
 
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc
index 9b8d48e1837..793c1dc6354 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/testsuite_hooks.cc
@@ -30,7 +30,7 @@
 
 #include <testsuite_hooks.h>
 
-#ifdef _GLIBCPP_MEM_LIMITS
+#ifdef _GLIBCXX_MEM_LIMITS
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -44,7 +44,7 @@
 
 namespace __gnu_cxx_test
 {
-#ifdef _GLIBCPP_MEM_LIMITS
+#ifdef _GLIBCXX_MEM_LIMITS
   void 
   set_memory_limits(float size)
   {
@@ -53,28 +53,28 @@ namespace __gnu_cxx_test
     __typeof__ (r.rlim_cur) limit = (__typeof__ (r.rlim_cur))(size * 1048576);
 
     // Heap size, seems to be common.
-#if _GLIBCPP_HAVE_MEMLIMIT_DATA
+#if _GLIBCXX_HAVE_MEMLIMIT_DATA
     getrlimit(RLIMIT_DATA, &r);
     r.rlim_cur = limit;
     setrlimit(RLIMIT_DATA, &r);
 #endif
 
     // Resident set size.
-#if _GLIBCPP_HAVE_MEMLIMIT_RSS
+#if _GLIBCXX_HAVE_MEMLIMIT_RSS
     getrlimit(RLIMIT_RSS, &r);
     r.rlim_cur = limit;
     setrlimit(RLIMIT_RSS, &r);
 #endif
 
     // Mapped memory (brk + mmap).
-#if _GLIBCPP_HAVE_MEMLIMIT_VMEM
+#if _GLIBCXX_HAVE_MEMLIMIT_VMEM
     getrlimit(RLIMIT_VMEM, &r);
     r.rlim_cur = limit;
     setrlimit(RLIMIT_VMEM, &r);
 #endif
 
     // Virtual memory.
-#if _GLIBCPP_HAVE_MEMLIMIT_AS
+#if _GLIBCXX_HAVE_MEMLIMIT_AS
     getrlimit(RLIMIT_AS, &r);
     r.rlim_cur = limit;
     setrlimit(RLIMIT_AS, &r);
@@ -171,7 +171,7 @@ namespace __gnu_cxx_test
     using namespace std;
     bool test = true;
     
-#ifdef _GLIBCPP_HAVE_SETENV 
+#ifdef _GLIBCXX_HAVE_SETENV 
     // Set the global locale. 
     locale loc_name = try_named_locale(name);
     locale orig = locale::global(loc_name);
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h
index 719135caa58..457d922353d 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/testsuite_hooks.h
@@ -39,7 +39,7 @@
 //   set_memory_limits() uses setrlimit() to restrict dynamic memory
 //   allocation.  We provide a default memory limit if none is passed by the
 //   calling application.  The argument to set_memory_limits() is the
-//   limit in megabytes (a floating-point number).  If _GLIBCPP_MEM_LIMITS is
+//   limit in megabytes (a floating-point number).  If _GLIBCXX_MEM_LIMITS is
 //   not #defined before including this header, then no limiting is attempted.
 //
 // 3)  counter
@@ -55,8 +55,8 @@
 // 5) pod_char, pod_int, , abstract character classes and
 //   char_traits specializations for testing instantiations.
 
-#ifndef _GLIBCPP_TESTSUITE_HOOKS_H
-#define _GLIBCPP_TESTSUITE_HOOKS_H
+#ifndef _GLIBCXX_TESTSUITE_HOOKS_H
+#define _GLIBCXX_TESTSUITE_HOOKS_H
 
 #include <bits/c++config.h>
 #include <bits/functexcept.h>
@@ -72,11 +72,11 @@
 
 namespace __gnu_cxx_test
 {
-  // All macros are defined in GLIBCPP_CONFIGURE_TESTSUITE and imported
+  // All macros are defined in GLIBCXX_CONFIGURE_TESTSUITE and imported
   // from c++config.h
 
   // Set memory limits if possible, if not set to 0.
-#ifndef _GLIBCPP_MEM_LIMITS
+#ifndef _GLIBCXX_MEM_LIMITS
 #  define MEMLIMIT_MB 0
 #else
 # ifndef MEMLIMIT_MB
@@ -366,5 +366,5 @@ namespace std
     };
 } // namespace std
 
-#endif // _GLIBCPP_TESTSUITE_HOOKS_H
+#endif // _GLIBCXX_TESTSUITE_HOOKS_H
 
diff --git a/libstdc++-v3/testsuite/testsuite_io.h b/libstdc++-v3/testsuite/testsuite_io.h
index 33de2a05b14..6d8c24975a5 100644
--- a/libstdc++-v3/testsuite/testsuite_io.h
+++ b/libstdc++-v3/testsuite/testsuite_io.h
@@ -28,8 +28,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_TESTSUITE_IO_H
-#define _GLIBCPP_TESTSUITE_IO_H
+#ifndef _GLIBCXX_TESTSUITE_IO_H
+#define _GLIBCXX_TESTSUITE_IO_H
 
 #include <fstream>
 
@@ -75,5 +75,5 @@ namespace __gnu_cxx_test
   };
 }; // namespace __gnu_cxx_test
 
-#endif // _GLIBCPP_TESTSUITE_IO_H
+#endif // _GLIBCXX_TESTSUITE_IO_H
 
diff --git a/libstdc++-v3/testsuite/testsuite_performance.h b/libstdc++-v3/testsuite/testsuite_performance.h
index b55ed9121df..0e82137c614 100644
--- a/libstdc++-v3/testsuite/testsuite_performance.h
+++ b/libstdc++-v3/testsuite/testsuite_performance.h
@@ -28,8 +28,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#ifndef _GLIBCPP_PERFORMANCE_H
-#define _GLIBCPP_PERFORMANCE_H
+#ifndef _GLIBCXX_PERFORMANCE_H
+#define _GLIBCXX_PERFORMANCE_H
 
 #include <sys/times.h>
 #include <sys/resource.h>
@@ -192,5 +192,5 @@ namespace __gnu_cxx_test
   }
 }; // namespace __gnu_cxx_test
 
-#endif // _GLIBCPP_PERFORMANCE_H
+#endif // _GLIBCXX_PERFORMANCE_H
 
diff --git a/libstdc++-v3/testsuite/thread/pthread5.cc b/libstdc++-v3/testsuite/thread/pthread5.cc
index 955f3785a39..b92ab8d4067 100644
--- a/libstdc++-v3/testsuite/thread/pthread5.cc
+++ b/libstdc++-v3/testsuite/thread/pthread5.cc
@@ -32,7 +32,7 @@
 // configured for the port, then it is picked up free from STL headers.
 
 #if __GTHREADS
-#ifdef _GLIBCPP_HAVE_UNISTD_H
+#ifdef _GLIBCXX_HAVE_UNISTD_H
 #include <unistd.h>	// To test for _POSIX_THREAD_PRIORITY_SCHEDULING
 #endif
author	bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>	2003-07-05 04:05:45 +0000
committer	bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>	2003-07-05 04:05:45 +0000
commit	5a64d8cf37253f8227d179a52a0c022a927db8b6 (patch)
tree	01daea8defdbdbfae1385af0f177ec7506e8ca8d
parent	755edffdacb0e09129b815d8e4dbb060d7fb6552 (diff)
download	gcc-5a64d8cf37253f8227d179a52a0c022a927db8b6.tar.gz