diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 80a7f32100e1c400d11138c8f97bf1c4e3d793c2..78f23707edf2918cf3f58fc4061b46a648779fd0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+2005-04-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* acinclude.m4 (_GLIBCXX_USE_LONG_LONG,
+	_GLIBCXX_USE_WCHAR_T, _GLIBCXX_USE_C99, _GLIBCXX_USE_C99_MATH,
+	_GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_RES_LIMITS, _GLIBCXX_CONCEPT_CHECKS,
+	_GLIBCXX_SYMVER, _GLIBCXX_USE_LFS, _GLIBCXX_FULLY_DYNAMIC_STRING,
+	_GLIBCXX_USE_NLS, HAVE_GTHR_DEFAULT, HAVE_MBSTATE_T, HAVE_POLL,
+	HAVE_S_ISREG, HAVE_S_IFREG, HAVE_WRITEV, HAVE_INT64_T,
+	HAVE_LC_MESSAGES): Use long form of AC_DEFINE ...
+	* acconfig.h: ... to eliminate them from here.
+	(_GLIBCXX_ASM_SYMVER): Move definition below @BOTTOM@.
+	* config.h.in, configure: Regenerate.
+	
 2005-04-05  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Makefile.am (ACLOCAL_AMFLAGS): Define.
diff --git a/libstdc++-v3/acconfig.h b/libstdc++-v3/acconfig.h
index ffc33e8472f5ad0937f84cafbf3aee9d15f1a331..e6113f956e39c014cab6ca197e4c6834bcdcb133 100644
--- a/libstdc++-v3/acconfig.h
+++ b/libstdc++-v3/acconfig.h
@@ -4,35 +4,11 @@
 #undef PACKAGE
 #undef VERSION
 
+// Define if <float.h> exists.
+#undef HAVE_FLOAT_H
 
-// Define if code specialized for long long should be used.
-#undef _GLIBCXX_USE_LONG_LONG
-
-// Define if code specialized for wchar_t should be used.
-#undef _GLIBCXX_USE_WCHAR_T
-
-// Define if C99 functions or macros from <wchar.h>, <math.h>,
-// <complex.h>, <stdio.h>, and <stdlib.h> can be used or exposed.
-#undef _GLIBCXX_USE_C99
-
-// Define if C99 functions or macros in <math.h> should be imported in
-// <cmath> in namespace std.
-#undef _GLIBCXX_USE_C99_MATH
-
-// Define if C99 functions in <complex.h> should be used in
-// <complex>. Using compiler builtins for these functions requires
-// corresponding C99 library functions to be present.
-#undef _GLIBCXX_USE_C99_COMPLEX
-
-// Define if using setrlimit to set resource limits during 'make check'.
-#undef _GLIBCXX_RES_LIMITS
-
-// Define to use concept checking code from the boost libraries.
-#undef _GLIBCXX_CONCEPT_CHECKS
-
-// Define to use symbol versioning in the shared library.
-#undef _GLIBCXX_SYMVER
-
+// @BOTTOM@
+//
 // Define symbol versioning in assember directives. If symbol
 // versioning is beigng used, and the assembler supports this kind of
 // thing, then use it.
@@ -44,44 +20,6 @@
   #define _GLIBCXX_ASM_SYMVER(cur, old, version)
 #endif
 
-// Define if LFS support is available.
-#undef _GLIBCXX_USE_LFS
-
-// Define if a fully dynamic basic_string is wanted.
-#undef _GLIBCXX_FULLY_DYNAMIC_STRING
-
-// Define if NLS translations are to be used.
-#undef _GLIBCXX_USE_NLS
-
-// Define if gthr-default.h exists (meaning that threading support is enabled).
-#undef HAVE_GTHR_DEFAULT
-
-// Define if mbstate_t exists in wchar.h.
-#undef HAVE_MBSTATE_T
-
-// Define if poll is available in <poll.h>.
-#undef HAVE_POLL
-
-// Define if S_ISREG (Posix) is available in <sys/stat.h>.
-#undef HAVE_S_ISREG
-
-// Define if S_IFREG is available in <sys/stat.h>.
-#undef HAVE_S_IFREG
-
-// Define if writev is available in <sys/uio.h>.
-#undef HAVE_WRITEV
-
-// Define if int64_t is available in <stdint.h>.
-#undef HAVE_INT64_T
-
-// Define if LC_MESSAGES is available in <locale.h>.
-#undef HAVE_LC_MESSAGES
-
-// Define if <float.h> exists.
-#undef HAVE_FLOAT_H
-
-// @BOTTOM@
-//
 // Systems that have certain non-standard functions prefixed with an
 // underscore, we'll handle those here. Must come after config.h.in.
 //
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index d911e2f803224f897cc0f8e9ab85bf7e0464508f..24780718a2887285458fc8a5b5427877f8221fd6 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -375,7 +375,9 @@ AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT], [
   AC_MSG_CHECKING([for testsuite resource limits support])
   if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
     ac_res_limits=yes
-    AC_DEFINE(_GLIBCXX_RES_LIMITS)
+    AC_DEFINE(_GLIBCXX_RES_LIMITS, 1,
+              [Define if using setrlimit to set resource limits during
+              "make check"])
   else
     ac_res_limits=no
   fi
@@ -407,9 +409,11 @@ AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [
       [glibcxx_cv_S_IFREG=no])
   ])
   if test $glibcxx_cv_S_ISREG = yes; then
