* include/Makefile.am (/gthr.h): Don't add

        _GLIBCXX_ to #pragma lines.
        * include/Makefile.in: Update.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86343 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7fa0713..6d7bba1 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-20  Jason Merrill  <jason@redhat.com>
+
+       * include/Makefile.am (${host_builddir}/gthr.h): Don't add
+       _GLIBCXX_ to #pragma lines.
+       * include/Makefile.in: Update.
+
 2004-08-20  Paolo Carlini  <pcarlini@suse.de>
 
        PR libstdc++/7219 (continued)

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 5ff3898..c502d72 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -507,7 +507,8 @@ ${host_builddir}/c++config.h: ${top_builddir}/config.h \
 uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_]
 
 ${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
-       sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
+       sed -e '/^#pragma/b' \
+           -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
            -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
            -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
            < ${toplevel_srcdir}/gcc/gthr.h > $@

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 8ff8fc7..cdf305d 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -882,7 +882,8 @@ ${host_builddir}/c++config.h: ${top_builddir}/config.h \
        echo "#endif // _CXXCONFIG_" >>$@
 
 ${host_builddir}/gthr.h: ${toplevel_srcdir}/gcc/gthr.h stamp-${host_alias}
-       sed -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
+       sed -e '/^#pragma/b' \
+           -e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
            -e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
            -e 's,^#include "\(.*\)",#include <bits/\1>,g' \
            < ${toplevel_srcdir}/gcc/gthr.h > $@