libgomp/

* acinclude.m4 (LIBGOMP_CHECK_SYNC_BUILTINS) (LIBGOMP_CHECK_ATTRIBUTE_VISIBILITY) (LIBGOMP_CHECK_ATTRIBUTE_DLLEXPORT) (LIBGOMP_CHECK_ATTRIBUTE_ALIAS): Fix cache variable names. * configure: Regenerate. * Makefile.in, testsuite/Makefile.in: Likewise. libstdc++-v3/ * acinclude.m4 (GLIBCXX_CHECK_SETRLIMIT, GLIBCXX_ENABLE_C99) (GLIBCXX_CHECK_C99_TR1, GLIBCXX_CHECK_RANDOM_TR1) (GLIBCXX_ENABLE_VISIBILITY): Fix cache variable names. (GLIBCXX_CHECK_SYSTEM_ERROR): Likewise. Factorize. * configure: Regenerate. libgfortran/ * acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY) (LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT) (LIBGFOR_CHECK_ATTRIBUTE_ALIAS, LIBGFOR_CHECK_SYNC_FETCH_AND_ADD) (LIBGFOR_GTHREAD_WEAK, LIBGFOR_CHECK_UNLINK_OPEN_FILE) (LIBGFOR_CHECK_CRLF, LIBGFOR_CHECK_FOR_BROKEN_ISFINITE) (LIBGFOR_CHECK_FOR_BROKEN_ISNAN) (LIBGFOR_CHECK_FOR_BROKEN_FPCLASSIFY, LIBGFOR_CHECK_WORKING_STAT) (LIBGFOR_CHECK_FPSETMASK, LIBGFOR_CHECK_MINGW_SNPRINTF): Fix cache variable names. * configure, Makefile.in: Regenerate. From-SVN: r134531
author: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2008-04-21 20:55:19 +0000
committer: Ralf Wildenhues <rwild@gcc.gnu.org> 2008-04-21 20:55:19 +0000
commit: 6d26724a16948f970b5511c840d498a4ebd56b1f (patch)
tree: a9ebf81cc4fab63cc6f1b4ac86232311a396d3af
parent: b60db1bae78b40ecca246f787e5661d1de779f3a (diff)
download: gcc-6d26724a16948f970b5511c840d498a4ebd56b1f.zip
gcc-6d26724a16948f970b5511c840d498a4ebd56b1f.tar.gz
gcc-6d26724a16948f970b5511c840d498a4ebd56b1f.tar.bz2
12 files changed, 528 insertions, 637 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8ef3e0f..434f9df 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* acinclude.m4 (LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY)
+	(LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT)
+	(LIBGFOR_CHECK_ATTRIBUTE_ALIAS, LIBGFOR_CHECK_SYNC_FETCH_AND_ADD)
+	(LIBGFOR_GTHREAD_WEAK, LIBGFOR_CHECK_UNLINK_OPEN_FILE)
+	(LIBGFOR_CHECK_CRLF, LIBGFOR_CHECK_FOR_BROKEN_ISFINITE)
+	(LIBGFOR_CHECK_FOR_BROKEN_ISNAN)
+	(LIBGFOR_CHECK_FOR_BROKEN_FPCLASSIFY, LIBGFOR_CHECK_WORKING_STAT)
+	(LIBGFOR_CHECK_FPSETMASK, LIBGFOR_CHECK_MINGW_SNPRINTF):
+	Fix cache variable names.
+	* configure, Makefile.in: Regenerate.
+
 2008-04-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR fortran/35991
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 71eb44e..4219260 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -51,6 +51,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/multi.m4 \
+	$(top_srcdir)/../config/override.m4 \
 	$(top_srcdir)/../config/proginstall.m4 \
 	$(top_srcdir)/../config/stdint.m4 \
 	$(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
diff --git a/libgfortran/acinclude.m4 b/libgfortran/acinclude.m4
index 4438061..d1994b4 100644
--- a/libgfortran/acinclude.m4
+++ b/libgfortran/acinclude.m4
@@ -30,14 +30,14 @@ AC_DEFUN([AC_PROG_LD])
 dnl Check whether the target supports hidden visibility.
 AC_DEFUN([LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY], [
   AC_CACHE_CHECK([whether the target supports hidden visibility],
-		 have_attribute_visibility, [
+		 libgfor_cv_have_attribute_visibility, [
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Werror"
   AC_TRY_COMPILE([void __attribute__((visibility("hidden"))) foo(void) { }],
-		 [], have_attribute_visibility=yes,
-		 have_attribute_visibility=no)
+		 [], libgfor_cv_have_attribute_visibility=yes,
+		 libgfor_cv_have_attribute_visibility=no)
   CFLAGS="$save_CFLAGS"])
-  if test $have_attribute_visibility = yes; then
+  if test $libgfor_cv_have_attribute_visibility = yes; then
     AC_DEFINE(HAVE_ATTRIBUTE_VISIBILITY, 1,
       [Define to 1 if the target supports __attribute__((visibility(...))).])
   fi])
@@ -45,14 +45,14 @@ AC_DEFUN([LIBGFOR_CHECK_ATTRIBUTE_VISIBILITY], [
 dnl Check whether the target supports dllexport
 AC_DEFUN([LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT], [
   AC_CACHE_CHECK([whether the target supports dllexport],
-		 have_attribute_dllexport, [
+		 libgfor_cv_have_attribute_dllexport, [
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Werror"
   AC_TRY_COMPILE([void __attribute__((dllexport)) foo(void) { }],
-		 [], have_attribute_dllexport=yes,
-		 have_attribute_dllexport=no)
+		 [], libgfor_cv_have_attribute_dllexport=yes,
+		 libgfor_cv_have_attribute_dllexport=no)
   CFLAGS="$save_CFLAGS"])
-  if test $have_attribute_dllexport = yes; then
+  if test $libgfor_cv_have_attribute_dllexport = yes; then
     AC_DEFINE(HAVE_ATTRIBUTE_DLLEXPORT, 1,
       [Define to 1 if the target supports __attribute__((dllexport)).])
   fi])
@@ -60,12 +60,12 @@ AC_DEFUN([LIBGFOR_CHECK_ATTRIBUTE_DLLEXPORT], [
 dnl Check whether the target supports symbol aliases.
 AC_DEFUN([LIBGFOR_CHECK_ATTRIBUTE_ALIAS], [
   AC_CACHE_CHECK([whether the target supports symbol aliases],
-		 have_attribute_alias, [
+		 libgfor_cv_have_attribute_alias, [
   AC_TRY_LINK([
 void foo(void) { }
 extern void bar(void) __attribute__((alias("foo")));],
-    [bar();], have_attribute_alias=yes, have_attribute_alias=no)])
-  if test $have_attribute_alias = yes; then
+    [bar();], libgfor_cv_have_attribute_alias=yes, libgfor_cv_have_attribute_alias=no)])
+  if test $libgfor_cv_have_attribute_alias = yes; then
     AC_DEFINE(HAVE_ATTRIBUTE_ALIAS, 1,
       [Define to 1 if the target supports __attribute__((alias(...))).])
   fi])
@@ -73,12 +73,12 @@ extern void bar(void) __attribute__((alias("foo")));],
 dnl Check whether the target supports __sync_fetch_and_add.
 AC_DEFUN([LIBGFOR_CHECK_SYNC_FETCH_AND_ADD], [
   AC_CACHE_CHECK([whether the target supports __sync_fetch_and_add],
-		 have_sync_fetch_and_add, [
+		 libgfor_cv_have_sync_fetch_and_add, [
   AC_TRY_LINK([int foovar = 0;], [
 if (foovar <= 0) return __sync_fetch_and_add (&foovar, 1);
 if (foovar > 10) return __sync_add_and_fetch (&foovar, -1);],
-	      have_sync_fetch_and_add=yes, have_sync_fetch_and_add=no)])
-  if test $have_sync_fetch_and_add = yes; then
+	      libgfor_cv_have_sync_fetch_and_add=yes, libgfor_cv_have_sync_fetch_and_add=no)])
+  if test $libgfor_cv_have_sync_fetch_and_add = yes; then
     AC_DEFINE(HAVE_SYNC_FETCH_AND_ADD, 1,
 	      [Define to 1 if the target supports __sync_fetch_and_add])
   fi])