-    AC_DEFINE(HAVE_S_ISREG)
+    AC_DEFINE(HAVE_S_ISREG, 1, 
+              [Define if S_IFREG is available in <sys/stat.h>.])
   elif test $glibcxx_cv_S_IFREG = yes; then
-    AC_DEFINE(HAVE_S_IFREG)
+    AC_DEFINE(HAVE_S_IFREG, 1,
+              [Define if S_IFREG is available in <sys/stat.h>.])
   fi
 ])
 
@@ -428,7 +432,7 @@ AC_DEFUN([GLIBCXX_CHECK_POLL], [
       [glibcxx_cv_POLL=no])
   ])
   if test $glibcxx_cv_POLL = yes; then
-    AC_DEFINE(HAVE_POLL)
+    AC_DEFINE(HAVE_POLL, 1, [Define if poll is available in <poll.h>.])
   fi
 ])
 
@@ -446,7 +450,7 @@ AC_DEFUN([GLIBCXX_CHECK_WRITEV], [
       [glibcxx_cv_WRITEV=no])
   ])
   if test $glibcxx_cv_WRITEV = yes; then
-    AC_DEFINE(HAVE_WRITEV)
+    AC_DEFINE(HAVE_WRITEV, 1, [Define if writev is available in <sys/uio.h>.])
   fi
 ])
 
@@ -463,7 +467,7 @@ AC_DEFUN([GLIBCXX_CHECK_INT64_T], [
       [glibcxx_cv_INT64_T=no])
   ])
   if test $glibcxx_cv_INT64_T = yes; then
-    AC_DEFINE(HAVE_INT64_T)
+    AC_DEFINE(HAVE_INT64_T, 1, [Define if int64_t is available in <stdint.h>.])
   fi
 ])
 
@@ -493,7 +497,7 @@ AC_DEFUN([GLIBCXX_CHECK_LFS], [
       [glibcxx_cv_LFS=no])
   ])
   if test $glibcxx_cv_LFS = yes; then
-    AC_DEFINE(_GLIBCXX_USE_LFS)
+    AC_DEFINE(_GLIBCXX_USE_LFS, 1, [Define if LFS support is available.])
   fi
   CXXFLAGS="$ac_save_CXXFLAGS"
   AC_LANG_RESTORE
@@ -514,7 +518,8 @@ dnl
 AC_DEFUN([GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING], [
   GLIBCXX_ENABLE(fully-dynamic-string,$1,,[do not put empty strings in per-process static memory])
   if test $enable_fully_dynamic_string = yes; then
-    AC_DEFINE(_GLIBCXX_FULLY_DYNAMIC_STRING)
+    AC_DEFINE(_GLIBCXX_FULLY_DYNAMIC_STRING, 1,
+              [Define if a fully dynamic basic_string is wanted.])
   fi
 ])
 
@@ -760,7 +765,7 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
   have_mbstate_t=yes, have_mbstate_t=no)
   AC_MSG_RESULT($have_mbstate_t)
   if test x"$have_mbstate_t" = xyes; then
-    AC_DEFINE(HAVE_MBSTATE_T)
+    AC_DEFINE(HAVE_MBSTATE_T,1,[Define if mbstate_t exists in wchar.h.])
   fi
 
   if test x"$enable_c99" = x"yes"; then
