aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2018-10-15 13:58:51 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2018-10-15 13:58:51 +0100
commitf9bd185f189b26627959671bc65dc44d2e769e3e (patch)
tree6243f67adfef81040fb976910fe5e2e8d753e139 /libstdc++-v3
parent0df7c778ed50095a0c4b266b4beb8b783de832a8 (diff)
downloadgcc-f9bd185f189b26627959671bc65dc44d2e769e3e.zip
gcc-f9bd185f189b26627959671bc65dc44d2e769e3e.tar.gz
gcc-f9bd185f189b26627959671bc65dc44d2e769e3e.tar.bz2
PR libstdc++/87587 prevent -Wabi warnings
The warnings about changes to empty struct parameter passing can be ignored because the callers are all internal to the library, and so compiled with the same -fabi-version as the function definitions. It would be preferable to use #pragma GCC diagnostic warning "-Wabi=12" to get warnings about any other ABI changes in future versions, but until PR c++/87611 is fixed the warnings must be completely disabled with #pragma GCC diagnostic ignroed "-Wabi". PR libstdc++/87587 * src/c++11/cxx11-shim_facets.cc: Suppress -Wabi warnings. From-SVN: r265163
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/c++11/cxx11-shim_facets.cc7
2 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1c2e0ff..29f806e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-15 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/87587
+ * src/c++11/cxx11-shim_facets.cc: Suppress -Wabi warnings.
+
2018-10-15 François Dumont <fdumont@gcc.gnu.org>
* include/debug/vector (vector<>::cbegin()): Use C++11 direct
diff --git a/libstdc++-v3/src/c++11/cxx11-shim_facets.cc b/libstdc++-v3/src/c++11/cxx11-shim_facets.cc
index 017b0a0..78537bd 100644
--- a/libstdc++-v3/src/c++11/cxx11-shim_facets.cc
+++ b/libstdc++-v3/src/c++11/cxx11-shim_facets.cc
@@ -224,6 +224,11 @@ namespace __facet_shims
void
__messages_close(other_abi, const facet*, messages_base::catalog);
+#pragma GCC diagnostic push
+// Suppress -Wabi=2 warnings due to empty struct argument passing changes.
+// TODO This should use -Wabi=12 but that currently fails (PR c++/87611).
+#pragma GCC diagnostic ignored "-Wabi"
+
namespace // unnamed
{
struct __shim_accessor : facet
@@ -767,6 +772,8 @@ namespace __facet_shims
return m->put(s, intl, io, fill, units);
}
+#pragma GCC diagnostic pop
+
template ostreambuf_iterator<char>
__money_put(current_abi, const facet*, ostreambuf_iterator<char>,
bool, ios_base&, char, long double, const __any_string*);