@@ -97,13 +97,13 @@ target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`])
 dnl Check for pragma weak.
 AC_DEFUN([LIBGFOR_GTHREAD_WEAK], [
   AC_CACHE_CHECK([whether pragma weak works],
-		 have_pragma_weak, [
+		 libgfor_cv_have_pragma_weak, [
   gfor_save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Wunknown-pragmas"
   AC_TRY_COMPILE([void foo (void);
 #pragma weak foo], [if (foo) foo ();],
-		 have_pragma_weak=yes, have_pragma_weak=no)])
-  if test $have_pragma_weak = yes; then
+		 libgfor_cv_have_pragma_weak=yes, libgfor_cv_have_pragma_weak=no)])
+  if test $libgfor_cv_have_pragma_weak = yes; then
     AC_DEFINE(SUPPORTS_WEAK, 1,
 	      [Define to 1 if the target supports #pragma weak])
   fi
@@ -117,7 +117,7 @@ AC_DEFUN([LIBGFOR_GTHREAD_WEAK], [
 dnl Check whether target can unlink a file still open.
 AC_DEFUN([LIBGFOR_CHECK_UNLINK_OPEN_FILE], [
   AC_CACHE_CHECK([whether the target can unlink an open file],
-                  have_unlink_open_file, [
+                  libgfor_cv_have_unlink_open_file, [
   AC_TRY_RUN([
 #include <errno.h>
 #include <fcntl.h>
@@ -140,19 +140,19 @@ int main ()
     return 0;
   else
     return 1;
-}], have_unlink_open_file=yes, have_unlink_open_file=no, [
+}], libgfor_cv_have_unlink_open_file=yes, libgfor_cv_have_unlink_open_file=no, [
 case "${target}" in
-  *mingw*) have_unlink_open_file=no ;;
-  *) have_unlink_open_file=yes;;
+  *mingw*) libgfor_cv_have_unlink_open_file=no ;;
+  *) libgfor_cv_have_unlink_open_file=yes;;
 esac])])
-if test x"$have_unlink_open_file" = xyes; then
+if test x"$libgfor_cv_have_unlink_open_file" = xyes; then
   AC_DEFINE(HAVE_UNLINK_OPEN_FILE, 1, [Define if target can unlink open files.])
 fi])
 
 dnl Check whether CRLF is the line terminator
 AC_DEFUN([LIBGFOR_CHECK_CRLF], [
   AC_CACHE_CHECK([whether the target has CRLF as line terminator],
-                  have_crlf, [
+                  libgfor_cv_have_crlf, [
   AC_TRY_RUN([
 /* This test program should exit with status 0 if system uses a CRLF as
    line terminator, and status 1 otherwise.  
@@ -187,12 +187,12 @@ int main ()
   else
     exit(1);
 #endif
-}], have_crlf=yes, have_crlf=no, [
+}], libgfor_cv_have_crlf=yes, libgfor_cv_have_crlf=no, [
 case "${target}" in
-  *mingw*) have_crlf=yes ;;
-  *) have_crlf=no;;
+  *mingw*) libgfor_cv_have_crlf=yes ;;
+  *) libgfor_cv_have_crlf=no;;
 esac])])
-if test x"$have_crlf" = xyes; then
+if test x"$libgfor_cv_have_crlf" = xyes; then
   AC_DEFINE(HAVE_CRLF, 1, [Define if CRLF is line terminator.])
 fi])
 
@@ -200,7 +200,7 @@ dnl Check whether isfinite is broken.
 dnl The most common problem is that it does not work on long doubles.
 AC_DEFUN([LIBGFOR_CHECK_FOR_BROKEN_ISFINITE], [
   AC_CACHE_CHECK([whether isfinite is broken],
-                  have_broken_isfinite, [
+                  libgfor_cv_have_broken_isfinite, [
   libgfor_check_for_broken_isfinite_save_LIBS=$LIBS
   LIBS="$LIBS -lm"
   AC_TRY_RUN([
@@ -217,13 +217,13 @@ int main ()
 #endif
 #endif
 return 0;
-}], have_broken_isfinite=no, have_broken_isfinite=yes, [
+}], libgfor_cv_have_broken_isfinite=no, libgfor_cv_have_broken_isfinite=yes, [
 case "${target}" in
-  hppa*-*-hpux*) have_broken_isfinite=yes ;;
-  *) have_broken_isfinite=no ;;
+  hppa*-*-hpux*) libgfor_cv_have_broken_isfinite=yes ;;
+  *) libgfor_cv_have_broken_isfinite=no ;;
 esac])]
   LIBS=$libgfor_check_for_broken_isfinite_save_LIBS)
-if test x"$have_broken_isfinite" = xyes; then
+if test x"$libgfor_cv_have_broken_isfinite" = xyes; then
   AC_DEFINE(HAVE_BROKEN_ISFINITE, 1, [Define if isfinite is broken.])
 fi])
 
@@ -231,7 +231,7 @@ dnl Check whether isnan is broken.
 dnl The most common problem is that it does not work on long doubles.
 AC_DEFUN([LIBGFOR_CHECK_FOR_BROKEN_ISNAN], [
   AC_CACHE_CHECK([whether isnan is broken],
-                  have_broken_isnan, [
+                  libgfor_cv_have_broken_isnan, [
   libgfor_check_for_broken_isnan_save_LIBS=$LIBS
   LIBS="$LIBS -lm"
   AC_TRY_RUN([
@@ -266,13 +266,13 @@ int main ()
 #endif
 #endif
 return 0;
-}], have_broken_isnan=no, have_broken_isnan=yes, [
+}], libgfor_cv_have_broken_isnan=no, libgfor_cv_have_broken_isnan=yes, [
 case "${target}" in
-  hppa*-*-hpux*) have_broken_isnan=yes ;;
-  *) have_broken_isnan=no ;;
+  hppa*-*-hpux*) libgfor_cv_have_broken_isnan=yes ;;
+  *) libgfor_cv_have_broken_isnan=no ;;
 esac])]
   LIBS=$libgfor_check_for_broken_isnan_save_LIBS)
-if test x"$have_broken_isnan" = xyes; then
+if test x"$libgfor_cv_have_broken_isnan" = xyes; then
   AC_DEFINE(HAVE_BROKEN_ISNAN, 1, [Define if isnan is broken.])
 fi])
 
@@ -280,7 +280,7 @@ dnl Check whether fpclassify is broken.
 dnl The most common problem is that it does not work on long doubles.
 AC_DEFUN([LIBGFOR_CHECK_FOR_BROKEN_FPCLASSIFY], [
   AC_CACHE_CHECK([whether fpclassify is broken],
-                  have_broken_fpclassify, [
+                  libgfor_cv_have_broken_fpclassify, [
   libgfor_check_for_broken_fpclassify_save_LIBS=$LIBS
   LIBS="$LIBS -lm"
   AC_TRY_RUN([
@@ -299,13 +299,13 @@ int main ()
 #endif
 #endif
 return 0;
-}], have_broken_fpclassify=no, have_broken_fpclassify=yes, [
+}], libgfor_cv_have_broken_fpclassify=no, libgfor_cv_have_broken_fpclassify=yes, [
 case "${target}" in
-  hppa*-*-hpux*) have_broken_fpclassify=yes ;;
-  *) have_broken_fpclassify=no ;;
+  hppa*-*-hpux*) libgfor_cv_have_broken_fpclassify=yes ;;
+  *) libgfor_cv_have_broken_fpclassify=no ;;
 esac])]
   LIBS=$libgfor_check_for_broken_fpclassify_save_LIBS)
-if test x"$have_broken_fpclassify" = xyes; then
+if test x"$libgfor_cv_have_broken_fpclassify" = xyes; then
   AC_DEFINE(HAVE_BROKEN_FPCLASSIFY, 1, [Define if fpclassify is broken.])
 fi])
 
@@ -314,7 +314,7 @@ dnl identify the file within the system. This is should be true for POSIX
 dnl systems; it is known to be false on mingw32.
 AC_DEFUN([LIBGFOR_CHECK_WORKING_STAT], [
   AC_CACHE_CHECK([whether the target stat is reliable],
-                  have_working_stat, [
+                  libgfor_cv_have_working_stat, [
   AC_TRY_RUN([
 #include <stdio.h>
 #include <sys/types.h>
@@ -335,18 +335,18 @@ int main ()
   fclose(f);
   fclose(g);
   return 0;
-}], have_working_stat=yes, have_working_stat=no, [
+}], libgfor_cv_have_working_stat=yes, libgfor_cv_have_working_stat=no, [
 case "${target}" in
-  *mingw*) have_working_stat=no ;;
-  *) have_working_stat=yes;;
+  *mingw*) libgfor_cv_have_working_stat=no ;;
+  *) libgfor_cv_have_working_stat=yes;;
 esac])])
-if test x"$have_working_stat" = xyes; then
+if test x"$libgfor_cv_have_working_stat" = xyes; then
   AC_DEFINE(HAVE_WORKING_STAT, 1, [Define if target has a reliable stat.])
 fi])
 
 dnl Checks for fpsetmask function.
 AC_DEFUN([LIBGFOR_CHECK_FPSETMASK], [
-  AC_CACHE_CHECK([whether fpsetmask is present], have_fpsetmask, [
+  AC_CACHE_CHECK([whether fpsetmask is present], libgfor_cv_have_fpsetmask, [
     AC_TRY_LINK([
 #if HAVE_FLOATINGPOINT_H
 # include <floatingpoint.h>
@@ -354,25 +354,25 @@ AC_DEFUN([LIBGFOR_CHECK_FPSETMASK], [
 #if HAVE_IEEEFP_H
 # include <ieeefp.h>
 #endif /* HAVE_IEEEFP_H */],[fpsetmask(0);],
-    eval "have_fpsetmask=yes", eval "have_fpsetmask=no")
+    eval "libgfor_cv_have_fpsetmask=yes", eval "libgfor_cv_have_fpsetmask=no")
   ])
-  if test x"$have_fpsetmask" = xyes; then
+  if test x"$libgfor_cv_have_fpsetmask" = xyes; then
     AC_DEFINE(HAVE_FPSETMASK, 1, [Define if you have fpsetmask.])
   fi
 ])
 
 dnl Check whether we have a mingw that provides a __mingw_snprintf function
 AC_DEFUN([LIBGFOR_CHECK_MINGW_SNPRINTF], [
-  AC_CACHE_CHECK([whether __mingw_snprintf is present], have_mingw_snprintf, [
+  AC_CACHE_CHECK([whether __mingw_snprintf is present], libgfor_cv_have_mingw_snprintf, [
     AC_TRY_LINK([
 #include <stdio.h>
 extern int __mingw_snprintf (char *, size_t, const char *, ...);
 ],[
 __mingw_snprintf (NULL, 0, "%d\n", 1);
 ],
-    eval "have_mingw_snprintf=yes", eval "have_mingw_snprintf=no")
+    eval "libgfor_cv_have_mingw_snprintf=yes", eval "libgfor_cv_have_mingw_snprintf=no")
   ])
-  if test x"$have_mingw_snprintf" = xyes; then
+  if test x"$libgfor_cv_have_mingw_snprintf" = xyes; then
     AC_DEFINE(HAVE_MINGW_SNPRINTF, 1, [Define if you have __mingw_snprintf.])
   fi
 ])
diff --git a/libgfortran/configure b/libgfortran/configure
index b026310..ec11960 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -32069,7 +32069,7 @@ fi
 
   echo "$as_me:$LINENO: checking whether isfinite is broken" >&5
 echo $ECHO_N "checking whether isfinite is broken... $ECHO_C" >&6
-if test "${have_broken_isfinite+set}" = set; then
+if test "${libgfor_cv_have_broken_isfinite+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32078,8 +32078,8 @@ else
   if test "$cross_compiling" = yes; then
 
 case "${target}" in
-  hppa*-*-hpux*) have_broken_isfinite=yes ;;
-  *) have_broken_isfinite=no ;;
+  hppa*-*-hpux*) libgfor_cv_have_broken_isfinite=yes ;;
+  *) libgfor_cv_have_broken_isfinite=no ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -32115,22 +32115,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_broken_isfinite=no
+  libgfor_cv_have_broken_isfinite=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-have_broken_isfinite=yes
+libgfor_cv_have_broken_isfinite=yes
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
   LIBS=$libgfor_check_for_broken_isfinite_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $have_broken_isfinite" >&5
-echo "${ECHO_T}$have_broken_isfinite" >&6
-if test x"$have_broken_isfinite" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_broken_isfinite" >&5
+echo "${ECHO_T}$libgfor_cv_have_broken_isfinite" >&6
+if test x"$libgfor_cv_have_broken_isfinite" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_BROKEN_ISFINITE 1
@@ -32142,7 +32142,7 @@ fi
 
   echo "$as_me:$LINENO: checking whether isnan is broken" >&5
 echo $ECHO_N "checking whether isnan is broken... $ECHO_C" >&6
-if test "${have_broken_isnan+set}" = set; then
+if test "${libgfor_cv_have_broken_isnan+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32151,8 +32151,8 @@ else
   if test "$cross_compiling" = yes; then
 
 case "${target}" in
-  hppa*-*-hpux*) have_broken_isnan=yes ;;
-  *) have_broken_isnan=no ;;
+  hppa*-*-hpux*) libgfor_cv_have_broken_isnan=yes ;;
+  *) libgfor_cv_have_broken_isnan=no ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -32206,22 +32206,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_broken_isnan=no
+  libgfor_cv_have_broken_isnan=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-have_broken_isnan=yes
+libgfor_cv_have_broken_isnan=yes
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
   LIBS=$libgfor_check_for_broken_isnan_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $have_broken_isnan" >&5
-echo "${ECHO_T}$have_broken_isnan" >&6
-if test x"$have_broken_isnan" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_broken_isnan" >&5
+echo "${ECHO_T}$libgfor_cv_have_broken_isnan" >&6
+if test x"$libgfor_cv_have_broken_isnan" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_BROKEN_ISNAN 1
@@ -32233,7 +32233,7 @@ fi
 
   echo "$as_me:$LINENO: checking whether fpclassify is broken" >&5
 echo $ECHO_N "checking whether fpclassify is broken... $ECHO_C" >&6
-if test "${have_broken_fpclassify+set}" = set; then
+if test "${libgfor_cv_have_broken_fpclassify+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32242,8 +32242,8 @@ else
   if test "$cross_compiling" = yes; then
 
 case "${target}" in
-  hppa*-*-hpux*) have_broken_fpclassify=yes ;;
-  *) have_broken_fpclassify=no ;;
+  hppa*-*-hpux*) libgfor_cv_have_broken_fpclassify=yes ;;
+  *) libgfor_cv_have_broken_fpclassify=no ;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -32281,22 +32281,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_broken_fpclassify=no
+  libgfor_cv_have_broken_fpclassify=no
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-have_broken_fpclassify=yes
+libgfor_cv_have_broken_fpclassify=yes
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
   LIBS=$libgfor_check_for_broken_fpclassify_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $have_broken_fpclassify" >&5
-echo "${ECHO_T}$have_broken_fpclassify" >&6
-if test x"$have_broken_fpclassify" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_broken_fpclassify" >&5
+echo "${ECHO_T}$libgfor_cv_have_broken_fpclassify" >&6
+if test x"$libgfor_cv_have_broken_fpclassify" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_BROKEN_FPCLASSIFY 1
@@ -32308,15 +32308,15 @@ fi
 
   echo "$as_me:$LINENO: checking whether the target stat is reliable" >&5
 echo $ECHO_N "checking whether the target stat is reliable... $ECHO_C" >&6
-if test "${have_working_stat+set}" = set; then
+if test "${libgfor_cv_have_working_stat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   if test "$cross_compiling" = yes; then
 
 case "${target}" in
-  *mingw*) have_working_stat=no ;;
-  *) have_working_stat=yes;;
+  *mingw*) libgfor_cv_have_working_stat=no ;;
+  *) libgfor_cv_have_working_stat=yes;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -32358,21 +32358,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_working_stat=yes
+  libgfor_cv_have_working_stat=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-have_working_stat=no
+libgfor_cv_have_working_stat=no
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $have_working_stat" >&5
-echo "${ECHO_T}$have_working_stat" >&6
-if test x"$have_working_stat" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_working_stat" >&5
+echo "${ECHO_T}$libgfor_cv_have_working_stat" >&6
+if test x"$libgfor_cv_have_working_stat" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_WORKING_STAT 1
@@ -32384,7 +32384,7 @@ fi
 
   echo "$as_me:$LINENO: checking whether __mingw_snprintf is present" >&5
 echo $ECHO_N "checking whether __mingw_snprintf is present... $ECHO_C" >&6
-if test "${have_mingw_snprintf+set}" = set; then
+if test "${libgfor_cv_have_mingw_snprintf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32435,20 +32435,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "have_mingw_snprintf=yes"
+  eval "libgfor_cv_have_mingw_snprintf=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "have_mingw_snprintf=no"
+eval "libgfor_cv_have_mingw_snprintf=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $have_mingw_snprintf" >&5
-echo "${ECHO_T}$have_mingw_snprintf" >&6
-  if test x"$have_mingw_snprintf" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_mingw_snprintf" >&5
+echo "${ECHO_T}$libgfor_cv_have_mingw_snprintf" >&6
+  if test x"$libgfor_cv_have_mingw_snprintf" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_MINGW_SNPRINTF 1
@@ -32540,7 +32540,7 @@ fi
 
   echo "$as_me:$LINENO: checking whether fpsetmask is present" >&5
 echo $ECHO_N "checking whether fpsetmask is present... $ECHO_C" >&6
-if test "${have_fpsetmask+set}" = set; then
+if test "${libgfor_cv_have_fpsetmask+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32592,20 +32592,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  eval "have_fpsetmask=yes"
+  eval "libgfor_cv_have_fpsetmask=yes"
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "have_fpsetmask=no"
+eval "libgfor_cv_have_fpsetmask=no"
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $have_fpsetmask" >&5
-echo "${ECHO_T}$have_fpsetmask" >&6
-  if test x"$have_fpsetmask" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_fpsetmask" >&5
+echo "${ECHO_T}$libgfor_cv_have_fpsetmask" >&6
+  if test x"$libgfor_cv_have_fpsetmask" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_FPSETMASK 1
@@ -32835,7 +32835,7 @@ FPU_HOST_HEADER=config/${fpu_host}.h
 
   echo "$as_me:$LINENO: checking whether the target supports hidden visibility" >&5
 echo $ECHO_N "checking whether the target supports hidden visibility... $ECHO_C" >&6
-if test "${have_attribute_visibility+set}" = set; then
+if test "${libgfor_cv_have_attribute_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32878,19 +32878,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_visibility=yes
+  libgfor_cv_have_attribute_visibility=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_visibility=no
+libgfor_cv_have_attribute_visibility=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $have_attribute_visibility" >&5
-echo "${ECHO_T}$have_attribute_visibility" >&6
-  if test $have_attribute_visibility = yes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_attribute_visibility" >&5
+echo "${ECHO_T}$libgfor_cv_have_attribute_visibility" >&6
+  if test $libgfor_cv_have_attribute_visibility = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ATTRIBUTE_VISIBILITY 1
@@ -32900,7 +32900,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target supports dllexport" >&5
 echo $ECHO_N "checking whether the target supports dllexport... $ECHO_C" >&6
-if test "${have_attribute_dllexport+set}" = set; then
+if test "${libgfor_cv_have_attribute_dllexport+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -32943,19 +32943,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_dllexport=yes
+  libgfor_cv_have_attribute_dllexport=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_dllexport=no
+libgfor_cv_have_attribute_dllexport=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $have_attribute_dllexport" >&5
-echo "${ECHO_T}$have_attribute_dllexport" >&6
-  if test $have_attribute_dllexport = yes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_attribute_dllexport" >&5
+echo "${ECHO_T}$libgfor_cv_have_attribute_dllexport" >&6
+  if test $libgfor_cv_have_attribute_dllexport = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ATTRIBUTE_DLLEXPORT 1
@@ -32965,7 +32965,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target supports symbol aliases" >&5
 echo $ECHO_N "checking whether the target supports symbol aliases... $ECHO_C" >&6
-if test "${have_attribute_alias+set}" = set; then
+if test "${libgfor_cv_have_attribute_alias+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -33013,19 +33013,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_alias=yes
+  libgfor_cv_have_attribute_alias=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_alias=no
+libgfor_cv_have_attribute_alias=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $have_attribute_alias" >&5
-echo "${ECHO_T}$have_attribute_alias" >&6
-  if test $have_attribute_alias = yes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_attribute_alias" >&5
+echo "${ECHO_T}$libgfor_cv_have_attribute_alias" >&6
+  if test $libgfor_cv_have_attribute_alias = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ATTRIBUTE_ALIAS 1
@@ -33037,7 +33037,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target supports __sync_fetch_and_add" >&5
 echo $ECHO_N "checking whether the target supports __sync_fetch_and_add... $ECHO_C" >&6
-if test "${have_sync_fetch_and_add+set}" = set; then
+if test "${libgfor_cv_have_sync_fetch_and_add+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -33085,19 +33085,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_sync_fetch_and_add=yes
+  libgfor_cv_have_sync_fetch_and_add=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_sync_fetch_and_add=no
+libgfor_cv_have_sync_fetch_and_add=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $have_sync_fetch_and_add" >&5
-echo "${ECHO_T}$have_sync_fetch_and_add" >&6
-  if test $have_sync_fetch_and_add = yes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_sync_fetch_and_add" >&5
+echo "${ECHO_T}$libgfor_cv_have_sync_fetch_and_add" >&6
+  if test $libgfor_cv_have_sync_fetch_and_add = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYNC_FETCH_AND_ADD 1
@@ -33130,7 +33130,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether pragma weak works" >&5
 echo $ECHO_N "checking whether pragma weak works... $ECHO_C" >&6
-if test "${have_pragma_weak+set}" = set; then
+if test "${libgfor_cv_have_pragma_weak+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -33174,18 +33174,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_pragma_weak=yes
+  libgfor_cv_have_pragma_weak=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_pragma_weak=no
+libgfor_cv_have_pragma_weak=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $have_pragma_weak" >&5
-echo "${ECHO_T}$have_pragma_weak" >&6
-  if test $have_pragma_weak = yes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_pragma_weak" >&5
+echo "${ECHO_T}$libgfor_cv_have_pragma_weak" >&6
+  if test $libgfor_cv_have_pragma_weak = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define SUPPORTS_WEAK 1
@@ -33206,15 +33206,15 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target can unlink an open file" >&5
 echo $ECHO_N "checking whether the target can unlink an open file... $ECHO_C" >&6
-if test "${have_unlink_open_file+set}" = set; then
+if test "${libgfor_cv_have_unlink_open_file+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   if test "$cross_compiling" = yes; then
 
 case "${target}" in
-  *mingw*) have_unlink_open_file=no ;;
-  *) have_unlink_open_file=yes;;
+  *mingw*) libgfor_cv_have_unlink_open_file=no ;;
+  *) libgfor_cv_have_unlink_open_file=yes;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -33258,21 +33258,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_unlink_open_file=yes
+  libgfor_cv_have_unlink_open_file=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-have_unlink_open_file=no
+libgfor_cv_have_unlink_open_file=no
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $have_unlink_open_file" >&5
-echo "${ECHO_T}$have_unlink_open_file" >&6
-if test x"$have_unlink_open_file" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_unlink_open_file" >&5
+echo "${ECHO_T}$libgfor_cv_have_unlink_open_file" >&6
+if test x"$libgfor_cv_have_unlink_open_file" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_UNLINK_OPEN_FILE 1
@@ -33284,15 +33284,15 @@ fi
 
   echo "$as_me:$LINENO: checking whether the target has CRLF as line terminator" >&5
 echo $ECHO_N "checking whether the target has CRLF as line terminator... $ECHO_C" >&6
-if test "${have_crlf+set}" = set; then
+if test "${libgfor_cv_have_crlf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   if test "$cross_compiling" = yes; then
 
 case "${target}" in
-  *mingw*) have_crlf=yes ;;
-  *) have_crlf=no;;
+  *mingw*) libgfor_cv_have_crlf=yes ;;
+  *) libgfor_cv_have_crlf=no;;
 esac
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -33348,21 +33348,21 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_crlf=yes
+  libgfor_cv_have_crlf=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-have_crlf=no
+libgfor_cv_have_crlf=no
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:$LINENO: result: $have_crlf" >&5
-echo "${ECHO_T}$have_crlf" >&6
-if test x"$have_crlf" = xyes; then
+echo "$as_me:$LINENO: result: $libgfor_cv_have_crlf" >&5
+echo "${ECHO_T}$libgfor_cv_have_crlf" >&6
+if test x"$libgfor_cv_have_crlf" = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_CRLF 1
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0b5ee15..7ad1189 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* acinclude.m4 (LIBGOMP_CHECK_SYNC_BUILTINS)
+	(LIBGOMP_CHECK_ATTRIBUTE_VISIBILITY)
+	(LIBGOMP_CHECK_ATTRIBUTE_DLLEXPORT)
+	(LIBGOMP_CHECK_ATTRIBUTE_ALIAS): Fix cache variable names.
+	* configure: Regenerate.
+	* Makefile.in, testsuite/Makefile.in: Likewise.
+
 2008-04-18  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR bootstrap/35457
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index a83df1e..0bdf077 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -55,6 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
 	$(top_srcdir)/../config/futex.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/multi.m4 \
+	$(top_srcdir)/../config/override.m4 \
 	$(top_srcdir)/../config/proginstall.m4 \
 	$(top_srcdir)/../config/stdint.m4 \
 	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \
diff --git a/libgomp/acinclude.m4 b/libgomp/acinclude.m4
index acf47df..f3cd089 100644
--- a/libgomp/acinclude.m4
+++ b/libgomp/acinclude.m4
@@ -4,10 +4,10 @@ dnl This whole bit snagged from libgfortran.
 dnl Check whether the target supports __sync_*_compare_and_swap.
 AC_DEFUN([LIBGOMP_CHECK_SYNC_BUILTINS], [
   AC_CACHE_CHECK([whether the target supports __sync_*_compare_and_swap],
-		 have_sync_builtins, [
+		 libgomp_cv_have_sync_builtins, [
   AC_TRY_LINK([], [int foo, bar; bar = __sync_val_compare_and_swap(&foo, 0, 1);],
-	      have_sync_builtins=yes, have_sync_builtins=no)])
-  if test $have_sync_builtins = yes; then
+	      libgomp_cv_have_sync_builtins=yes, libgomp_cv_have_sync_builtins=no)])
+  if test $libgomp_cv_have_sync_builtins = yes; then
     AC_DEFINE(HAVE_SYNC_BUILTINS, 1,
 	      [Define to 1 if the target supports __sync_*_compare_and_swap])
   fi])
@@ -15,14 +15,14 @@ AC_DEFUN([LIBGOMP_CHECK_SYNC_BUILTINS], [
 dnl Check whether the target supports hidden visibility.
 AC_DEFUN([LIBGOMP_CHECK_ATTRIBUTE_VISIBILITY], [
   AC_CACHE_CHECK([whether the target supports hidden visibility],
-		 have_attribute_visibility, [
+		 libgomp_cv_have_attribute_visibility, [
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Werror"
   AC_TRY_COMPILE([void __attribute__((visibility("hidden"))) foo(void) { }],
-		 [], have_attribute_visibility=yes,
-		 have_attribute_visibility=no)
+		 [], libgomp_cv_have_attribute_visibility=yes,
+		 libgomp_cv_have_attribute_visibility=no)
   CFLAGS="$save_CFLAGS"])
-  if test $have_attribute_visibility = yes; then
+  if test $libgomp_cv_have_attribute_visibility = yes; then
     AC_DEFINE(HAVE_ATTRIBUTE_VISIBILITY, 1,
       [Define to 1 if the target supports __attribute__((visibility(...))).])
   fi])
@@ -30,14 +30,14 @@ AC_DEFUN([LIBGOMP_CHECK_ATTRIBUTE_VISIBILITY], [
 dnl Check whether the target supports dllexport
 AC_DEFUN([LIBGOMP_CHECK_ATTRIBUTE_DLLEXPORT], [
   AC_CACHE_CHECK([whether the target supports dllexport],
-		 have_attribute_dllexport, [
+		 libgomp_cv_have_attribute_dllexport, [
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Werror"
   AC_TRY_COMPILE([void __attribute__((dllexport)) foo(void) { }],
-		 [], have_attribute_dllexport=yes,
-		 have_attribute_dllexport=no)
+		 [], libgomp_cv_have_attribute_dllexport=yes,
+		 libgomp_cv_have_attribute_dllexport=no)
   CFLAGS="$save_CFLAGS"])
-  if test $have_attribute_dllexport = yes; then
+  if test $libgomp_cv_have_attribute_dllexport = yes; then
     AC_DEFINE(HAVE_ATTRIBUTE_DLLEXPORT, 1,
       [Define to 1 if the target supports __attribute__((dllexport)).])
   fi])
@@ -45,12 +45,12 @@ AC_DEFUN([LIBGOMP_CHECK_ATTRIBUTE_DLLEXPORT], [
 dnl Check whether the target supports symbol aliases.
 AC_DEFUN([LIBGOMP_CHECK_ATTRIBUTE_ALIAS], [
   AC_CACHE_CHECK([whether the target supports symbol aliases],
-		 have_attribute_alias, [
+		 libgomp_cv_have_attribute_alias, [
   AC_TRY_LINK([
 void foo(void) { }
 extern void bar(void) __attribute__((alias("foo")));],
-    [bar();], have_attribute_alias=yes, have_attribute_alias=no)])
-  if test $have_attribute_alias = yes; then
+    [bar();], libgomp_cv_have_attribute_alias=yes, libgomp_cv_have_attribute_alias=no)])
+  if test $libgomp_cv_have_attribute_alias = yes; then
     AC_DEFINE(HAVE_ATTRIBUTE_ALIAS, 1,
       [Define to 1 if the target supports __attribute__((alias(...))).])
   fi])
diff --git a/libgomp/configure b/libgomp/configure
index 993908e..0fda5c7 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -17364,7 +17364,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target supports hidden visibility" >&5
 echo $ECHO_N "checking whether the target supports hidden visibility... $ECHO_C" >&6
-if test "${have_attribute_visibility+set}" = set; then
+if test "${libgomp_cv_have_attribute_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -17407,19 +17407,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_visibility=yes
+  libgomp_cv_have_attribute_visibility=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_visibility=no
+libgomp_cv_have_attribute_visibility=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $have_attribute_visibility" >&5
-echo "${ECHO_T}$have_attribute_visibility" >&6
-  if test $have_attribute_visibility = yes; then
+echo "$as_me:$LINENO: result: $libgomp_cv_have_attribute_visibility" >&5
+echo "${ECHO_T}$libgomp_cv_have_attribute_visibility" >&6
+  if test $libgomp_cv_have_attribute_visibility = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ATTRIBUTE_VISIBILITY 1
@@ -17429,7 +17429,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target supports dllexport" >&5
 echo $ECHO_N "checking whether the target supports dllexport... $ECHO_C" >&6
-if test "${have_attribute_dllexport+set}" = set; then
+if test "${libgomp_cv_have_attribute_dllexport+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -17472,19 +17472,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_dllexport=yes
+  libgomp_cv_have_attribute_dllexport=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_dllexport=no
+libgomp_cv_have_attribute_dllexport=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $have_attribute_dllexport" >&5
-echo "${ECHO_T}$have_attribute_dllexport" >&6
-  if test $have_attribute_dllexport = yes; then
+echo "$as_me:$LINENO: result: $libgomp_cv_have_attribute_dllexport" >&5
+echo "${ECHO_T}$libgomp_cv_have_attribute_dllexport" >&6
+  if test $libgomp_cv_have_attribute_dllexport = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ATTRIBUTE_DLLEXPORT 1
@@ -17494,7 +17494,7 @@ _ACEOF
 
   echo "$as_me:$LINENO: checking whether the target supports symbol aliases" >&5
 echo $ECHO_N "checking whether the target supports symbol aliases... $ECHO_C" >&6
-if test "${have_attribute_alias+set}" = set; then
+if test "${libgomp_cv_have_attribute_alias+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -17537,19 +17537,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_alias=yes
+  libgomp_cv_have_attribute_alias=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_alias=no
+libgomp_cv_have_attribute_alias=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $have_attribute_alias" >&5
-echo "${ECHO_T}$have_attribute_alias" >&6
-  if test $have_attribute_alias = yes; then
+echo "$as_me:$LINENO: result: $libgomp_cv_have_attribute_alias" >&5
+echo "${ECHO_T}$libgomp_cv_have_attribute_alias" >&6
+  if test $libgomp_cv_have_attribute_alias = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ATTRIBUTE_ALIAS 1
@@ -17997,7 +17997,7 @@ CFLAGS="$save_CFLAGS $XCFLAGS"
 
   echo "$as_me:$LINENO: checking whether the target supports __sync_*_compare_and_swap" >&5
 echo $ECHO_N "checking whether the target supports __sync_*_compare_and_swap... $ECHO_C" >&6
-if test "${have_sync_builtins+set}" = set; then
+if test "${libgomp_cv_have_sync_builtins+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -18038,19 +18038,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_sync_builtins=yes
+  libgomp_cv_have_sync_builtins=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_sync_builtins=no
+libgomp_cv_have_sync_builtins=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $have_sync_builtins" >&5
-echo "${ECHO_T}$have_sync_builtins" >&6
-  if test $have_sync_builtins = yes; then
+echo "$as_me:$LINENO: result: $libgomp_cv_have_sync_builtins" >&5
+echo "${ECHO_T}$libgomp_cv_have_sync_builtins" >&6
+  if test $libgomp_cv_have_sync_builtins = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYNC_BUILTINS 1
diff --git a/libgomp/testsuite/Makefile.in b/libgomp/testsuite/Makefile.in
index 5bb59b3..9c6163b 100644
--- a/libgomp/testsuite/Makefile.in
+++ b/libgomp/testsuite/Makefile.in
@@ -45,6 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
 	$(top_srcdir)/../config/futex.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
 	$(top_srcdir)/../config/multi.m4 \
+	$(top_srcdir)/../config/override.m4 \
 	$(top_srcdir)/../config/proginstall.m4 \
 	$(top_srcdir)/../config/stdint.m4 \
 	$(top_srcdir)/../config/tls.m4 $(top_srcdir)/../ltoptions.m4 \
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f4b180e..aef600c 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* acinclude.m4 (GLIBCXX_CHECK_SETRLIMIT, GLIBCXX_ENABLE_C99)
+	(GLIBCXX_CHECK_C99_TR1, GLIBCXX_CHECK_RANDOM_TR1)
+	(GLIBCXX_ENABLE_VISIBILITY): Fix cache variable names.
+	(GLIBCXX_CHECK_SYSTEM_ERROR): Likewise.  Factorize.
+	* configure: Regenerate.
+
 2008-04-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	PR libstdc++/35954
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index b25c5ad..108cc10 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -360,7 +360,7 @@ AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT], [
     GLIBCXX_CHECK_SETRLIMIT_ancilliary(FSIZE)
 
     # Check for rlimit, setrlimit.
-    AC_CACHE_VAL(ac_setrlimit, [
+    AC_CACHE_VAL(glibcxx_cv_setrlimit, [
       AC_TRY_COMPILE(
         [#include <unistd.h>
          #include <sys/time.h>
@@ -368,12 +368,12 @@ AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT], [
         ],
         [struct rlimit r;
          setrlimit(0, &r);],
-        [ac_setrlimit=yes], [ac_setrlimit=no])
+        [glibcxx_cv_setrlimit=yes], [glibcxx_cv_setrlimit=no])
     ])
   fi
 
   AC_MSG_CHECKING([for testsuite resource limits support])
-  if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
+  if test $setrlimit_have_headers = yes && test $glibcxx_cv_setrlimit = yes; then
     ac_res_limits=yes
     AC_DEFINE(_GLIBCXX_RES_LIMITS, 1,
               [Define if using setrlimit to set resource limits during
@@ -801,7 +801,7 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
 
   # Check for the existence of <math.h> functions used if C99 is enabled.
   AC_MSG_CHECKING([for ISO C99 support in <math.h>])
-  AC_CACHE_VAL(ac_c99_math, [
+  AC_CACHE_VAL(glibcxx_cv_c99_math, [
   GCC_TRY_COMPILE_OR_LINK(
      [#include <math.h>
       volatile double d1, d2;
@@ -819,10 +819,10 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
       i = islessgreater(d1, d2);
       i = islessgreater(d1, d2);
       i = isunordered(d1, d2);
-     ],[ac_c99_math=yes], [ac_c99_math=no])
+     ],[glibcxx_cv_c99_math=yes], [glibcxx_cv_c99_math=no])
   ])
-  AC_MSG_RESULT($ac_c99_math)
-  if test x"$ac_c99_math" = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_c99_math)
+  if test x"$glibcxx_cv_c99_math" = x"yes"; then
     AC_DEFINE(_GLIBCXX_USE_C99_MATH, 1,
               [Define if C99 functions or macros in <math.h> should be imported
               in <cmath> in namespace std.])
@@ -834,7 +834,7 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
   # to the library function is emitted.
   AC_CHECK_HEADERS(tgmath.h, ac_has_tgmath_h=yes, ac_has_tgmath_h=no)
   AC_CHECK_HEADERS(complex.h, ac_has_complex_h=yes, ac_has_complex_h=no)
-  ac_c99_complex=no;
+  glibcxx_cv_c99_complex=no;
   if test x"$ac_has_complex_h" = x"yes"; then
     AC_MSG_CHECKING([for ISO C99 support in <complex.h>])
     GCC_TRY_COMPILE_OR_LINK(
@@ -884,10 +884,10 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
 	tmpld = ctanl(tmpld);
 	tmpld = ctanhl(tmpld);
 	tmpld = cpowl(tmpld, tmpld);
-       ],[ac_c99_complex=yes], [ac_c99_complex=no])
+       ],[glibcxx_cv_c99_complex=yes], [glibcxx_cv_c99_complex=no])
   fi
-  AC_MSG_RESULT($ac_c99_complex)
-  if test x"$ac_c99_complex" = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_c99_complex)
+  if test x"$glibcxx_cv_c99_complex" = x"yes"; then
     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
@@ -896,7 +896,7 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
 
   # Check for the existence in <stdio.h> of vscanf, et. al.
   AC_MSG_CHECKING([for ISO C99 support in <stdio.h>])
-  AC_CACHE_VAL(ac_c99_stdio, [
+  AC_CACHE_VAL(glibcxx_cv_c99_stdio, [
   GCC_TRY_COMPILE_OR_LINK(
      [#include <stdio.h>
       #include <stdarg.h>
@@ -909,13 +909,13 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
 	vsscanf(fmt, "%i", args);
       }],
      [snprintf("12", 0, "%i");],
-     [ac_c99_stdio=yes], [ac_c99_stdio=no])
+     [glibcxx_cv_c99_stdio=yes], [glibcxx_cv_c99_stdio=no])
   ])
-  AC_MSG_RESULT($ac_c99_stdio)
+  AC_MSG_RESULT($glibcxx_cv_c99_stdio)
 
   # Check for the existence in <stdlib.h> of lldiv_t, et. al.
   AC_MSG_CHECKING([for ISO C99 support in <stdlib.h>])
-  AC_CACHE_VAL(ac_c99_stdlib, [
+  AC_CACHE_VAL(glibcxx_cv_c99_stdlib, [
   GCC_TRY_COMPILE_OR_LINK(
      [#include <stdlib.h>
       volatile float f;
@@ -933,12 +933,12 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
       ll = mydivt.rem;
       ll = atoll("10");
       _Exit(0);
-      ],[ac_c99_stdlib=yes], [ac_c99_stdlib=no])
+      ],[glibcxx_cv_c99_stdlib=yes], [glibcxx_cv_c99_stdlib=no])
   ])
-  AC_MSG_RESULT($ac_c99_stdlib)
+  AC_MSG_RESULT($glibcxx_cv_c99_stdlib)
 
   # Check for the existence in <wchar.h> of wcstold, etc.
-  ac_c99_wchar=no;
+  glibcxx_cv_c99_wchar=no;
   if test x"$ac_has_wchar_h" = xyes &&
      test x"$ac_has_wctype_h" = xyes; then
     AC_MSG_CHECKING([for ISO C99 support in <wchar.h>])	
@@ -949,7 +949,7 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
 		      using ::wcstoll;
 		      using ::wcstoull;
 		    }
-		   ],[],[ac_c99_wchar=yes], [ac_c99_wchar=no])
+		   ],[],[glibcxx_cv_c99_wchar=yes], [glibcxx_cv_c99_wchar=no])
 
     # Checks for wide character functions that may not be present.
     # Injection of these is wrapped with guard macros.
@@ -978,15 +978,15 @@ AC_DEFUN([GLIBCXX_ENABLE_C99], [
  	    	   [AC_DEFINE(HAVE_ISWBLANK,1,
 			[Defined if iswblank exists.])],[])
 
-    AC_MSG_RESULT($ac_c99_wchar)
+    AC_MSG_RESULT($glibcxx_cv_c99_wchar)
   fi
 
   # Option parsed, now set things appropriately.
-  if test x"$ac_c99_math" = x"no" ||
-     test x"$ac_c99_complex" = x"no" ||
-     test x"$ac_c99_stdio" = x"no" ||
-     test x"$ac_c99_stdlib" = x"no" ||
-     test x"$ac_c99_wchar" = x"no"; then
+  if test x"$glibcxx_cv_c99_math" = x"no" ||
+     test x"$glibcxx_cv_c99_complex" = x"no" ||
+     test x"$glibcxx_cv_c99_stdio" = x"no" ||
+     test x"$glibcxx_cv_c99_stdlib" = x"no" ||
+     test x"$glibcxx_cv_c99_wchar" = x"no"; then
     enable_c99=no;
   else
     AC_DEFINE(_GLIBCXX_USE_C99, 1,
@@ -1059,15 +1059,15 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
 
   # Check for the existence of <ctype.h> functions.
   AC_MSG_CHECKING([for ISO C99 support to TR1 in <ctype.h>])
-  AC_CACHE_VAL(ac_c99_ctype_tr1, [
+  AC_CACHE_VAL(glibcxx_cv_c99_ctype_tr1, [
   AC_TRY_COMPILE([#include <ctype.h>],
 	         [int ch;
 	          int ret;
 	          ret = isblank(ch);
-		 ],[ac_c99_ctype_tr1=yes], [ac_c99_ctype_tr1=no])
+		 ],[glibcxx_cv_c99_ctype_tr1=yes], [glibcxx_cv_c99_ctype_tr1=no])
   ])
-  AC_MSG_RESULT($ac_c99_ctype_tr1)
-  if test x"$ac_c99_ctype_tr1" = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_c99_ctype_tr1)
+  if test x"$glibcxx_cv_c99_ctype_tr1" = x"yes"; then
     AC_DEFINE(_GLIBCXX_USE_C99_CTYPE_TR1, 1,
               [Define if C99 functions in <ctype.h> should be imported in
 	      <tr1/cctype> in namespace std::tr1.])
@@ -1105,7 +1105,7 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
 
   # Check for the existence of <stdint.h> types.
   AC_MSG_CHECKING([for ISO C99 support to TR1 in <stdint.h>])
-  AC_CACHE_VAL(ac_c99_stdint_tr1, [
+  AC_CACHE_VAL(glibcxx_cv_c99_stdint_tr1, [
   AC_TRY_COMPILE([#include <stdint.h>],
 	         [typedef int8_t          my_int8_t;
 	          typedef int16_t         my_int16_t;
@@ -1135,10 +1135,10 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
 	          typedef uint_least64_t  my_uint_least64_t;
 		  typedef uintmax_t       my_uintmax_t;
 		  typedef uintptr_t       my_uintptr_t;
-		 ],[ac_c99_stdint_tr1=yes], [ac_c99_stdint_tr1=no])
+		 ],[glibcxx_cv_c99_stdint_tr1=yes], [glibcxx_cv_c99_stdint_tr1=no])
   ])
-  AC_MSG_RESULT($ac_c99_stdint_tr1)
-  if test x"$ac_c99_stdint_tr1" = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_c99_stdint_tr1)
+  if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
     AC_DEFINE(_GLIBCXX_USE_C99_STDINT_TR1, 1,
               [Define if C99 types in <stdint.h> should be imported in
 	      <tr1/cstdint> in namespace std::tr1.])
@@ -1146,7 +1146,7 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
 
   # Check for the existence of <math.h> functions.
   AC_MSG_CHECKING([for ISO C99 support to TR1 in <math.h>])
-  AC_CACHE_VAL(ac_c99_math_tr1, [
+  AC_CACHE_VAL(glibcxx_cv_c99_math_tr1, [
   AC_TRY_COMPILE([#include <math.h>],
 	         [typedef double_t  my_double_t;
 	          typedef float_t   my_float_t;
@@ -1255,10 +1255,10 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
 	          trunc(0.0);
 	          truncf(0.0f);
 	          truncl(0.0l);
-		 ],[ac_c99_math_tr1=yes], [ac_c99_math_tr1=no])
+		 ],[glibcxx_cv_c99_math_tr1=yes], [glibcxx_cv_c99_math_tr1=no])
   ])
-  AC_MSG_RESULT($ac_c99_math_tr1)
-  if test x"$ac_c99_math_tr1" = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_c99_math_tr1)
+  if test x"$glibcxx_cv_c99_math_tr1" = x"yes"; then
     AC_DEFINE(_GLIBCXX_USE_C99_MATH_TR1, 1,
               [Define if C99 functions or macros in <math.h> should be imported
               in <tr1/cmath> in namespace std::tr1.])
@@ -1267,7 +1267,7 @@ AC_DEFUN([GLIBCXX_CHECK_C99_TR1], [
   # Check for the existence of <inttypes.h> functions (NB: doesn't make
   # sense if the previous check fails, per C99, 7.8/1).
   ac_c99_inttypes_tr1=no;
-  if test x"$ac_c99_stdint_tr1" = x"yes"; then
+  if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
     AC_MSG_CHECKING([for ISO C99 support to TR1 in <inttypes.h>])
     AC_TRY_COMPILE([#include <inttypes.h>],
 	           [intmax_t i, numer, denom, base;
@@ -1300,7 +1300,7 @@ dnl
 AC_DEFUN([GLIBCXX_CHECK_RANDOM_TR1], [
 
   AC_MSG_CHECKING([for "dev/random" and "dev/urandom" for TR1 random_device])
-  AC_CACHE_VAL(ac_random_tr1, [
+  AC_CACHE_VAL(glibcxx_cv_random_tr1, [
   AC_TRY_RUN([#include <stdio.h>
 	      int main()
 	      {
@@ -1308,11 +1308,11 @@ AC_DEFUN([GLIBCXX_CHECK_RANDOM_TR1], [
                          && fopen("/dev/urandom", "r"));
 	      }	      
 	     ],
-             [ac_random_tr1=yes], [ac_random_tr1=no],
-	     [ac_random_tr1=no])
+             [glibcxx_cv_random_tr1=yes], [glibcxx_cv_random_tr1=no],
+	     [glibcxx_cv_random_tr1=no])
   ])
-  AC_MSG_RESULT($ac_random_tr1)
-  if test x"$ac_random_tr1" = x"yes"; then
+  AC_MSG_RESULT($glibcxx_cv_random_tr1)
+  if test x"$glibcxx_cv_random_tr1" = x"yes"; then
     AC_DEFINE(_GLIBCXX_USE_RANDOM_TR1, 1,
               [Define if dev/random and dev/urandom are available for
 	       the random_device of TR1 (Chapter 5.1).])
@@ -1325,155 +1325,26 @@ dnl Check whether macros, etc are present for <system_error>
 dnl
 AC_DEFUN([GLIBCXX_CHECK_SYSTEM_ERROR], [
 
-  AC_MSG_CHECKING([for EOWNERDEAD])
-  AC_CACHE_VAL(ac_system_error1, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = EOWNERDEAD; ],
-             [ac_system_error1=yes], [ac_system_error1=no])
-  ])
-  AC_MSG_RESULT($ac_system_error1)
-  if test x"$ac_system_error1" = x"yes"; then
-    AC_DEFINE(HAVE_EOWNERDEAD, 1, [Define if EOWNERDEAD exists.])
-  fi
-
-  AC_MSG_CHECKING([for ENOTRECOVERABLE])
-  AC_CACHE_VAL(ac_system_error2, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ENOTRECOVERABLE; ],
-             [ac_system_error2=yes], [ac_system_error2=no])
-  ])
-  AC_MSG_RESULT($ac_system_error2)
-  if test x"$ac_system_error2" = x"yes"; then
-    AC_DEFINE(HAVE_ENOTRECOVERABLE, 1, [Define if ENOTRECOVERABLE exists.])
-  fi
-
-  AC_MSG_CHECKING([for ENOLINK])
-  AC_CACHE_VAL(ac_system_error3, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ENOLINK; ],
-             [ac_system_error3=yes], [ac_system_error3=no])
-  ])
-  AC_MSG_RESULT($ac_system_error3)
-  if test x"$ac_system_error3" = x"yes"; then
-    AC_DEFINE(HAVE_ENOLINK, 1, [Define if ENOLINK exists.])
-  fi
-
-  AC_MSG_CHECKING([for EPROTO])
-  AC_CACHE_VAL(ac_system_error_4, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = EPROTO; ],
-             [ac_system_error_4=yes], [ac_system_error_4=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_4)
-  if test x"$ac_system_error_4" = x"yes"; then
-    AC_DEFINE(HAVE_EPROTO, 1, [Define if EPROTO exists.])
-  fi
-
-  AC_MSG_CHECKING([for ENODATA])
-  AC_CACHE_VAL(ac_system_error_5, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ENODATA; ],
-             [ac_system_error_5=yes], [ac_system_error_5=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_5)
-  if test x"$ac_system_error_5" = x"yes"; then
-    AC_DEFINE(HAVE_ENODATA, 1, [Define if ENODATA exists.])
-  fi
-
-  AC_MSG_CHECKING([for ENOSR])
-  AC_CACHE_VAL(ac_system_error_6, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ENOSR; ],
-             [ac_system_error_6=yes], [ac_system_error_6=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_6)
-  if test x"$ac_system_error_6" = x"yes"; then
-    AC_DEFINE(HAVE_ENOSR, 1, [Define if ENOSR exists.])
-  fi
-
-  AC_MSG_CHECKING([for ENOSTR])
-  AC_CACHE_VAL(ac_system_error_7, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ENOSTR; ],
-             [ac_system_error_7=yes], [ac_system_error_7=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_7)
-  if test x"$ac_system_error_7" = x"yes"; then
-    AC_DEFINE(HAVE_ENOSTR, 1, [Define if ENOSTR exists.])
-  fi
-
-  AC_MSG_CHECKING([for ETIME])
-  AC_CACHE_VAL(ac_system_error_8, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ETIME; ],
-             [ac_system_error_8=yes], [ac_system_error_8=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_8)
-  if test x"$ac_system_error_8" = x"yes"; then
-    AC_DEFINE(HAVE_ETIME, 1, [Define if ETIME exists.])
-  fi
-
-  AC_MSG_CHECKING([for sys_nerr])
-  AC_CACHE_VAL(ac_system_error9, [
-  AC_TRY_COMPILE([#include <errno.h> ], [ int i = sys_nerr; ],
-             [ac_system_error9=yes], [ac_system_error9=no])
-  ])
-  AC_MSG_RESULT($ac_system_error9)
-  if test x"$ac_system_error9" = x"yes"; then
-    AC_DEFINE(HAVE_SYS_NERR, 1, [Define if sys_nerr exists.])
-  fi
-
-  AC_MSG_CHECKING([for EBADMSG])
-  AC_CACHE_VAL(ac_system_error_10, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = EBADMSG; ],
-             [ac_system_error_10=yes], [ac_system_error_10=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_10)
-  if test x"$ac_system_error_10" = x"yes"; then
-    AC_DEFINE(HAVE_EBADMSG, 1, [Define if EBADMSG exists.])
-  fi
-
-  AC_MSG_CHECKING([for ECANCELED])
-  AC_CACHE_VAL(ac_system_error_11, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ECANCELED; ],
-             [ac_system_error_11=yes], [ac_system_error_11=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_11)
-  if test x"$ac_system_error_11" = x"yes"; then
-    AC_DEFINE(HAVE_ECANCELED, 1, [Define if ECANCELED exists.])
-  fi
-
-  AC_MSG_CHECKING([for EOVERFLOW])
-  AC_CACHE_VAL(ac_system_error_12, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = EOVERFLOW; ],
-             [ac_system_error_12=yes], [ac_system_error_12=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_12)
-  if test x"$ac_system_error_12" = x"yes"; then
-    AC_DEFINE(HAVE_EOVERFLOW, 1, [Define if EOVERFLOW exists.])
-  fi
-
-  AC_MSG_CHECKING([for ENOTSUP])
-  AC_CACHE_VAL(ac_system_error_13, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ENOTSUP; ],
-             [ac_system_error_13=yes], [ac_system_error_13=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_13)
-  if test x"$ac_system_error_13" = x"yes"; then
-    AC_DEFINE(HAVE_ENOTSUP, 1, [Define if ENOTSUP exists.])
-  fi
-
-  AC_MSG_CHECKING([for EIDRM])
-  AC_CACHE_VAL(ac_system_error_14, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = EIDRM; ],
-             [ac_system_error_14=yes], [ac_system_error_14=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_14)
-  if test x"$ac_system_error_14" = x"yes"; then
-    AC_DEFINE(HAVE_EIDRM, 1, [Define if EIDRM exists.])
-  fi
-
-  AC_MSG_CHECKING([for ETXTBSY])
-  AC_CACHE_VAL(ac_system_error_15, [
-  AC_TRY_COMPILE([#include <errno.h>], [ int i = ETXTBSY; ],
-             [ac_system_error_15=yes], [ac_system_error_15=no])
-  ])
-  AC_MSG_RESULT($ac_system_error_15)
-  if test x"$ac_system_error_15" = x"yes"; then
-    AC_DEFINE(HAVE_ETXTBSY, 1, [Define if ETXTBSY exists.])
-  fi
+m4_pushdef([n_syserr], [1])dnl
+m4_foreach([syserr], [EOWNERDEAD, ENOTRECOVERABLE, ENOLINK, EPROTO, ENODATA,
+		      ENOSR, ENOSTR, ETIME, sys_nerr, EBADMSG, ECANCELED,
+		      EOVERFLOW, ENOTSUP, EIDRM, ETXTBSY],
+[m4_pushdef([SYSERR], m4_toupper(syserr))dnl
+AC_MSG_CHECKING([for syserr])
+AC_CACHE_VAL([glibcxx_cv_system_error[]n_syserr], [
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <errno.h>]],
+				   [int i = syserr;])],
+		  [glibcxx_cv_system_error[]n_syserr=yes],
+		  [glibcxx_cv_system_error[]n_syserr=no])
+])
+AC_MSG_RESULT([$glibcxx_cv_system_error[]n_syserr])
+if test x"$glibcxx_cv_system_error[]n_syserr" = x"yes"; then
+  AC_DEFINE([HAVE_]SYSERR, 1, [Define if ]syserr[ exists.])
+fi
+m4_define([n_syserr], m4_incr(n_syserr))dnl
+m4_popdef([SYSERR])dnl
+])
+m4_popdef([n_syserr])dnl
 ])
 
 dnl
@@ -2401,14 +2272,14 @@ if test x$enable_visibility = xyes ; then
   dnl all hail libgfortran
   dnl Check whether the target supports hidden visibility.
   AC_CACHE_CHECK([whether the target supports hidden visibility],
-		 have_attribute_visibility, [
+		 glibcxx_cv_have_attribute_visibility, [
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -Werror"
   AC_TRY_COMPILE([void __attribute__((visibility("hidden"))) foo(void) { }],
-		 [], have_attribute_visibility=yes,
-		 have_attribute_visibility=no)
+		 [], glibcxx_cv_have_attribute_visibility=yes,
+		 glibcxx_cv_have_attribute_visibility=no)
   CFLAGS="$save_CFLAGS"])
-  if test $have_attribute_visibility = no; then
+  if test $glibcxx_cv_have_attribute_visibility = no; then
     enable_visibility=no
   fi
 fi
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 4426c09..39b0584 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -15558,7 +15558,7 @@ fi
   # Check for the existence of <math.h> functions used if C99 is enabled.
   echo "$as_me:$LINENO: checking for ISO C99 support in <math.h>" >&5
 echo $ECHO_N "checking for ISO C99 support in <math.h>... $ECHO_C" >&6
-  if test "${ac_c99_math+set}" = set; then
+  if test "${glibcxx_cv_c99_math+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -15615,12 +15615,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_math=yes
+  glibcxx_cv_c99_math=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_math=no
+glibcxx_cv_c99_math=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
@@ -15681,12 +15681,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_math=yes
+  glibcxx_cv_c99_math=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_math=no
+glibcxx_cv_c99_math=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
@@ -15694,9 +15694,9 @@ fi
 
 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
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_math" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_math" >&6
+  if test x"$glibcxx_cv_c99_math" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_MATH 1
@@ -16012,7 +16012,7 @@ fi
 
 done
 
-  ac_c99_complex=no;
+  glibcxx_cv_c99_complex=no;
   if test x"$ac_has_complex_h" = x"yes"; then
     echo "$as_me:$LINENO: checking for ISO C99 support in <complex.h>" >&5
 echo $ECHO_N "checking for ISO C99 support in <complex.h>... $ECHO_C" >&6
@@ -16099,12 +16099,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_complex=yes
+  glibcxx_cv_c99_complex=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_complex=no
+glibcxx_cv_c99_complex=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
@@ -16195,20 +16195,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_complex=yes
+  glibcxx_cv_c99_complex=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_complex=no
+glibcxx_cv_c99_complex=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 fi
   fi
-  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
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_complex" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_complex" >&6
+  if test x"$glibcxx_cv_c99_complex" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_COMPLEX 1
@@ -16219,7 +16219,7 @@ _ACEOF
   # Check for the existence in <stdio.h> of vscanf, et. al.
   echo "$as_me:$LINENO: checking for ISO C99 support in <stdio.h>" >&5
 echo $ECHO_N "checking for ISO C99 support in <stdio.h>... $ECHO_C" >&6
-  if test "${ac_c99_stdio+set}" = set; then
+  if test "${glibcxx_cv_c99_stdio+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -16270,12 +16270,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_stdio=yes
+  glibcxx_cv_c99_stdio=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_stdio=no
+glibcxx_cv_c99_stdio=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
@@ -16330,12 +16330,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_stdio=yes
+  glibcxx_cv_c99_stdio=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_stdio=no
+glibcxx_cv_c99_stdio=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
@@ -16343,13 +16343,13 @@ fi
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_stdio" >&5
-echo "${ECHO_T}$ac_c99_stdio" >&6
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_stdio" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_stdio" >&6
 
   # Check for the existence in <stdlib.h> of lldiv_t, et. al.
   echo "$as_me:$LINENO: checking for ISO C99 support in <stdlib.h>" >&5
 echo $ECHO_N "checking for ISO C99 support in <stdlib.h>... $ECHO_C" >&6
-  if test "${ac_c99_stdlib+set}" = set; then
+  if test "${glibcxx_cv_c99_stdlib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -16406,12 +16406,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_stdlib=yes
+  glibcxx_cv_c99_stdlib=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_stdlib=no
+glibcxx_cv_c99_stdlib=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 else
@@ -16472,12 +16472,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_stdlib=yes
+  glibcxx_cv_c99_stdlib=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_stdlib=no
+glibcxx_cv_c99_stdlib=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
@@ -16485,11 +16485,11 @@ fi
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_stdlib" >&5
-echo "${ECHO_T}$ac_c99_stdlib" >&6
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_stdlib" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_stdlib" >&6
 
   # Check for the existence in <wchar.h> of wcstold, etc.
-  ac_c99_wchar=no;
+  glibcxx_cv_c99_wchar=no;
   if test x"$ac_has_wchar_h" = xyes &&
      test x"$ac_has_wctype_h" = xyes; then
     echo "$as_me:$LINENO: checking for ISO C99 support in <wchar.h>" >&5
@@ -16538,12 +16538,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_wchar=yes
+  glibcxx_cv_c99_wchar=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_wchar=no
+glibcxx_cv_c99_wchar=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -16800,16 +16800,16 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
-    echo "$as_me:$LINENO: result: $ac_c99_wchar" >&5
-echo "${ECHO_T}$ac_c99_wchar" >&6
+    echo "$as_me:$LINENO: result: $glibcxx_cv_c99_wchar" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_wchar" >&6
   fi
 
   # Option parsed, now set things appropriately.
-  if test x"$ac_c99_math" = x"no" ||
-     test x"$ac_c99_complex" = x"no" ||
-     test x"$ac_c99_stdio" = x"no" ||
-     test x"$ac_c99_stdlib" = x"no" ||
-     test x"$ac_c99_wchar" = x"no"; then
+  if test x"$glibcxx_cv_c99_math" = x"no" ||
+     test x"$glibcxx_cv_c99_complex" = x"no" ||
+     test x"$glibcxx_cv_c99_stdio" = x"no" ||
+     test x"$glibcxx_cv_c99_stdlib" = x"no" ||
+     test x"$glibcxx_cv_c99_wchar" = x"no"; then
     enable_c99=no;
   else
 
@@ -16995,13 +16995,13 @@ _ACEOF
 # Checks for operating systems support that don't require linking.
 
 
-  echo "$as_me:$LINENO: checking for EOWNERDEAD" >&5
+echo "$as_me:$LINENO: checking for EOWNERDEAD" >&5
 echo $ECHO_N "checking for EOWNERDEAD... $ECHO_C" >&6
-  if test "${ac_system_error1+set}" = set; then
+if test "${glibcxx_cv_system_error1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17011,7 +17011,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = EOWNERDEAD;
+int i = EOWNERDEAD;
   ;
   return 0;
 }
@@ -17038,34 +17038,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error1=yes
+  glibcxx_cv_system_error1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error1=no
+glibcxx_cv_system_error1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error1" >&5
-echo "${ECHO_T}$ac_system_error1" >&6
-  if test x"$ac_system_error1" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error1" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error1" >&6
+if test x"$glibcxx_cv_system_error1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_EOWNERDEAD 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ENOTRECOVERABLE" >&5
+fi
+echo "$as_me:$LINENO: checking for ENOTRECOVERABLE" >&5
 echo $ECHO_N "checking for ENOTRECOVERABLE... $ECHO_C" >&6
-  if test "${ac_system_error2+set}" = set; then
+if test "${glibcxx_cv_system_error2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17075,7 +17074,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ENOTRECOVERABLE;
+int i = ENOTRECOVERABLE;
   ;
   return 0;
 }
@@ -17102,34 +17101,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error2=yes
+  glibcxx_cv_system_error2=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error2=no
+glibcxx_cv_system_error2=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error2" >&5
-echo "${ECHO_T}$ac_system_error2" >&6
-  if test x"$ac_system_error2" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error2" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error2" >&6
+if test x"$glibcxx_cv_system_error2" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ENOTRECOVERABLE 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ENOLINK" >&5
+fi
+echo "$as_me:$LINENO: checking for ENOLINK" >&5
 echo $ECHO_N "checking for ENOLINK... $ECHO_C" >&6
-  if test "${ac_system_error3+set}" = set; then
+if test "${glibcxx_cv_system_error3+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17139,7 +17137,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ENOLINK;
+int i = ENOLINK;
   ;
   return 0;
 }
@@ -17166,34 +17164,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error3=yes
+  glibcxx_cv_system_error3=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error3=no
+glibcxx_cv_system_error3=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error3" >&5
-echo "${ECHO_T}$ac_system_error3" >&6
-  if test x"$ac_system_error3" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error3" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error3" >&6
+if test x"$glibcxx_cv_system_error3" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ENOLINK 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for EPROTO" >&5
+fi
+echo "$as_me:$LINENO: checking for EPROTO" >&5
 echo $ECHO_N "checking for EPROTO... $ECHO_C" >&6
-  if test "${ac_system_error_4+set}" = set; then
+if test "${glibcxx_cv_system_error4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17203,7 +17200,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = EPROTO;
+int i = EPROTO;
   ;
   return 0;
 }
@@ -17230,34 +17227,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_4=yes
+  glibcxx_cv_system_error4=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_4=no
+glibcxx_cv_system_error4=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_4" >&5
-echo "${ECHO_T}$ac_system_error_4" >&6
-  if test x"$ac_system_error_4" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error4" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error4" >&6
+if test x"$glibcxx_cv_system_error4" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_EPROTO 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ENODATA" >&5
+fi
+echo "$as_me:$LINENO: checking for ENODATA" >&5
 echo $ECHO_N "checking for ENODATA... $ECHO_C" >&6
-  if test "${ac_system_error_5+set}" = set; then
+if test "${glibcxx_cv_system_error5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17267,7 +17263,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ENODATA;
+int i = ENODATA;
   ;
   return 0;
 }
@@ -17294,34 +17290,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_5=yes
+  glibcxx_cv_system_error5=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_5=no
+glibcxx_cv_system_error5=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_5" >&5
-echo "${ECHO_T}$ac_system_error_5" >&6
-  if test x"$ac_system_error_5" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error5" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error5" >&6
+if test x"$glibcxx_cv_system_error5" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ENODATA 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ENOSR" >&5
+fi
+echo "$as_me:$LINENO: checking for ENOSR" >&5
 echo $ECHO_N "checking for ENOSR... $ECHO_C" >&6
-  if test "${ac_system_error_6+set}" = set; then
+if test "${glibcxx_cv_system_error6+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17331,7 +17326,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ENOSR;
+int i = ENOSR;
   ;
   return 0;
 }
@@ -17358,34 +17353,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_6=yes
+  glibcxx_cv_system_error6=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_6=no
+glibcxx_cv_system_error6=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_6" >&5
-echo "${ECHO_T}$ac_system_error_6" >&6
-  if test x"$ac_system_error_6" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error6" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error6" >&6
+if test x"$glibcxx_cv_system_error6" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ENOSR 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ENOSTR" >&5
+fi
+echo "$as_me:$LINENO: checking for ENOSTR" >&5
 echo $ECHO_N "checking for ENOSTR... $ECHO_C" >&6
-  if test "${ac_system_error_7+set}" = set; then
+if test "${glibcxx_cv_system_error7+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17395,7 +17389,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ENOSTR;
+int i = ENOSTR;
   ;
   return 0;
 }
@@ -17422,34 +17416,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_7=yes
+  glibcxx_cv_system_error7=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_7=no
+glibcxx_cv_system_error7=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_7" >&5
-echo "${ECHO_T}$ac_system_error_7" >&6
-  if test x"$ac_system_error_7" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error7" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error7" >&6
+if test x"$glibcxx_cv_system_error7" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ENOSTR 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ETIME" >&5
+fi
+echo "$as_me:$LINENO: checking for ETIME" >&5
 echo $ECHO_N "checking for ETIME... $ECHO_C" >&6
-  if test "${ac_system_error_8+set}" = set; then
+if test "${glibcxx_cv_system_error8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17459,7 +17452,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ETIME;
+int i = ETIME;
   ;
   return 0;
 }
@@ -17486,34 +17479,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_8=yes
+  glibcxx_cv_system_error8=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_8=no
+glibcxx_cv_system_error8=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_8" >&5
-echo "${ECHO_T}$ac_system_error_8" >&6
-  if test x"$ac_system_error_8" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error8" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error8" >&6
+if test x"$glibcxx_cv_system_error8" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ETIME 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for sys_nerr" >&5
+fi
+echo "$as_me:$LINENO: checking for sys_nerr" >&5
 echo $ECHO_N "checking for sys_nerr... $ECHO_C" >&6
-  if test "${ac_system_error9+set}" = set; then
+if test "${glibcxx_cv_system_error9+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17523,7 +17515,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = sys_nerr;
+int i = sys_nerr;
   ;
   return 0;
 }
@@ -17550,34 +17542,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error9=yes
+  glibcxx_cv_system_error9=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error9=no
+glibcxx_cv_system_error9=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error9" >&5
-echo "${ECHO_T}$ac_system_error9" >&6
-  if test x"$ac_system_error9" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error9" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error9" >&6
+if test x"$glibcxx_cv_system_error9" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_SYS_NERR 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for EBADMSG" >&5
+fi
+echo "$as_me:$LINENO: checking for EBADMSG" >&5
 echo $ECHO_N "checking for EBADMSG... $ECHO_C" >&6
-  if test "${ac_system_error_10+set}" = set; then
+if test "${glibcxx_cv_system_error10+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17587,7 +17578,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = EBADMSG;
+int i = EBADMSG;
   ;
   return 0;
 }
@@ -17614,34 +17605,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_10=yes
+  glibcxx_cv_system_error10=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_10=no
+glibcxx_cv_system_error10=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_10" >&5
-echo "${ECHO_T}$ac_system_error_10" >&6
-  if test x"$ac_system_error_10" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error10" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error10" >&6
+if test x"$glibcxx_cv_system_error10" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_EBADMSG 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ECANCELED" >&5
+fi
+echo "$as_me:$LINENO: checking for ECANCELED" >&5
 echo $ECHO_N "checking for ECANCELED... $ECHO_C" >&6
-  if test "${ac_system_error_11+set}" = set; then
+if test "${glibcxx_cv_system_error11+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17651,7 +17641,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ECANCELED;
+int i = ECANCELED;
   ;
   return 0;
 }
@@ -17678,34 +17668,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_11=yes
+  glibcxx_cv_system_error11=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_11=no
+glibcxx_cv_system_error11=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_11" >&5
-echo "${ECHO_T}$ac_system_error_11" >&6
-  if test x"$ac_system_error_11" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error11" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error11" >&6
+if test x"$glibcxx_cv_system_error11" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ECANCELED 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for EOVERFLOW" >&5
+fi
+echo "$as_me:$LINENO: checking for EOVERFLOW" >&5
 echo $ECHO_N "checking for EOVERFLOW... $ECHO_C" >&6
-  if test "${ac_system_error_12+set}" = set; then
+if test "${glibcxx_cv_system_error12+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17715,7 +17704,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = EOVERFLOW;
+int i = EOVERFLOW;
   ;
   return 0;
 }
@@ -17742,34 +17731,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_12=yes
+  glibcxx_cv_system_error12=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_12=no
+glibcxx_cv_system_error12=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_12" >&5
-echo "${ECHO_T}$ac_system_error_12" >&6
-  if test x"$ac_system_error_12" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error12" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error12" >&6
+if test x"$glibcxx_cv_system_error12" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_EOVERFLOW 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ENOTSUP" >&5
+fi
+echo "$as_me:$LINENO: checking for ENOTSUP" >&5
 echo $ECHO_N "checking for ENOTSUP... $ECHO_C" >&6
-  if test "${ac_system_error_13+set}" = set; then
+if test "${glibcxx_cv_system_error13+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17779,7 +17767,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ENOTSUP;
+int i = ENOTSUP;
   ;
   return 0;
 }
@@ -17806,34 +17794,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_13=yes
+  glibcxx_cv_system_error13=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_13=no
+glibcxx_cv_system_error13=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_13" >&5
-echo "${ECHO_T}$ac_system_error_13" >&6
-  if test x"$ac_system_error_13" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error13" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error13" >&6
+if test x"$glibcxx_cv_system_error13" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ENOTSUP 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for EIDRM" >&5
+fi
+echo "$as_me:$LINENO: checking for EIDRM" >&5
 echo $ECHO_N "checking for EIDRM... $ECHO_C" >&6
-  if test "${ac_system_error_14+set}" = set; then
+if test "${glibcxx_cv_system_error14+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17843,7 +17830,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = EIDRM;
+int i = EIDRM;
   ;
   return 0;
 }
@@ -17870,34 +17857,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_14=yes
+  glibcxx_cv_system_error14=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_14=no
+glibcxx_cv_system_error14=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_14" >&5
-echo "${ECHO_T}$ac_system_error_14" >&6
-  if test x"$ac_system_error_14" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error14" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error14" >&6
+if test x"$glibcxx_cv_system_error14" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_EIDRM 1
 _ACEOF
 
-  fi
-
-  echo "$as_me:$LINENO: checking for ETXTBSY" >&5
+fi
+echo "$as_me:$LINENO: checking for ETXTBSY" >&5
 echo $ECHO_N "checking for ETXTBSY... $ECHO_C" >&6
-  if test "${ac_system_error_15+set}" = set; then
+if test "${glibcxx_cv_system_error15+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-  cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17907,7 +17893,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
- int i = ETXTBSY;
+int i = ETXTBSY;
   ;
   return 0;
 }
@@ -17934,26 +17920,27 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_system_error_15=yes
+  glibcxx_cv_system_error15=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_system_error_15=no
+glibcxx_cv_system_error15=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_system_error_15" >&5
-echo "${ECHO_T}$ac_system_error_15" >&6
-  if test x"$ac_system_error_15" = x"yes"; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_system_error15" >&5
+echo "${ECHO_T}$glibcxx_cv_system_error15" >&6
+if test x"$glibcxx_cv_system_error15" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_ETXTBSY 1
 _ACEOF
 
-  fi
+fi
+
 
 
 
@@ -18097,7 +18084,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
     cat > conftest.$ac_ext << EOF
-#line 18100 "configure"
+#line 18087 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
@@ -40102,7 +40089,7 @@ _ACEOF
   # Check for the existence of <ctype.h> functions.
   echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <ctype.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <ctype.h>... $ECHO_C" >&6
-  if test "${ac_c99_ctype_tr1+set}" = set; then
+  if test "${glibcxx_cv_c99_ctype_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -40146,20 +40133,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_ctype_tr1=yes
+  glibcxx_cv_c99_ctype_tr1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_ctype_tr1=no
+glibcxx_cv_c99_ctype_tr1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_ctype_tr1" >&5
-echo "${ECHO_T}$ac_c99_ctype_tr1" >&6
-  if test x"$ac_c99_ctype_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_ctype_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_ctype_tr1" >&6
+  if test x"$glibcxx_cv_c99_ctype_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_CTYPE_TR1 1
@@ -40398,7 +40385,7 @@ _ACEOF
   # Check for the existence of <stdint.h> types.
   echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <stdint.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <stdint.h>... $ECHO_C" >&6
-  if test "${ac_c99_stdint_tr1+set}" = set; then
+  if test "${glibcxx_cv_c99_stdint_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -40467,20 +40454,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_stdint_tr1=yes
+  glibcxx_cv_c99_stdint_tr1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_stdint_tr1=no
+glibcxx_cv_c99_stdint_tr1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_stdint_tr1" >&5
-echo "${ECHO_T}$ac_c99_stdint_tr1" >&6
-  if test x"$ac_c99_stdint_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_stdint_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_stdint_tr1" >&6
+  if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_STDINT_TR1 1
@@ -40491,7 +40478,7 @@ _ACEOF
   # Check for the existence of <math.h> functions.
   echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <math.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <math.h>... $ECHO_C" >&6
-  if test "${ac_c99_math_tr1+set}" = set; then
+  if test "${glibcxx_cv_c99_math_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -40639,20 +40626,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_math_tr1=yes
+  glibcxx_cv_c99_math_tr1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_math_tr1=no
+glibcxx_cv_c99_math_tr1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_math_tr1" >&5
-echo "${ECHO_T}$ac_c99_math_tr1" >&6
-  if test x"$ac_c99_math_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_math_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_math_tr1" >&6
+  if test x"$glibcxx_cv_c99_math_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_MATH_TR1 1
@@ -40663,7 +40650,7 @@ _ACEOF
   # Check for the existence of <inttypes.h> functions (NB: doesn't make
   # sense if the previous check fails, per C99, 7.8/1).
   ac_c99_inttypes_tr1=no;
-  if test x"$ac_c99_stdint_tr1" = x"yes"; then
+  if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
     echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <inttypes.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <inttypes.h>... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
@@ -40895,12 +40882,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   echo "$as_me:$LINENO: checking for \"dev/random\" and \"dev/urandom\" for TR1 random_device" >&5
 echo $ECHO_N "checking for \"dev/random\" and \"dev/urandom\" for TR1 random_device... $ECHO_C" >&6
-  if test "${ac_random_tr1+set}" = set; then
+  if test "${glibcxx_cv_random_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
   if test "$cross_compiling" = yes; then
-  ac_random_tr1=no
+  glibcxx_cv_random_tr1=no
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -40927,23 +40914,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_random_tr1=yes
+  glibcxx_cv_random_tr1=yes
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
-ac_random_tr1=no
+glibcxx_cv_random_tr1=no
 fi
 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_random_tr1" >&5
-echo "${ECHO_T}$ac_random_tr1" >&6
-  if test x"$ac_random_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_random_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_random_tr1" >&6
+  if test x"$glibcxx_cv_random_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_RANDOM_TR1 1
@@ -109211,7 +109198,7 @@ _ACEOF
   # Check for the existence of <ctype.h> functions.
   echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <ctype.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <ctype.h>... $ECHO_C" >&6
-  if test "${ac_c99_ctype_tr1+set}" = set; then
+  if test "${glibcxx_cv_c99_ctype_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -109255,20 +109242,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_ctype_tr1=yes
+  glibcxx_cv_c99_ctype_tr1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_ctype_tr1=no
+glibcxx_cv_c99_ctype_tr1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_ctype_tr1" >&5
-echo "${ECHO_T}$ac_c99_ctype_tr1" >&6
-  if test x"$ac_c99_ctype_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_ctype_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_ctype_tr1" >&6
+  if test x"$glibcxx_cv_c99_ctype_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_CTYPE_TR1 1
@@ -109507,7 +109494,7 @@ _ACEOF
   # Check for the existence of <stdint.h> types.
   echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <stdint.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <stdint.h>... $ECHO_C" >&6
-  if test "${ac_c99_stdint_tr1+set}" = set; then
+  if test "${glibcxx_cv_c99_stdint_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -109576,20 +109563,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_stdint_tr1=yes
+  glibcxx_cv_c99_stdint_tr1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_stdint_tr1=no
+glibcxx_cv_c99_stdint_tr1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_stdint_tr1" >&5
-echo "${ECHO_T}$ac_c99_stdint_tr1" >&6
-  if test x"$ac_c99_stdint_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_stdint_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_stdint_tr1" >&6
+  if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_STDINT_TR1 1
@@ -109600,7 +109587,7 @@ _ACEOF
   # Check for the existence of <math.h> functions.
   echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <math.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <math.h>... $ECHO_C" >&6
-  if test "${ac_c99_math_tr1+set}" = set; then
+  if test "${glibcxx_cv_c99_math_tr1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -109748,20 +109735,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_c99_math_tr1=yes
+  glibcxx_cv_c99_math_tr1=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_c99_math_tr1=no
+glibcxx_cv_c99_math_tr1=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-  echo "$as_me:$LINENO: result: $ac_c99_math_tr1" >&5
-echo "${ECHO_T}$ac_c99_math_tr1" >&6
-  if test x"$ac_c99_math_tr1" = x"yes"; then
+  echo "$as_me:$LINENO: result: $glibcxx_cv_c99_math_tr1" >&5
+echo "${ECHO_T}$glibcxx_cv_c99_math_tr1" >&6
+  if test x"$glibcxx_cv_c99_math_tr1" = x"yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_C99_MATH_TR1 1
@@ -109772,7 +109759,7 @@ _ACEOF
   # Check for the existence of <inttypes.h> functions (NB: doesn't make
   # sense if the previous check fails, per C99, 7.8/1).
   ac_c99_inttypes_tr1=no;
-  if test x"$ac_c99_stdint_tr1" = x"yes"; then
+  if test x"$glibcxx_cv_c99_stdint_tr1" = x"yes"; then
     echo "$as_me:$LINENO: checking for ISO C99 support to TR1 in <inttypes.h>" >&5
 echo $ECHO_N "checking for ISO C99 support to TR1 in <inttypes.h>... $ECHO_C" >&6
     cat >conftest.$ac_ext <<_ACEOF
@@ -119151,7 +119138,7 @@ fi;
 if test x$enable_visibility = xyes ; then
       echo "$as_me:$LINENO: checking whether the target supports hidden visibility" >&5
 echo $ECHO_N "checking whether the target supports hidden visibility... $ECHO_C" >&6
-if test "${have_attribute_visibility+set}" = set; then
+if test "${glibcxx_cv_have_attribute_visibility+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -119194,19 +119181,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  have_attribute_visibility=yes
+  glibcxx_cv_have_attribute_visibility=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-have_attribute_visibility=no
+glibcxx_cv_have_attribute_visibility=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $have_attribute_visibility" >&5
-echo "${ECHO_T}$have_attribute_visibility" >&6
-  if test $have_attribute_visibility = no; then
+echo "$as_me:$LINENO: result: $glibcxx_cv_have_attribute_visibility" >&5
+echo "${ECHO_T}$glibcxx_cv_have_attribute_visibility" >&6
+  if test $glibcxx_cv_have_attribute_visibility = no; then
     enable_visibility=no
   fi
 fi
@@ -119749,7 +119736,7 @@ echo "${ECHO_T}$res" >&6
 
 
     # Check for rlimit, setrlimit.
-    if test "${ac_setrlimit+set}" = set; then
+    if test "${glibcxx_cv_setrlimit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@@ -119794,12 +119781,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_setrlimit=yes
+  glibcxx_cv_setrlimit=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_setrlimit=no
+glibcxx_cv_setrlimit=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
@@ -119809,7 +119796,7 @@ fi
 
   echo "$as_me:$LINENO: checking for testsuite resource limits support" >&5
 echo $ECHO_N "checking for testsuite resource limits support... $ECHO_C" >&6
-  if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
+  if test $setrlimit_have_headers = yes && test $glibcxx_cv_setrlimit = yes; then
     ac_res_limits=yes
 
 cat >>confdefs.h <<\_ACEOF
author	Ralf Wildenhues <Ralf.Wildenhues@gmx.de>	2008-04-21 20:55:19 +0000
committer	Ralf Wildenhues <rwild@gcc.gnu.org>	2008-04-21 20:55:19 +0000
commit	6d26724a16948f970b5511c840d498a4ebd56b1f (patch)
tree	a9ebf81cc4fab63cc6f1b4ac86232311a396d3af
parent	b60db1bae78b40ecca246f787e5661d1de779f3a (diff)
download	gcc-6d26724a16948f970b5511c840d498a4ebd56b1f.zip gcc-6d26724a16948f970b5511c840d498a4ebd56b1f.tar.gz gcc-6d26724a16948f970b5511c840d498a4ebd56b1f.tar.bz2