@@ -789,7 +794,9 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
   ])
   AC_MSG_RESULT($ac_c99_math)
   if test x"$ac_c99_math" = x"yes"; then
-    AC_DEFINE(_GLIBCXX_USE_C99_MATH)
+    AC_DEFINE(_GLIBCXX_USE_C99_MATH, 1,
+              [Define if C99 functions or macros in <math.h> should be imported
+              in <cmath> in namespace std.])
   fi
 
   # Check for the existence of <complex.h> complex functions.
@@ -846,7 +853,10 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
   CXXFLAGS="$save_CXXFLAGS"
   AC_MSG_RESULT($ac_c99_complex)
   if test x"$ac_c99_complex" = x"yes"; then
-    AC_DEFINE(_GLIBCXX_USE_C99_COMPLEX)
+    AC_DEFINE(_GLIBCXX_USE_C99_COMPLEX, 1,
+              [Define if C99 functions in <complex.h> should be used in
+              <complex>. Using compiler builtins for these functions requires
+              corresponding C99 library functions to be present.])
   fi
 
   # Check for the existence in <stdio.h> of vscanf, et. al.
@@ -992,7 +1002,9 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
      test x"$ac_c99_wchar" = x"no"; then
     enable_c99=no;
   else
-    AC_DEFINE(_GLIBCXX_USE_C99)
+    AC_DEFINE(_GLIBCXX_USE_C99, 1,
+    [Define if C99 functions or macros from <wchar.h>, <math.h>,
+    <complex.h>, <stdio.h>, and <stdlib.h> can be used or exposed.])
   fi
 
   AC_LANG_RESTORE
@@ -1207,7 +1219,8 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
     AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
   fi
   if test $USE_NLS = yes; then
-    AC_DEFINE(_GLIBCXX_USE_NLS)
+    AC_DEFINE(_GLIBCXX_USE_NLS, 1, 
+              [Define if NLS translations are to be used.])
   fi
 
   AC_SUBST(USE_NLS)
@@ -1306,7 +1319,8 @@ dnl
 AC_DEFUN([GLIBCXX_ENABLE_CONCEPT_CHECKS], [
   GLIBCXX_ENABLE(concept-checks,$1,,[use Boost-derived template checks])
   if test $enable_concept_checks = yes; then
-    AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS)
+    AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS, 1,
+              [Define to use concept checking code from the boost libraries.])
   fi
 ])
 
@@ -1489,7 +1503,8 @@ dnl
 AC_DEFUN([GLIBCXX_ENABLE_LONG_LONG], [
   GLIBCXX_ENABLE(long-long,$1,,[enable template specializations for 'long long'])
   if test $enable_long_long = yes; then
-    AC_DEFINE(_GLIBCXX_USE_LONG_LONG)
+    AC_DEFINE(_GLIBCXX_USE_LONG_LONG, 1, 
+              [Define if code specialized for long long should be used.])
   fi
   AC_MSG_CHECKING([for enabled long long specializations])
   AC_MSG_RESULT([$enable_long_long])
@@ -1509,7 +1524,8 @@ dnl
 AC_DEFUN([GLIBCXX_ENABLE_WCHAR_T], [
   GLIBCXX_ENABLE(wchar_t,$1,,[enable template specializations for 'wchar_t'])
   if test x"$ac_c99_wchar" = x"yes" && test x"$enable_wchar_t" = x"yes"; then
-    AC_DEFINE(_GLIBCXX_USE_WCHAR_T)
+    AC_DEFINE(_GLIBCXX_USE_WCHAR_T, 1,
+              [Define if code specialized for wchar_t should be used.])
   fi
   AC_MSG_CHECKING([for enabled wchar_t specializations])
   AC_MSG_RESULT([$enable_wchar_t])
@@ -1743,7 +1759,8 @@ case $enable_symvers in
     ;;
   gnu)
     SYMVER_MAP=config/linker-map.gnu
-    AC_DEFINE(_GLIBCXX_SYMVER)
+    AC_DEFINE(_GLIBCXX_SYMVER, 1, 
+              [Define to use symbol versioning in the shared library.])
     ;;
 esac
 
@@ -1778,7 +1795,9 @@ AC_DEFUN([GLIBCXX_ENABLE_THREADS], [
   AC_MSG_RESULT([$target_thread_file])
 
   if test $target_thread_file != single; then
-    AC_DEFINE(HAVE_GTHR_DEFAULT)
+    AC_DEFINE(HAVE_GTHR_DEFAULT, 1,
+              [Define if gthr-default.h exists 
+              (meaning that threading support is enabled).])
   fi
 
   glibcxx_thread_h=gthr-$target_thread_file.h
@@ -1810,7 +1829,8 @@ AC_DEFUN([AC_LC_MESSAGES], [
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        ac_cv_val_LC_MESSAGES=yes, ac_cv_val_LC_MESSAGES=no)])
     if test $ac_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1, 
+                [Define if LC_MESSAGES is available in <locale.h>.])
     fi
   ])
 ])
diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in
index 03200d39d6407733c1ee21bd279b790022a384b8..f8afe1749bec6b9e4dd0b1592f3b704b49eef05b 100644
--- a/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@ -5,79 +5,6 @@
 #undef PACKAGE
 #undef VERSION
 
-
-// Define if code specialized for long long should be used.
-#undef _GLIBCXX_USE_LONG_LONG
-
-// Define if code specialized for wchar_t should be used.
-#undef _GLIBCXX_USE_WCHAR_T
-
-// Define if C99 functions or macros from <wchar.h>, <math.h>,
-// <complex.h>, <stdio.h>, and <stdlib.h> can be used or exposed.
-#undef _GLIBCXX_USE_C99
-
-// Define if C99 functions or macros in <math.h> should be imported in
-// <cmath> in namespace std.
-#undef _GLIBCXX_USE_C99_MATH
-
-// Define if C99 functions in <complex.h> should be used in
-// <complex>. Using compiler builtins for these functions requires
-// corresponding C99 library functions to be present.
-#undef _GLIBCXX_USE_C99_COMPLEX
-
-// Define if using setrlimit to set resource limits during 'make check'.
-#undef _GLIBCXX_RES_LIMITS
-
-// Define to use concept checking code from the boost libraries.
-#undef _GLIBCXX_CONCEPT_CHECKS
-
-// Define to use symbol versioning in the shared library.
-#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: _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 _GLIBCXX_ASM_SYMVER(cur, old, version)
-#endif
-
-// Define if LFS support is available.
-#undef _GLIBCXX_USE_LFS
-
-// Define if a fully dynamic basic_string is wanted.
-#undef _GLIBCXX_FULLY_DYNAMIC_STRING
-
-// Define if NLS translations are to be used.
-#undef _GLIBCXX_USE_NLS
-
-// Define if gthr-default.h exists (meaning that threading support is enabled).
-#undef HAVE_GTHR_DEFAULT
-
-// Define if mbstate_t exists in wchar.h.
-#undef HAVE_MBSTATE_T
-
-// Define if poll is available in <poll.h>.
-#undef HAVE_POLL
-
-// Define if S_ISREG (Posix) is available in <sys/stat.h>.
-#undef HAVE_S_ISREG
-
-// Define if S_IFREG is available in <sys/stat.h>.
-#undef HAVE_S_IFREG
-
-// Define if writev is available in <sys/uio.h>.
-#undef HAVE_WRITEV
-
-// Define if int64_t is available in <stdint.h>.
-#undef HAVE_INT64_T
-
-// Define if LC_MESSAGES is available in <locale.h>.
-#undef HAVE_LC_MESSAGES
-
 // Define if <float.h> exists.
 #undef HAVE_FLOAT_H
 
@@ -193,6 +120,10 @@
 /* Define to 1 if you have the `getpagesize' function. */
 #undef HAVE_GETPAGESIZE
 
+/* Define if gthr-default.h exists (meaning that threading support is
+   enabled). */
+#undef HAVE_GTHR_DEFAULT
+
 /* Define to 1 if you have the `hypot' function. */
 #undef HAVE_HYPOT
 
@@ -214,6 +145,9 @@
 /* Define to 1 if you have the <ieeefp.h> header file. */
 #undef HAVE_IEEEFP_H
 
+/* Define if int64_t is available in <stdint.h>. */
+#undef HAVE_INT64_T
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -238,6 +172,9 @@
 /* Defined if iswblank exists. */
 #undef HAVE_ISWBLANK
 
+/* Define if LC_MESSAGES is available in <locale.h>. */
+#undef HAVE_LC_MESSAGES
+
 /* Define to 1 if you have the `ldexpf' function. */
 #undef HAVE_LDEXPF
 
@@ -286,6 +223,9 @@
 /* Define to 1 if you have the <machine/param.h> header file. */
 #undef HAVE_MACHINE_PARAM_H
 
