diff options
| author | Loren J. Rittle <ljrittle@acm.org> | 2001-07-02 21:30:30 +0000 |
|---|---|---|
| committer | Loren J. Rittle <ljrittle@gcc.gnu.org> | 2001-07-02 21:30:30 +0000 |
| commit | 3a5e0e62b07ec9e85ba401d2a2d3b4641fa3fb99 (patch) | |
| tree | dc8c70548633148d46fb537d7008cd40dd8d8412 | |
| parent | f8d1529b85d65cec8c84f56b1b907f9d673697f2 (diff) | |
| download | gcc-3a5e0e62b07ec9e85ba401d2a2d3b4641fa3fb99.zip gcc-3a5e0e62b07ec9e85ba401d2a2d3b4641fa3fb99.tar.gz gcc-3a5e0e62b07ec9e85ba401d2a2d3b4641fa3fb99.tar.bz2 | |
acinclude.m4 (GLIBCPP_ENABLE_THREADS): Add relative path to staged/installed area to support -I-.
libstdc++/3243
* acinclude.m4 (GLIBCPP_ENABLE_THREADS): Add relative path to
staged/installed area to support -I-. Document.
* aclocal.m4: Regenerate.
* configure: Regenerate.
From-SVN: r43709
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 6 | ||||
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 6 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 3 |
4 files changed, 18 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d4089dd..3a67e89 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 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. + * aclocal.m4: Regenerate. + * configure: Regenerate. + +2001-07-02 Loren J. Rittle <ljrittle@acm.org> + libstdc++/2211 * src/ios.cc (ios_base::Init::_S_ios_create): Rename __bufsize to __out_bufsize. Add __in_bufsize, document it and use it. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 6f376db..a4e733f 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1142,7 +1142,8 @@ dnl macro names into user-provided C++ code, we first stage into <file>-in dnl and process to <file> with an output command. The reason for a two- dnl stage process here is to correctly handle $srcdir!=$objdir without dnl having to write complex code (the sed commands to clean the macro -dnl namespace are complex and fragile enough as it is). +dnl namespace are complex and fragile enough as it is). We must also +dnl add a relative path so that -I- is supported properly. dnl AC_DEFUN(GLIBCPP_ENABLE_THREADS, [ AC_MSG_CHECKING([for thread model used by GCC]) @@ -1160,7 +1161,8 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [ fi AC_OUTPUT_COMMANDS([d=include/bits 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 >$d/gthr.h + sed '/^#/s/\([A-Z_][A-Z_]*\)/_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/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \ diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 8b550bf..ab97637 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1154,7 +1154,8 @@ dnl macro names into user-provided C++ code, we first stage into <file>-in dnl and process to <file> with an output command. The reason for a two- dnl stage process here is to correctly handle $srcdir!=$objdir without dnl having to write complex code (the sed commands to clean the macro -dnl namespace are complex and fragile enough as it is). +dnl namespace are complex and fragile enough as it is). We must also +dnl add a relative path so that -I- is supported properly. dnl AC_DEFUN(GLIBCPP_ENABLE_THREADS, [ AC_MSG_CHECKING([for thread model used by GCC]) @@ -1172,7 +1173,8 @@ AC_DEFUN(GLIBCPP_ENABLE_THREADS, [ fi AC_OUTPUT_COMMANDS([d=include/bits 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 >$d/gthr.h + sed '/^#/s/\([A-Z_][A-Z_]*\)/_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/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \ diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 341f8a4..986cab9 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -16871,7 +16871,8 @@ cat >> $CONFIG_STATUS <<\EOF test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h d=include/bits 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 >$d/gthr.h + sed '/^#/s/\([A-Z_][A-Z_]*\)/_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/\(UNUSED\)/_GLIBCPP_\1/g' <$d/gthr-default.h-in \ |