From 28911f626864e73c579ea2ad5f5308d2e8c3fcd9 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 2 Oct 2024 20:27:55 +0100
Subject: [PATCH] libstdc++: Fix some warnings seen during bootstrap
libstdc++-v3/ChangeLog:
* include/bits/locale_facets_nonio.tcc (money_put::__do_get):
Ignore -Wformat warning for __ibm128 arguments.
* include/tr1/tuple (ignore): Ignore -Wunused warning.
---
libstdc++-v3/include/bits/locale_facets_nonio.tcc | 3 +++
libstdc++-v3/include/tr1/tuple | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.tcc b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
index 5fddc1e3b269..53553d113b23 100644
--- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
@@ -637,6 +637,8 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL_OR_CXX11
#if defined _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT \
&& defined __LONG_DOUBLE_IEEE128__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat" // '%Lf' expects 'long double'
extern "C"
__typeof__(__builtin_snprintf) __glibcxx_snprintfibm128 __asm__("snprintf");
@@ -671,6 +673,7 @@ __typeof__(__builtin_snprintf) __glibcxx_snprintfibm128 __asm__("snprintf");
return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
: _M_insert<false>(__s, __io, __fill, __digits);
}
+#pragma GCC diagnostic pop
#endif
_GLIBCXX_END_NAMESPACE_LDBL_OR_CXX11
diff --git a/libstdc++-v3/include/tr1/tuple b/libstdc++-v3/include/tr1/tuple
index b5c62b585a9a..f66090d36317 100644
--- a/libstdc++-v3/include/tr1/tuple
+++ b/libstdc++-v3/include/tr1/tuple
@@ -423,7 +423,7 @@ namespace tr1
// TODO: Put this in some kind of shared file.
namespace
{
- _Swallow_assign ignore;
+ _Swallow_assign ignore __attribute__((__unused__));
} // anonymous namespace
}
--
GitLab