aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2015-07-20 18:39:54 -0400
committerJason Merrill <jason@gcc.gnu.org>2015-07-20 18:39:54 -0400
commit3a353ff58449a182ce0cb62165d2468bea569d19 (patch)
tree92ea7425778b17c11443ea64191775745a6e8d95
parent73c581fbd134a93a6911f5a4c5e1db91a9f3837e (diff)
downloadgcc-3a353ff58449a182ce0cb62165d2468bea569d19.zip
gcc-3a353ff58449a182ce0cb62165d2468bea569d19.tar.gz
gcc-3a353ff58449a182ce0cb62165d2468bea569d19.tar.bz2
* include/bits/c++config: Fix abi_tag in special modes.
From-SVN: r226022
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/c++config2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e68f942..c1c9052 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-20 Jason Merrill <jason@redhat.com>
+
+ * include/bits/c++config: Fix abi_tag in special modes.
+
2015-07-19 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/status_cxx2017.xml: Fix URL for N4279.
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 34acca3..d450f61 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -296,7 +296,7 @@ namespace std
# endif
# if _GLIBCXX_USE_CXX11_ABI
- inline namespace __cxx11 __attribute__((__abi_tag__)) { }
+ inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
# endif
}