diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 10 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 10 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 10 |
4 files changed, 22 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3a67e89..da17d68 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,12 @@ 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 * acinclude.m4 (GLIBCPP_ENABLE_THREADS): Add relative path to staged/installed area to support -I-. Document. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index a4e733f..d5c5bee 100644 --- 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 ab97637..b6d9e75 100644 --- 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 986cab9..7244658 100755 --- 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 |