From 168aacd938a268e040b23667d343bfdc9de3aaf6 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 20 Aug 2004 19:52:08 -0400 Subject: [PATCH] Makefile.am (/gthr.h): Don't add _GLIBCXX_ to #pragma lines. * include/Makefile.am (/gthr.h): Don't add _GLIBCXX_ to #pragma lines. * include/Makefile.in: Update. From-SVN: r86343 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/Makefile.am | 3 ++- 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 + + * include/Makefile.am (${host_builddir}/gthr.h): Don't add + _GLIBCXX_ to #pragma lines. + * include/Makefile.in: Update. + 2004-08-20 Paolo Carlini 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 ,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 ,g' \ < ${toplevel_srcdir}/gcc/gthr.h > $@ -- 2.30.2