diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-20 23:52:08 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-08-20 23:52:08 +0000 |
| commit | a4f897ff9d1f8290e126b3d98cab5cbccd5c082a (patch) | |
| tree | c078ccf4961c9b53105c77b5fd2b2e15ea090947 /libstdc++-v3 | |
| parent | f25bee5a48a12a3a55c9b911c549e8d0b64d6a7d (diff) | |
| download | gcc-a4f897ff9d1f8290e126b3d98cab5cbccd5c082a.tar.gz | |
* 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
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7fa0713db92..6d7bba14f96 100644 --- 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 5ff38983d23..c502d72527f 100644 --- 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 8ff8fc747aa..cdf305dddaa 100644 --- 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 > $@ |