acinclude.m4 (GLIBCPP_ENABLE_THREADS): Portability enhancement.

	libstdc++/3284
	* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Portability enhancement.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.

From-SVN: r43711

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3a67e8962b1c0794bbdd1590e680045b598fd2a9..da17d682111f1c047fbd48ab3dd80e9798d01ad6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-02  Loren J. Rittle  <ljrittle@acm.org>
+
+       libstdc++/3284
+       * acinclude.m4 (GLIBCPP_ENABLE_THREADS): Portability enhancement.
+       * aclocal.m4: Regenerate.
+       * configure: Regenerate.
+
 2001-07-02  Loren J. Rittle  <ljrittle@acm.org>
 
        libstdc++/3243

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index a4e733fe3b65f7203dc3d6cd1b0bc0ec0416605e..d5c5beec492d00de76e0c15dc0fe48ec2d77b63c 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1159,15 +1159,15 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
     AC_DEFINE(HAVE_GTHR_DEFAULT)
     AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
   fi
-  AC_OUTPUT_COMMANDS([d=include/bits
+  AC_OUTPUT_COMMANDS([d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
     rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
-    sed '/^#/s/\([A-Z_][A-Z_]*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
+    sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
-      | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
+      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
-      | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' \
-      | sed 's/\([A-Z_]*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
+      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
+      | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
 ])
 
 

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index ab97637200da20e5e3bc605d21546a41043a332c..b6d9e75bf946f775cc7ef04876c9e10d19d56c27 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1171,15 +1171,15 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
     AC_DEFINE(HAVE_GTHR_DEFAULT)
     AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
   fi
-  AC_OUTPUT_COMMANDS([d=include/bits
+  AC_OUTPUT_COMMANDS([d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
     rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
-    sed '/^#/s/\([A-Z_][A-Z_]*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
+    sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
-      | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
+      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
-      | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' \
-      | sed 's/\([A-Z_]*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
+      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
+      | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h])
 ])
 
 

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 986cab9845666e7ab9f65322fa21c600aa20dcfa..7244658a7a88f7b082f422d127a2e5ebabcd7f85 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -16869,15 +16869,15 @@ CXX="${CXX}"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-d=include/bits
+d=include/bits; a='[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]'
     rm -f $d/gthr.h $d/gthr-single.h $d/gthr-default.h
-    sed '/^#/s/\([A-Z_][A-Z_]*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
+    sed '/^#/s/\('$a$a'*\)/_GLIBCPP_\1/g' <$d/gthr.h-in \
       | sed 's,"gthr-,"bits/gthr-,' >$d/gthr.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-single.h-in \
-      | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
+      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' >$d/gthr-single.h
     sed 's/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \
-      | sed 's/\(GCC[A-Z_]*_H\)/_GLIBCPP_\1/g' \
-      | sed 's/\([A-Z_]*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h
+      | sed 's/\(GCC'$a'*_H\)/_GLIBCPP_\1/g' \
+      | sed 's/\('$a'*WEAK\)/_GLIBCPP_\1/g' >$d/gthr-default.h
 if test -n "$CONFIG_FILES"; then
   ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
   grep '^MULTISUBDIR =' Makefile >> src/Makefile