+/* Define if mbstate_t exists in wchar.h. */
+#undef HAVE_MBSTATE_T
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -307,6 +247,9 @@
 /* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
+/* Define if poll is available in <poll.h>. */
+#undef HAVE_POLL
+
 /* Define to 1 if you have the `powf' function. */
 #undef HAVE_POWF
 
@@ -403,6 +346,12 @@
 /* Define to 1 if you have the <sys/uio.h> header file. */
 #undef HAVE_SYS_UIO_H
 
+/* Define if S_IFREG is available in <sys/stat.h>. */
+#undef HAVE_S_IFREG
+
+/* Define if S_IFREG is available in <sys/stat.h>. */
+#undef HAVE_S_ISREG
+
 /* Define to 1 if you have the `tanf' function. */
 #undef HAVE_TANF
 
@@ -436,6 +385,9 @@
 /* Define to 1 if you have the <wctype.h> header file. */
 #undef HAVE_WCTYPE_H
 
+/* Define if writev is available in <sys/uio.h>. */
+#undef HAVE_WRITEV
+
 /* Define to 1 if you have the `_acosf' function. */
 #undef HAVE__ACOSF
 
@@ -697,15 +649,63 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Define to use concept checking code from the boost libraries. */
+#undef _GLIBCXX_CONCEPT_CHECKS
+
+/* Define if a fully dynamic basic_string is wanted. */
+#undef _GLIBCXX_FULLY_DYNAMIC_STRING
+
 /* Define to 1 if a full hosted library is built, or 0 if freestanding. */
 #undef _GLIBCXX_HOSTED
 
+/* Define if using setrlimit to set resource limits during "make check" */
+#undef _GLIBCXX_RES_LIMITS
+
 /* Define if the compiler is configured for setjmp/longjmp exceptions. */
 #undef _GLIBCXX_SJLJ_EXCEPTIONS
 
+/* Define to use symbol versioning in the shared library. */
+#undef _GLIBCXX_SYMVER
+
+/* Define if C99 functions or macros from <wchar.h>, <math.h>, <complex.h>,
+   <stdio.h>, and <stdlib.h> can be used or exposed. */
+#undef _GLIBCXX_USE_C99
+
+/* Define if C99 functions in <complex.h> should be used in <complex>. Using
+   compiler builtins for these functions requires corresponding C99 library
+   functions to be present. */
+#undef _GLIBCXX_USE_C99_COMPLEX
+
+/* Define if C99 functions or macros in <math.h> should be imported in <cmath>
+   in namespace std. */
+#undef _GLIBCXX_USE_C99_MATH
+
 /* Define if iconv and related functions exist and are usable. */
 #undef _GLIBCXX_USE_ICONV
+
+/* Define if LFS support is available. */
+#undef _GLIBCXX_USE_LFS
+
+/* Define if code specialized for long long should be used. */
+#undef _GLIBCXX_USE_LONG_LONG
+
+/* Define if NLS translations are to be used. */
+#undef _GLIBCXX_USE_NLS
+
+/* Define if code specialized for wchar_t should be used. */
+#undef _GLIBCXX_USE_WCHAR_T
 //
+// Define symbol versioning in assember directives. If symbol
+// versioning is beigng used, and the assembler supports this kind of
+// thing, then use it.
+// 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 _GLIBCXX_ASM_SYMVER(cur, old, version)
+#endif
+
 // Systems that have certain non-standard functions prefixed with an
 // underscore, we'll handle those here. Must come after config.h.in.
 //
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 778483ec105273bf5a0eb5d648305cad2730063a..6c6ab64762736d84fac39fa37d34bbde7e730123 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -6210,7 +6210,8 @@ fi
 
   fi
   if test $USE_NLS = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_NLS 1
 _ACEOF
 
@@ -6553,7 +6554,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   echo "$as_me:$LINENO: result: $have_mbstate_t" >&5
 echo "${ECHO_T}$have_mbstate_t" >&6
   if test x"$have_mbstate_t" = xyes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_MBSTATE_T 1
 _ACEOF
 
@@ -6641,7 +6643,8 @@ fi
   echo "$as_me:$LINENO: result: $ac_c99_math" >&5
 echo "${ECHO_T}$ac_c99_math" >&6
   if test x"$ac_c99_math" = x"yes"; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_MATH 1
 _ACEOF
 
