aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-05-08 19:08:32 +0000
committerKai Tietz <ktietz@gcc.gnu.org>2013-05-08 21:08:32 +0200
commitea31132e782010c8cb175e137276f0a1ae3b40e0 (patch)
tree50b8005b8efc309e18083f3d1e2241dc9e932ea5
parent492a80292b049552c5f54d22e9edac40f8802bd5 (diff)
downloadgcc-ea31132e782010c8cb175e137276f0a1ae3b40e0.zip
gcc-ea31132e782010c8cb175e137276f0a1ae3b40e0.tar.gz
gcc-ea31132e782010c8cb175e137276f0a1ae3b40e0.tar.bz2
re PR libstdc++/57212 (Don't use pe-coff weak support with mingw)
2013-05-08 Andoni Morales Alastruey <ylatuya@gmail.com> PR libstdc++/57212 * include/Makefile.am (_GLIBCXX___MINGW32_GLIBCXX___): Modify to __MINGW32__. * include/Makefile.in: Regenerated. From-SVN: r198720
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/Makefile.am1
-rw-r--r--libstdc++-v3/include/Makefile.in1
3 files changed, 9 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e6d8734..31019bf 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-08 Andoni Morales Alastruey <ylatuya@gmail.com>
+
+ PR libstdc++/57212
+ * include/Makefile.am (_GLIBCXX___MINGW32_GLIBCXX___): Modify
+ to __MINGW32__.
+ * include/Makefile.in: Regenerated.
+
2013-05-07 François Dumont <fdumont@gcc.gnu.org>
* include/profile/unordered_base.h: New.
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 11cb4df..cbf4f1a 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1133,6 +1133,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
sed -e '/^#pragma/b' \
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
+ -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
< $< > $@
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index b69f757..b34e174 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1534,6 +1534,7 @@ ${host_builddir}/gthr.h: ${toplevel_srcdir}/libgcc/gthr.h stamp-${host_alias}
sed -e '/^#pragma/b' \
-e '/^#/s/\(${uppercase}${uppercase}*\)/_GLIBCXX_\1/g' \
-e 's/_GLIBCXX_SUPPORTS_WEAK/__GXX_WEAK__/g' \
+ -e 's/_GLIBCXX___MINGW32_GLIBCXX___/__MINGW32__/g' \
-e 's,^#include "\(.*\)",#include <bits/\1>,g' \
< $< > $@