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

+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)

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 > $@

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 > $@