acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Do not test for binutils 2.11 with globbing backport fix.

2003-07-06  Phil Edwards  <pme@gcc.gnu.org>

	* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS):  Do not test for binutils
	2.11 with globbing backport fix.
	* aclocal.m4, configure:  Regenerated.

From-SVN: r69013

4 files changed, 43 insertions, 89 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2773588..9ba2235 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-06  Phil Edwards  <pme@gcc.gnu.org>
+
+	* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS):  Do not test for binutils
+	2.11 with globbing backport fix.
+	* aclocal.m4, configure:  Regenerated.
+
 2003-07-06  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/std/std_fstream.h (xsputn): Don't call _M_destroy_pback:
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 8d81668..807dd64 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -299,7 +299,8 @@ dnl
 dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible.
 dnl Define OPT_LDFLAGS='-Wl,-O1' if possible.
 dnl Define LD, with_gnu_ld, and (possibly) glibcxx_gnu_ld_version as
-dnl side-effects of testing.
+dnl side-effects of testing.  The last will be a single integer, e.g.,
+dnl version 1.23.45.0.67.89 will set glibcxx_gnu_ld_version to 12345.
 dnl
 dnl GLIBCXX_CHECK_LINKER_FEATURES
 AC_DEFUN(GLIBCXX_CHECK_LINKER_FEATURES, [
@@ -2266,26 +2267,13 @@ glibcxx_min_gnu_ld_version=21400
 # above.
 if test $enable_symvers = yes ; then
   if test $with_gnu_ld = yes &&
-    test $glibcxx_shared_libgcc = yes ;
+     test $glibcxx_shared_libgcc = yes ;
   then
     if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
-        enable_symvers=gnu
+      enable_symvers=gnu
     else
-      ac_test_CFLAGS="${CFLAGS+set}"
-      ac_save_CFLAGS="$CFLAGS"
-      CFLAGS='-shared -Wl,--version-script,conftest.map'
+      # The right tools, the right setup, but too old.  Fallbacks?
       enable_symvers=no
-      changequote(,)
-      echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
-      changequote([,])
-      AC_TRY_LINK([int foo;],, enable_symvers=gnu)
-      if test "$ac_test_CFLAGS" = set; then
-	CFLAGS="$ac_save_CFLAGS"
-      else
-	# this is the suspicious part
-	CFLAGS=''
-      fi
-      rm -f conftest.map
     fi
   else
     # just fail for now
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 17a95f6..c8572f2 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -311,7 +311,8 @@ dnl
 dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible.
 dnl Define OPT_LDFLAGS='-Wl,-O1' if possible.
 dnl Define LD, with_gnu_ld, and (possibly) glibcxx_gnu_ld_version as
-dnl side-effects of testing.
+dnl side-effects of testing.  The last will be a single integer, e.g.,
+dnl version 1.23.45.0.67.89 will set glibcxx_gnu_ld_version to 12345.
 dnl
 dnl GLIBCXX_CHECK_LINKER_FEATURES
 AC_DEFUN(GLIBCXX_CHECK_LINKER_FEATURES, [
@@ -2278,26 +2279,13 @@ glibcxx_min_gnu_ld_version=21400
 # above.
 if test $enable_symvers = yes ; then
   if test $with_gnu_ld = yes &&
-    test $glibcxx_shared_libgcc = yes ;
+     test $glibcxx_shared_libgcc = yes ;
   then
     if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
-        enable_symvers=gnu
+      enable_symvers=gnu
     else
-      ac_test_CFLAGS="${CFLAGS+set}"
-      ac_save_CFLAGS="$CFLAGS"
-      CFLAGS='-shared -Wl,--version-script,conftest.map'
+      # The right tools, the right setup, but too old.  Fallbacks?
       enable_symvers=no
-      changequote(,)
-      echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
-      changequote([,])
-      AC_TRY_LINK([int foo;],, enable_symvers=gnu)
-      if test "$ac_test_CFLAGS" = set; then
-	CFLAGS="$ac_save_CFLAGS"
-      else
-	# this is the suspicious part
-	CFLAGS=''
-      fi
-      rm -f conftest.map
     fi
   else
     # just fail for now
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index c3352ed..a1b794b 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -23239,41 +23239,13 @@ glibcxx_min_gnu_ld_version=21400
 # above.
 if test $enable_symvers = yes ; then
   if test $with_gnu_ld = yes &&
-    test $glibcxx_shared_libgcc = yes ;
+     test $glibcxx_shared_libgcc = yes ;
   then
     if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
-        enable_symvers=gnu
+      enable_symvers=gnu
     else
-      ac_test_CFLAGS="${CFLAGS+set}"
-      ac_save_CFLAGS="$CFLAGS"
-      CFLAGS='-shared -Wl,--version-script,conftest.map'
+      # The right tools, the right setup, but too old.  Fallbacks?
       enable_symvers=no
-      
-      echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
-      
-      cat > conftest.$ac_ext <<EOF
-#line 23256 "configure"
-#include "confdefs.h"
-int foo;
-int main() {
-
-; return 0; }
-EOF
-if { (eval echo configure:23263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  enable_symvers=gnu
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-      if test "$ac_test_CFLAGS" = set; then
-	CFLAGS="$ac_save_CFLAGS"
-      else
-	# this is the suspicious part
-	CFLAGS=''
-      fi
-      rm -f conftest.map
     fi
   else
     # just fail for now
@@ -23306,7 +23278,7 @@ else
   GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE=
 fi
 echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
-echo "configure:23310: checking versioning on shared library symbols" >&5
+echo "configure:23282: checking versioning on shared library symbols" >&5
 echo "$ac_t""$enable_symvers" 1>&6
 
 
@@ -23321,17 +23293,17 @@ echo "$ac_t""$enable_symvers" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:23325: checking for $ac_hdr" >&5
+echo "configure:23297: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 23330 "configure"
+#line 23302 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:23335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:23307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -23364,7 +23336,7 @@ done
     # Can't do these in a loop, else the resulting syntax is wrong.
     
   cat > conftest.$ac_ext <<EOF
-#line 23368 "configure"
+#line 23340 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                   #include <sys/time.h>
@@ -23374,7 +23346,7 @@ int main() {
  int f = RLIMIT_DATA ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcxx_mresult=1
 else
@@ -23391,7 +23363,7 @@ EOF
 
     
   cat > conftest.$ac_ext <<EOF
-#line 23395 "configure"
+#line 23367 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                   #include <sys/time.h>
@@ -23401,7 +23373,7 @@ int main() {
  int f = RLIMIT_RSS ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcxx_mresult=1
 else
@@ -23418,7 +23390,7 @@ EOF
 
     
   cat > conftest.$ac_ext <<EOF
-#line 23422 "configure"
+#line 23394 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                   #include <sys/time.h>
@@ -23428,7 +23400,7 @@ int main() {
  int f = RLIMIT_VMEM ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcxx_mresult=1
 else
@@ -23445,7 +23417,7 @@ EOF
 
     
   cat > conftest.$ac_ext <<EOF
-#line 23449 "configure"
+#line 23421 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                   #include <sys/time.h>
@@ -23455,7 +23427,7 @@ int main() {
  int f = RLIMIT_AS ; 
 ; return 0; }
 EOF
-if { (eval echo configure:23459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcxx_mresult=1
 else
@@ -23477,7 +23449,7 @@ EOF
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 23481 "configure"
+#line 23453 "configure"
 #include "confdefs.h"
 #include <unistd.h>
                   #include <sys/time.h>
@@ -23487,7 +23459,7 @@ int main() {
  struct rlimit r; setrlimit(0, &r);
 ; return 0; }
 EOF
-if { (eval echo configure:23491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_setrlimit=yes
 else
@@ -23503,7 +23475,7 @@ fi
   fi
 
   echo $ac_n "checking for testsuite memory limit support""... $ac_c" 1>&6
-echo "configure:23507: checking for testsuite memory limit support" >&5
+echo "configure:23479: checking for testsuite memory limit support" >&5
   if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
     ac_mem_limits=yes
     cat >> confdefs.h <<\EOF
@@ -23519,7 +23491,7 @@ EOF
     # Look for setenv, so that extended locale tests can be performed.
     
   echo $ac_n "checking for setenv declaration""... $ac_c" 1>&6
-echo "configure:23523: checking for setenv declaration" >&5
+echo "configure:23495: checking for setenv declaration" >&5
   if test x${glibcxx_cv_func_setenv_use+set} != xset; then
     if eval "test \"`echo '$''{'glibcxx_cv_func_setenv_use'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -23534,14 +23506,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
       cat > conftest.$ac_ext <<EOF
-#line 23538 "configure"
+#line 23510 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main() {
  setenv(0, 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:23545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:23517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   glibcxx_cv_func_setenv_use=yes
 else
@@ -23567,12 +23539,12 @@ fi
     for ac_func in setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:23571: checking for $ac_func" >&5
+echo "configure:23543: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 23576 "configure"
+#line 23548 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -23595,7 +23567,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:23599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:23571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -23755,7 +23727,7 @@ glibcxx_prefixdir=${prefix}
 
 # Process the option --with-gxx-include-dir=<path to include-files directory>
 echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
-echo "configure:23759: checking for --with-gxx-include-dir" >&5
+echo "configure:23731: checking for --with-gxx-include-dir" >&5
 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
 if test "${with_gxx_include_dir+set}" = set; then
   withval="$with_gxx_include_dir"
@@ -23779,7 +23751,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
 
 # Process the option "--enable-version-specific-runtime-libs"
 echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
-echo "configure:23783: checking for --enable-version-specific-runtime-libs" >&5
+echo "configure:23755: checking for --enable-version-specific-runtime-libs" >&5
 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
 if test "${enable_version_specific_runtime_libs+set}" = set; then
   enableval="$enable_version_specific_runtime_libs"
@@ -23830,7 +23802,7 @@ if test x"$glibcxx_toolexecdir" = x"no"; then
 fi
 
 echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:23834: checking for install location" >&5
+echo "configure:23806: checking for install location" >&5
 echo "$ac_t""$gxx_include_dir" 1>&6