@@ -6897,7 +6900,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   echo "$as_me:$LINENO: result: $ac_c99_complex" >&5
 echo "${ECHO_T}$ac_c99_complex" >&6
   if test x"$ac_c99_complex" = x"yes"; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_COMPLEX 1
 _ACEOF
 
@@ -7568,7 +7572,8 @@ echo "${ECHO_T}$ac_c99_wchar" >&6
      test x"$ac_c99_wchar" = x"no"; then
     enable_c99=no;
   else
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99 1
 _ACEOF
 
@@ -7604,7 +7609,8 @@ else
 fi;
 
   if test $enable_long_long = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_LONG_LONG 1
 _ACEOF
 
@@ -7631,7 +7637,8 @@ else
 fi;
 
   if test x"$ac_c99_wchar" = x"yes" && test x"$enable_wchar_t" = x"yes"; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_WCHAR_T 1
 _ACEOF
 
@@ -7658,7 +7665,8 @@ else
 fi;
 
   if test $enable_concept_checks = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_CONCEPT_CHECKS 1
 _ACEOF
 
@@ -7763,7 +7771,8 @@ else
 fi;
 
   if test $enable_fully_dynamic_string = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_FULLY_DYNAMIC_STRING 1
 _ACEOF
 
@@ -7779,7 +7788,8 @@ echo $ECHO_N "checking for thread model used by GCC... $ECHO_C" >&6
 echo "${ECHO_T}$target_thread_file" >&6
 
   if test $target_thread_file != single; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_GTHR_DEFAULT 1
 _ACEOF
 
@@ -29148,7 +29158,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_POLL = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_POLL 1
 _ACEOF
 
@@ -29276,12 +29287,14 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_S_ISREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_ISREG 1
 _ACEOF
 
   elif test $glibcxx_cv_S_IFREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_IFREG 1
 _ACEOF
 
@@ -29500,7 +29513,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_WRITEV = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_WRITEV 1
 _ACEOF
 
@@ -29562,7 +29576,8 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
   if test $glibcxx_cv_INT64_T = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_INT64_T 1
 _ACEOF
 
@@ -29649,7 +29664,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_LFS = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_LFS 1
 _ACEOF
 
@@ -29863,7 +29879,8 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$ac_cv_val_LC_MESSAGES" >&6
     if test $ac_cv_val_LC_MESSAGES = yes; then
-      cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_LC_MESSAGES 1
 _ACEOF
 
@@ -51751,7 +51768,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_POLL = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_POLL 1
 _ACEOF
 
@@ -51879,12 +51897,14 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_S_ISREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_ISREG 1
 _ACEOF
 
   elif test $glibcxx_cv_S_IFREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_IFREG 1
 _ACEOF
 
@@ -52103,7 +52123,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_WRITEV = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_WRITEV 1
 _ACEOF
 
@@ -73415,12 +73436,14 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_S_ISREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_ISREG 1
 _ACEOF
 
   elif test $glibcxx_cv_S_IFREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_IFREG 1
 _ACEOF
 
@@ -77812,7 +77835,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_POLL = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_POLL 1
 _ACEOF
 
@@ -77940,12 +77964,14 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_S_ISREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_ISREG 1
 _ACEOF
 
   elif test $glibcxx_cv_S_IFREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_IFREG 1
 _ACEOF
 
@@ -78164,7 +78190,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_WRITEV = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_WRITEV 1
 _ACEOF
 
@@ -82587,7 +82614,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_POLL = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_POLL 1
 _ACEOF
 
@@ -82715,12 +82743,14 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_S_ISREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_ISREG 1
 _ACEOF
 
   elif test $glibcxx_cv_S_IFREG = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_S_IFREG 1
 _ACEOF
 
@@ -82939,7 +82969,8 @@ rm -f conftest.err conftest.$ac_objext \
 fi
 
   if test $glibcxx_cv_WRITEV = yes; then
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_WRITEV 1
 _ACEOF
 
@@ -86821,7 +86852,8 @@ case $enable_symvers in
     ;;
   gnu)
     SYMVER_MAP=config/linker-map.gnu
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_SYMVER 1
 _ACEOF
 
@@ -87338,7 +87370,8 @@ fi
 echo $ECHO_N "checking for testsuite resource limits support... $ECHO_C" >&6
   if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
     ac_res_limits=yes
-    cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_RES_LIMITS 1
 _ACEOF