public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/clang] Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
@ 2022-03-16 17:59 Adhemerval Zanella
0 siblings, 0 replies; 4+ messages in thread
From: Adhemerval Zanella @ 2022-03-16 17:59 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=40c8a0213ccc0970707f2322572564bd7d9ba3ac
commit 40c8a0213ccc0970707f2322572564bd7d9ba3ac
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Mar 9 15:51:50 2022 -0300
Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
To handle compiler that do not support such option.
Diff:
---
hurd/hurdsig.c | 2 +-
include/libc-diag.h | 8 ++++++++
inet/net-internal.h | 2 +-
malloc/malloc-check.c | 2 +-
nis/nis_table.c | 2 +-
resolv/res_send.c | 10 +++++-----
stdio-common/vfscanf-internal.c | 2 +-
stdlib/bug-getcontext.c | 2 +-
sunrpc/clnt_udp.c | 2 +-
sysdeps/ieee754/dbl-64/e_lgamma_r.c | 2 +-
sysdeps/ieee754/dbl-64/k_rem_pio2.c | 2 +-
sysdeps/ieee754/flt-32/e_lgammaf_r.c | 2 +-
sysdeps/ieee754/ldbl-128/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-128ibm/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-96/e_lgammal_r.c | 2 +-
sysdeps/ieee754/ldbl-96/k_tanl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ddivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_dfmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_dsqrtl.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdiv.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffma.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_fma.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmaf.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmal.c | 2 +-
26 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 2c7ea61c48..80172dd48d 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -374,7 +374,7 @@ interrupted_reply_port_location (thread_t thread,
/* GCC 6 and before seem to be confused by the setjmp call inside
_hurdsig_catch_memory_fault and think that we may be returning a second
time to here with portloc uninitialized (but we never do). */
- DIAG_IGNORE_NEEDS_COMMENT (6, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (6);
/* Fault now if this pointer is bogus. */
*(volatile mach_port_t *) portloc = *portloc;
DIAG_POP_NEEDS_COMMENT;
diff --git a/include/libc-diag.h b/include/libc-diag.h
index 271c5b8810..bc273716e3 100644
--- a/include/libc-diag.h
+++ b/include/libc-diag.h
@@ -71,4 +71,12 @@
# define DIAG_IGNORE_Os_NEEDS_COMMENT(version, option)
#endif
+/* Some warnings are not support for all compilers. */
+#ifndef __clang__
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION) \
+ DIAG_IGNORE_NEEDS_COMMENT (VERSION, "-Wmaybe-uninitialized")
+#else
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION)
+#endif
+
#endif /* libc-diag.h */
diff --git a/inet/net-internal.h b/inet/net-internal.h
index cdccdd3976..13f25d6a14 100644
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -106,7 +106,7 @@ __deadline_is_infinite (struct deadline deadline)
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91691
*/
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Return true if the current time is at the deadline or past it. */
static inline bool
diff --git a/malloc/malloc-check.c b/malloc/malloc-check.c
index e1f68bddfb..cd15865fc1 100644
--- a/malloc/malloc-check.c
+++ b/malloc/malloc-check.c
@@ -319,7 +319,7 @@ realloc_check (void *oldmem, size_t bytes)
#if __GNUC_PREREQ (7, 0)
/* GCC 7 warns about magic_p may be used uninitialized. But we never
reach here if magic_p is uninitialized. */
- DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#endif
/* mem2chunk_check changed the magic byte in the old chunk.
If newmem is NULL, then the old chunk will still be used though,
diff --git a/nis/nis_table.c b/nis/nis_table.c
index 31e763130e..0b2d9c9835 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -180,7 +180,7 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
/* Since tableptr is only set here, and it's set when tablepath is NULL,
which it is initially defined as, we know it will always be set here. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (*tableptr == NULL)
return NIS_NOTFOUND;
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 5d6be4b82d..b1bcfeaf96 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -266,7 +266,7 @@ __res_context_send (struct resolv_context *ctx,
Here the variable n is set to the return value of send_vc.
See below. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
int n;
DIAG_POP_NEEDS_COMMENT;
@@ -364,7 +364,7 @@ __res_context_send (struct resolv_context *ctx,
return (-1);
/* See comment at the declaration of n. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
if (n == 0 && (buf2 == NULL || *resplen2 == 0))
goto next_ns;
DIAG_POP_NEEDS_COMMENT;
@@ -388,7 +388,7 @@ __res_context_send (struct resolv_context *ctx,
/* See comment at the declaration of n. Note: resplen = n; */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Mask the AD bit in both responses unless it is
marked trusted. */
if (resplen > HFIXEDSZ)
@@ -575,7 +575,7 @@ send_vc(res_state statp,
a false-positive.
*/
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int resplen;
DIAG_POP_NEEDS_COMMENT;
struct iovec iov[4];
@@ -847,7 +847,7 @@ reopen (res_state statp, int *terrno, int ns)
the function return -1 before control flow reaches
the call to connect with slen. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (__connect (EXT (statp).nssocks[ns], nsap, slen) < 0) {
DIAG_POP_NEEDS_COMMENT;
__res_iclose(statp, false);
diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
index 2ad34050f3..97ca395102 100644
--- a/stdio-common/vfscanf-internal.c
+++ b/stdio-common/vfscanf-internal.c
@@ -1535,7 +1535,7 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr,
above, but the test for "map != NULL" is done
inside the loop here and outside the loop there. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (__glibc_unlikely (map != NULL))
wcdigits[n] = wcdigits_extended[n];
diff --git a/stdlib/bug-getcontext.c b/stdlib/bug-getcontext.c
index 55c681c480..d0f607e46e 100644
--- a/stdlib/bug-getcontext.c
+++ b/stdlib/bug-getcontext.c
@@ -56,7 +56,7 @@ do_test (void)
in local variables being clobbered on the second return from
getcontext), in fact an uninitialized use is not possible. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int mask = fegetexcept ();
if (mask != except_mask)
{
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index ee79b09b40..290fbd410c 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -299,7 +299,7 @@ clntudp_call (/* client handle */
inet/net-internal.h because in some other configurations GCC
gives the warning in an inline function. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (10, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (10);
struct deadline total_deadline; /* Determined once by overall timeout. */
DIAG_POP_NEEDS_COMMENT;
struct deadline response_deadline; /* Determined anew for each query. */
diff --git a/sysdeps/ieee754/dbl-64/e_lgamma_r.c b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
index 5ef289e8e8..b5609afe9e 100644
--- a/sysdeps/ieee754/dbl-64/e_lgamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
@@ -304,7 +304,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/dbl-64/k_rem_pio2.c b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
index 6e2ef5d07b..d5d894cf44 100644
--- a/sysdeps/ieee754/dbl-64/k_rem_pio2.c
+++ b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
@@ -337,7 +337,7 @@ recompute:
to full precision (this function is not called for zero
arguments). */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
fv = math_narrow_eval (fq[0] - fv);
DIAG_POP_NEEDS_COMMENT;
for (i = 1; i <= jz; i++)
diff --git a/sysdeps/ieee754/flt-32/e_lgammaf_r.c b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
index a1a3a60454..0fe7eb4043 100644
--- a/sysdeps/ieee754/flt-32/e_lgammaf_r.c
+++ b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
@@ -239,7 +239,7 @@ __ieee754_lgammaf_r(float x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/ldbl-128/k_tanl.c b/sysdeps/ieee754/ldbl-128/k_tanl.c
index 8e93626a89..f10072d76c 100644
--- a/sysdeps/ieee754/ldbl-128/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (_Float128 x, _Float128 y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
index cd95e46089..afc74c92da 100644
--- a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
index c6f0e77057..32d89ea405 100644
--- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
+++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
@@ -431,7 +431,7 @@ __ieee754_lgammal_r (long double x, int *signgamp)
in warnings that it may be used uninitialized although in the
cases where it is used it has always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if (se & 0x8000)
r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/k_tanl.c b/sysdeps/ieee754/ldbl-96/k_tanl.c
index 43a5aa4423..35ead7dce1 100644
--- a/sysdeps/ieee754/ldbl-96/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-96/k_tanl.c
@@ -140,7 +140,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.8);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/soft-fp/s_ddivl.c b/sysdeps/ieee754/soft-fp/s_ddivl.c
index 2f80cca0ab..9ac7b7a34f 100644
--- a/sysdeps/ieee754/soft-fp/s_ddivl.c
+++ b/sysdeps/ieee754/soft-fp/s_ddivl.c
@@ -37,7 +37,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dfmal.c b/sysdeps/ieee754/soft-fp/s_dfmal.c
index 208ad445a0..75d45efc5d 100644
--- a/sysdeps/ieee754/soft-fp/s_dfmal.c
+++ b/sysdeps/ieee754/soft-fp/s_dfmal.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dsqrtl.c b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
index 22c0d0cc63..aff55c766f 100644
--- a/sysdeps/ieee754/soft-fp/s_dsqrtl.c
+++ b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
@@ -35,7 +35,7 @@
does not see that they are set in all cases where they are used,
resulting in warnings that they may be used uninitialized. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c
index 4c4eb7cae9..a918136e28 100644
--- a/sysdeps/ieee754/soft-fp/s_fdiv.c
+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c
@@ -34,7 +34,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdivl.c b/sysdeps/ieee754/soft-fp/s_fdivl.c
index 07196ee787..75055ad755 100644
--- a/sysdeps/ieee754/soft-fp/s_fdivl.c
+++ b/sysdeps/ieee754/soft-fp/s_fdivl.c
@@ -33,7 +33,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffma.c b/sysdeps/ieee754/soft-fp/s_ffma.c
index 3f750be219..0eb92e4232 100644
--- a/sysdeps/ieee754/soft-fp/s_ffma.c
+++ b/sysdeps/ieee754/soft-fp/s_ffma.c
@@ -35,7 +35,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffmal.c b/sysdeps/ieee754/soft-fp/s_ffmal.c
index 97f4e68782..c1ff207f1b 100644
--- a/sysdeps/ieee754/soft-fp/s_ffmal.c
+++ b/sysdeps/ieee754/soft-fp/s_ffmal.c
@@ -33,7 +33,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fma.c b/sysdeps/ieee754/soft-fp/s_fma.c
index dde16148c4..33250b89ac 100644
--- a/sysdeps/ieee754/soft-fp/s_fma.c
+++ b/sysdeps/ieee754/soft-fp/s_fma.c
@@ -42,7 +42,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "double.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmaf.c b/sysdeps/ieee754/soft-fp/s_fmaf.c
index 5617cec0b7..840871b99d 100644
--- a/sysdeps/ieee754/soft-fp/s_fmaf.c
+++ b/sysdeps/ieee754/soft-fp/s_fmaf.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "single.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmal.c b/sysdeps/ieee754/soft-fp/s_fmal.c
index 3ca60a8df7..6c5d6d9dcd 100644
--- a/sysdeps/ieee754/soft-fp/s_fmal.c
+++ b/sysdeps/ieee754/soft-fp/s_fmal.c
@@ -40,7 +40,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "quad.h"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/azanella/clang] Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
@ 2022-03-15 18:37 Adhemerval Zanella
0 siblings, 0 replies; 4+ messages in thread
From: Adhemerval Zanella @ 2022-03-15 18:37 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=40c8a0213ccc0970707f2322572564bd7d9ba3ac
commit 40c8a0213ccc0970707f2322572564bd7d9ba3ac
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Mar 9 15:51:50 2022 -0300
Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
To handle compiler that do not support such option.
Diff:
---
hurd/hurdsig.c | 2 +-
include/libc-diag.h | 8 ++++++++
inet/net-internal.h | 2 +-
malloc/malloc-check.c | 2 +-
nis/nis_table.c | 2 +-
resolv/res_send.c | 10 +++++-----
stdio-common/vfscanf-internal.c | 2 +-
stdlib/bug-getcontext.c | 2 +-
sunrpc/clnt_udp.c | 2 +-
sysdeps/ieee754/dbl-64/e_lgamma_r.c | 2 +-
sysdeps/ieee754/dbl-64/k_rem_pio2.c | 2 +-
sysdeps/ieee754/flt-32/e_lgammaf_r.c | 2 +-
sysdeps/ieee754/ldbl-128/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-128ibm/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-96/e_lgammal_r.c | 2 +-
sysdeps/ieee754/ldbl-96/k_tanl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ddivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_dfmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_dsqrtl.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdiv.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffma.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_fma.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmaf.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmal.c | 2 +-
26 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 2c7ea61c48..80172dd48d 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -374,7 +374,7 @@ interrupted_reply_port_location (thread_t thread,
/* GCC 6 and before seem to be confused by the setjmp call inside
_hurdsig_catch_memory_fault and think that we may be returning a second
time to here with portloc uninitialized (but we never do). */
- DIAG_IGNORE_NEEDS_COMMENT (6, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (6);
/* Fault now if this pointer is bogus. */
*(volatile mach_port_t *) portloc = *portloc;
DIAG_POP_NEEDS_COMMENT;
diff --git a/include/libc-diag.h b/include/libc-diag.h
index 271c5b8810..bc273716e3 100644
--- a/include/libc-diag.h
+++ b/include/libc-diag.h
@@ -71,4 +71,12 @@
# define DIAG_IGNORE_Os_NEEDS_COMMENT(version, option)
#endif
+/* Some warnings are not support for all compilers. */
+#ifndef __clang__
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION) \
+ DIAG_IGNORE_NEEDS_COMMENT (VERSION, "-Wmaybe-uninitialized")
+#else
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION)
+#endif
+
#endif /* libc-diag.h */
diff --git a/inet/net-internal.h b/inet/net-internal.h
index cdccdd3976..13f25d6a14 100644
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -106,7 +106,7 @@ __deadline_is_infinite (struct deadline deadline)
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91691
*/
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Return true if the current time is at the deadline or past it. */
static inline bool
diff --git a/malloc/malloc-check.c b/malloc/malloc-check.c
index e1f68bddfb..cd15865fc1 100644
--- a/malloc/malloc-check.c
+++ b/malloc/malloc-check.c
@@ -319,7 +319,7 @@ realloc_check (void *oldmem, size_t bytes)
#if __GNUC_PREREQ (7, 0)
/* GCC 7 warns about magic_p may be used uninitialized. But we never
reach here if magic_p is uninitialized. */
- DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#endif
/* mem2chunk_check changed the magic byte in the old chunk.
If newmem is NULL, then the old chunk will still be used though,
diff --git a/nis/nis_table.c b/nis/nis_table.c
index 31e763130e..0b2d9c9835 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -180,7 +180,7 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
/* Since tableptr is only set here, and it's set when tablepath is NULL,
which it is initially defined as, we know it will always be set here. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (*tableptr == NULL)
return NIS_NOTFOUND;
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 5d6be4b82d..b1bcfeaf96 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -266,7 +266,7 @@ __res_context_send (struct resolv_context *ctx,
Here the variable n is set to the return value of send_vc.
See below. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
int n;
DIAG_POP_NEEDS_COMMENT;
@@ -364,7 +364,7 @@ __res_context_send (struct resolv_context *ctx,
return (-1);
/* See comment at the declaration of n. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
if (n == 0 && (buf2 == NULL || *resplen2 == 0))
goto next_ns;
DIAG_POP_NEEDS_COMMENT;
@@ -388,7 +388,7 @@ __res_context_send (struct resolv_context *ctx,
/* See comment at the declaration of n. Note: resplen = n; */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Mask the AD bit in both responses unless it is
marked trusted. */
if (resplen > HFIXEDSZ)
@@ -575,7 +575,7 @@ send_vc(res_state statp,
a false-positive.
*/
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int resplen;
DIAG_POP_NEEDS_COMMENT;
struct iovec iov[4];
@@ -847,7 +847,7 @@ reopen (res_state statp, int *terrno, int ns)
the function return -1 before control flow reaches
the call to connect with slen. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (__connect (EXT (statp).nssocks[ns], nsap, slen) < 0) {
DIAG_POP_NEEDS_COMMENT;
__res_iclose(statp, false);
diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
index 2ad34050f3..97ca395102 100644
--- a/stdio-common/vfscanf-internal.c
+++ b/stdio-common/vfscanf-internal.c
@@ -1535,7 +1535,7 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr,
above, but the test for "map != NULL" is done
inside the loop here and outside the loop there. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (__glibc_unlikely (map != NULL))
wcdigits[n] = wcdigits_extended[n];
diff --git a/stdlib/bug-getcontext.c b/stdlib/bug-getcontext.c
index 55c681c480..d0f607e46e 100644
--- a/stdlib/bug-getcontext.c
+++ b/stdlib/bug-getcontext.c
@@ -56,7 +56,7 @@ do_test (void)
in local variables being clobbered on the second return from
getcontext), in fact an uninitialized use is not possible. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int mask = fegetexcept ();
if (mask != except_mask)
{
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index ee79b09b40..290fbd410c 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -299,7 +299,7 @@ clntudp_call (/* client handle */
inet/net-internal.h because in some other configurations GCC
gives the warning in an inline function. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (10, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (10);
struct deadline total_deadline; /* Determined once by overall timeout. */
DIAG_POP_NEEDS_COMMENT;
struct deadline response_deadline; /* Determined anew for each query. */
diff --git a/sysdeps/ieee754/dbl-64/e_lgamma_r.c b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
index 5ef289e8e8..b5609afe9e 100644
--- a/sysdeps/ieee754/dbl-64/e_lgamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
@@ -304,7 +304,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/dbl-64/k_rem_pio2.c b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
index 6e2ef5d07b..d5d894cf44 100644
--- a/sysdeps/ieee754/dbl-64/k_rem_pio2.c
+++ b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
@@ -337,7 +337,7 @@ recompute:
to full precision (this function is not called for zero
arguments). */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
fv = math_narrow_eval (fq[0] - fv);
DIAG_POP_NEEDS_COMMENT;
for (i = 1; i <= jz; i++)
diff --git a/sysdeps/ieee754/flt-32/e_lgammaf_r.c b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
index a1a3a60454..0fe7eb4043 100644
--- a/sysdeps/ieee754/flt-32/e_lgammaf_r.c
+++ b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
@@ -239,7 +239,7 @@ __ieee754_lgammaf_r(float x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/ldbl-128/k_tanl.c b/sysdeps/ieee754/ldbl-128/k_tanl.c
index 8e93626a89..f10072d76c 100644
--- a/sysdeps/ieee754/ldbl-128/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (_Float128 x, _Float128 y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
index cd95e46089..afc74c92da 100644
--- a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
index c6f0e77057..32d89ea405 100644
--- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
+++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
@@ -431,7 +431,7 @@ __ieee754_lgammal_r (long double x, int *signgamp)
in warnings that it may be used uninitialized although in the
cases where it is used it has always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if (se & 0x8000)
r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/k_tanl.c b/sysdeps/ieee754/ldbl-96/k_tanl.c
index 43a5aa4423..35ead7dce1 100644
--- a/sysdeps/ieee754/ldbl-96/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-96/k_tanl.c
@@ -140,7 +140,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.8);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/soft-fp/s_ddivl.c b/sysdeps/ieee754/soft-fp/s_ddivl.c
index 2f80cca0ab..9ac7b7a34f 100644
--- a/sysdeps/ieee754/soft-fp/s_ddivl.c
+++ b/sysdeps/ieee754/soft-fp/s_ddivl.c
@@ -37,7 +37,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dfmal.c b/sysdeps/ieee754/soft-fp/s_dfmal.c
index 208ad445a0..75d45efc5d 100644
--- a/sysdeps/ieee754/soft-fp/s_dfmal.c
+++ b/sysdeps/ieee754/soft-fp/s_dfmal.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dsqrtl.c b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
index 22c0d0cc63..aff55c766f 100644
--- a/sysdeps/ieee754/soft-fp/s_dsqrtl.c
+++ b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
@@ -35,7 +35,7 @@
does not see that they are set in all cases where they are used,
resulting in warnings that they may be used uninitialized. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c
index 4c4eb7cae9..a918136e28 100644
--- a/sysdeps/ieee754/soft-fp/s_fdiv.c
+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c
@@ -34,7 +34,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdivl.c b/sysdeps/ieee754/soft-fp/s_fdivl.c
index 07196ee787..75055ad755 100644
--- a/sysdeps/ieee754/soft-fp/s_fdivl.c
+++ b/sysdeps/ieee754/soft-fp/s_fdivl.c
@@ -33,7 +33,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffma.c b/sysdeps/ieee754/soft-fp/s_ffma.c
index 3f750be219..0eb92e4232 100644
--- a/sysdeps/ieee754/soft-fp/s_ffma.c
+++ b/sysdeps/ieee754/soft-fp/s_ffma.c
@@ -35,7 +35,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffmal.c b/sysdeps/ieee754/soft-fp/s_ffmal.c
index 97f4e68782..c1ff207f1b 100644
--- a/sysdeps/ieee754/soft-fp/s_ffmal.c
+++ b/sysdeps/ieee754/soft-fp/s_ffmal.c
@@ -33,7 +33,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fma.c b/sysdeps/ieee754/soft-fp/s_fma.c
index dde16148c4..33250b89ac 100644
--- a/sysdeps/ieee754/soft-fp/s_fma.c
+++ b/sysdeps/ieee754/soft-fp/s_fma.c
@@ -42,7 +42,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "double.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmaf.c b/sysdeps/ieee754/soft-fp/s_fmaf.c
index 5617cec0b7..840871b99d 100644
--- a/sysdeps/ieee754/soft-fp/s_fmaf.c
+++ b/sysdeps/ieee754/soft-fp/s_fmaf.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "single.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmal.c b/sysdeps/ieee754/soft-fp/s_fmal.c
index 3ca60a8df7..6c5d6d9dcd 100644
--- a/sysdeps/ieee754/soft-fp/s_fmal.c
+++ b/sysdeps/ieee754/soft-fp/s_fmal.c
@@ -40,7 +40,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "quad.h"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/azanella/clang] Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
@ 2022-03-11 17:21 Adhemerval Zanella
0 siblings, 0 replies; 4+ messages in thread
From: Adhemerval Zanella @ 2022-03-11 17:21 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3d5c7ea6729a4a70944fa40dbc809bb52ff67b4d
commit 3d5c7ea6729a4a70944fa40dbc809bb52ff67b4d
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Mar 9 15:51:50 2022 -0300
Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
To handle compiler that do not support such option.
Diff:
---
hurd/hurdsig.c | 2 +-
include/libc-diag.h | 8 ++++++++
inet/net-internal.h | 2 +-
malloc/malloc-check.c | 2 +-
nis/nis_table.c | 2 +-
resolv/res_send.c | 10 +++++-----
stdio-common/vfscanf-internal.c | 2 +-
stdlib/bug-getcontext.c | 2 +-
sunrpc/clnt_udp.c | 2 +-
sysdeps/ieee754/dbl-64/e_lgamma_r.c | 2 +-
sysdeps/ieee754/dbl-64/k_rem_pio2.c | 2 +-
sysdeps/ieee754/flt-32/e_lgammaf_r.c | 2 +-
sysdeps/ieee754/ldbl-128/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-128ibm/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-96/e_lgammal_r.c | 2 +-
sysdeps/ieee754/ldbl-96/k_tanl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ddivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_dfmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_dsqrtl.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdiv.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffma.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_fma.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmaf.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmal.c | 2 +-
26 files changed, 37 insertions(+), 29 deletions(-)
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 2c7ea61c48..80172dd48d 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -374,7 +374,7 @@ interrupted_reply_port_location (thread_t thread,
/* GCC 6 and before seem to be confused by the setjmp call inside
_hurdsig_catch_memory_fault and think that we may be returning a second
time to here with portloc uninitialized (but we never do). */
- DIAG_IGNORE_NEEDS_COMMENT (6, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (6);
/* Fault now if this pointer is bogus. */
*(volatile mach_port_t *) portloc = *portloc;
DIAG_POP_NEEDS_COMMENT;
diff --git a/include/libc-diag.h b/include/libc-diag.h
index 271c5b8810..bc273716e3 100644
--- a/include/libc-diag.h
+++ b/include/libc-diag.h
@@ -71,4 +71,12 @@
# define DIAG_IGNORE_Os_NEEDS_COMMENT(version, option)
#endif
+/* Some warnings are not support for all compilers. */
+#ifndef __clang__
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION) \
+ DIAG_IGNORE_NEEDS_COMMENT (VERSION, "-Wmaybe-uninitialized")
+#else
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION)
+#endif
+
#endif /* libc-diag.h */
diff --git a/inet/net-internal.h b/inet/net-internal.h
index cdccdd3976..13f25d6a14 100644
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -106,7 +106,7 @@ __deadline_is_infinite (struct deadline deadline)
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91691
*/
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Return true if the current time is at the deadline or past it. */
static inline bool
diff --git a/malloc/malloc-check.c b/malloc/malloc-check.c
index e1f68bddfb..cd15865fc1 100644
--- a/malloc/malloc-check.c
+++ b/malloc/malloc-check.c
@@ -319,7 +319,7 @@ realloc_check (void *oldmem, size_t bytes)
#if __GNUC_PREREQ (7, 0)
/* GCC 7 warns about magic_p may be used uninitialized. But we never
reach here if magic_p is uninitialized. */
- DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#endif
/* mem2chunk_check changed the magic byte in the old chunk.
If newmem is NULL, then the old chunk will still be used though,
diff --git a/nis/nis_table.c b/nis/nis_table.c
index 31e763130e..0b2d9c9835 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -180,7 +180,7 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
/* Since tableptr is only set here, and it's set when tablepath is NULL,
which it is initially defined as, we know it will always be set here. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (*tableptr == NULL)
return NIS_NOTFOUND;
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 5d6be4b82d..b1bcfeaf96 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -266,7 +266,7 @@ __res_context_send (struct resolv_context *ctx,
Here the variable n is set to the return value of send_vc.
See below. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
int n;
DIAG_POP_NEEDS_COMMENT;
@@ -364,7 +364,7 @@ __res_context_send (struct resolv_context *ctx,
return (-1);
/* See comment at the declaration of n. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
if (n == 0 && (buf2 == NULL || *resplen2 == 0))
goto next_ns;
DIAG_POP_NEEDS_COMMENT;
@@ -388,7 +388,7 @@ __res_context_send (struct resolv_context *ctx,
/* See comment at the declaration of n. Note: resplen = n; */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Mask the AD bit in both responses unless it is
marked trusted. */
if (resplen > HFIXEDSZ)
@@ -575,7 +575,7 @@ send_vc(res_state statp,
a false-positive.
*/
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int resplen;
DIAG_POP_NEEDS_COMMENT;
struct iovec iov[4];
@@ -847,7 +847,7 @@ reopen (res_state statp, int *terrno, int ns)
the function return -1 before control flow reaches
the call to connect with slen. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (__connect (EXT (statp).nssocks[ns], nsap, slen) < 0) {
DIAG_POP_NEEDS_COMMENT;
__res_iclose(statp, false);
diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
index 2ad34050f3..97ca395102 100644
--- a/stdio-common/vfscanf-internal.c
+++ b/stdio-common/vfscanf-internal.c
@@ -1535,7 +1535,7 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr,
above, but the test for "map != NULL" is done
inside the loop here and outside the loop there. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (__glibc_unlikely (map != NULL))
wcdigits[n] = wcdigits_extended[n];
diff --git a/stdlib/bug-getcontext.c b/stdlib/bug-getcontext.c
index 55c681c480..d0f607e46e 100644
--- a/stdlib/bug-getcontext.c
+++ b/stdlib/bug-getcontext.c
@@ -56,7 +56,7 @@ do_test (void)
in local variables being clobbered on the second return from
getcontext), in fact an uninitialized use is not possible. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int mask = fegetexcept ();
if (mask != except_mask)
{
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index ee79b09b40..290fbd410c 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -299,7 +299,7 @@ clntudp_call (/* client handle */
inet/net-internal.h because in some other configurations GCC
gives the warning in an inline function. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (10, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (10);
struct deadline total_deadline; /* Determined once by overall timeout. */
DIAG_POP_NEEDS_COMMENT;
struct deadline response_deadline; /* Determined anew for each query. */
diff --git a/sysdeps/ieee754/dbl-64/e_lgamma_r.c b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
index 5ef289e8e8..b5609afe9e 100644
--- a/sysdeps/ieee754/dbl-64/e_lgamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
@@ -304,7 +304,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/dbl-64/k_rem_pio2.c b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
index 6e2ef5d07b..d5d894cf44 100644
--- a/sysdeps/ieee754/dbl-64/k_rem_pio2.c
+++ b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
@@ -337,7 +337,7 @@ recompute:
to full precision (this function is not called for zero
arguments). */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
fv = math_narrow_eval (fq[0] - fv);
DIAG_POP_NEEDS_COMMENT;
for (i = 1; i <= jz; i++)
diff --git a/sysdeps/ieee754/flt-32/e_lgammaf_r.c b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
index a1a3a60454..0fe7eb4043 100644
--- a/sysdeps/ieee754/flt-32/e_lgammaf_r.c
+++ b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
@@ -239,7 +239,7 @@ __ieee754_lgammaf_r(float x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/ldbl-128/k_tanl.c b/sysdeps/ieee754/ldbl-128/k_tanl.c
index 8e93626a89..f10072d76c 100644
--- a/sysdeps/ieee754/ldbl-128/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (_Float128 x, _Float128 y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
index cd95e46089..afc74c92da 100644
--- a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
index c6f0e77057..32d89ea405 100644
--- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
+++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
@@ -431,7 +431,7 @@ __ieee754_lgammal_r (long double x, int *signgamp)
in warnings that it may be used uninitialized although in the
cases where it is used it has always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if (se & 0x8000)
r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/k_tanl.c b/sysdeps/ieee754/ldbl-96/k_tanl.c
index 43a5aa4423..35ead7dce1 100644
--- a/sysdeps/ieee754/ldbl-96/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-96/k_tanl.c
@@ -140,7 +140,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.8);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/soft-fp/s_ddivl.c b/sysdeps/ieee754/soft-fp/s_ddivl.c
index 2f80cca0ab..9ac7b7a34f 100644
--- a/sysdeps/ieee754/soft-fp/s_ddivl.c
+++ b/sysdeps/ieee754/soft-fp/s_ddivl.c
@@ -37,7 +37,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dfmal.c b/sysdeps/ieee754/soft-fp/s_dfmal.c
index 208ad445a0..75d45efc5d 100644
--- a/sysdeps/ieee754/soft-fp/s_dfmal.c
+++ b/sysdeps/ieee754/soft-fp/s_dfmal.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dsqrtl.c b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
index 22c0d0cc63..aff55c766f 100644
--- a/sysdeps/ieee754/soft-fp/s_dsqrtl.c
+++ b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
@@ -35,7 +35,7 @@
does not see that they are set in all cases where they are used,
resulting in warnings that they may be used uninitialized. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c
index 4c4eb7cae9..a918136e28 100644
--- a/sysdeps/ieee754/soft-fp/s_fdiv.c
+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c
@@ -34,7 +34,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdivl.c b/sysdeps/ieee754/soft-fp/s_fdivl.c
index 07196ee787..75055ad755 100644
--- a/sysdeps/ieee754/soft-fp/s_fdivl.c
+++ b/sysdeps/ieee754/soft-fp/s_fdivl.c
@@ -33,7 +33,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffma.c b/sysdeps/ieee754/soft-fp/s_ffma.c
index 3f750be219..0eb92e4232 100644
--- a/sysdeps/ieee754/soft-fp/s_ffma.c
+++ b/sysdeps/ieee754/soft-fp/s_ffma.c
@@ -35,7 +35,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffmal.c b/sysdeps/ieee754/soft-fp/s_ffmal.c
index 97f4e68782..c1ff207f1b 100644
--- a/sysdeps/ieee754/soft-fp/s_ffmal.c
+++ b/sysdeps/ieee754/soft-fp/s_ffmal.c
@@ -33,7 +33,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fma.c b/sysdeps/ieee754/soft-fp/s_fma.c
index dde16148c4..33250b89ac 100644
--- a/sysdeps/ieee754/soft-fp/s_fma.c
+++ b/sysdeps/ieee754/soft-fp/s_fma.c
@@ -42,7 +42,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "double.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmaf.c b/sysdeps/ieee754/soft-fp/s_fmaf.c
index 5617cec0b7..840871b99d 100644
--- a/sysdeps/ieee754/soft-fp/s_fmaf.c
+++ b/sysdeps/ieee754/soft-fp/s_fmaf.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "single.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmal.c b/sysdeps/ieee754/soft-fp/s_fmal.c
index 3ca60a8df7..6c5d6d9dcd 100644
--- a/sysdeps/ieee754/soft-fp/s_fmal.c
+++ b/sysdeps/ieee754/soft-fp/s_fmal.c
@@ -40,7 +40,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "quad.h"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [glibc/azanella/clang] Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
@ 2022-03-10 19:20 Adhemerval Zanella
0 siblings, 0 replies; 4+ messages in thread
From: Adhemerval Zanella @ 2022-03-10 19:20 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4e5aecb3e67ac1c1fb2d0664f661624e297a7a8c
commit 4e5aecb3e67ac1c1fb2d0664f661624e297a7a8c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed Mar 9 15:51:50 2022 -0300
Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro
To handle compiler that do not support such option.
Diff:
---
hurd/hurdsig.c | 2 +-
include/libc-diag.h | 8 ++++++++
inet/net-internal.h | 2 +-
malloc/malloc-check.c | 2 +-
nis/nis_table.c | 2 +-
resolv/res_send.c | 10 +++++-----
stdio-common/vfscanf-internal.c | 2 +-
stdlib/bug-getcontext.c | 2 +-
sunrpc/clnt_udp.c | 2 +-
sysdeps/ieee754/dbl-64/e_lgamma_r.c | 2 +-
sysdeps/ieee754/dbl-64/k_rem_pio2.c | 2 +-
sysdeps/ieee754/flt-32/e_lgammaf_r.c | 2 +-
sysdeps/ieee754/ldbl-128/k_tanl.c | 2 +-
sysdeps/ieee754/ldbl-96/e_lgammal_r.c | 2 +-
sysdeps/ieee754/ldbl-96/k_tanl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ddivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_dfmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_dsqrtl.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdiv.c | 2 +-
sysdeps/ieee754/soft-fp/s_fdivl.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffma.c | 2 +-
sysdeps/ieee754/soft-fp/s_ffmal.c | 2 +-
sysdeps/ieee754/soft-fp/s_fma.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmaf.c | 2 +-
sysdeps/ieee754/soft-fp/s_fmal.c | 2 +-
25 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 2c7ea61c48..80172dd48d 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -374,7 +374,7 @@ interrupted_reply_port_location (thread_t thread,
/* GCC 6 and before seem to be confused by the setjmp call inside
_hurdsig_catch_memory_fault and think that we may be returning a second
time to here with portloc uninitialized (but we never do). */
- DIAG_IGNORE_NEEDS_COMMENT (6, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (6);
/* Fault now if this pointer is bogus. */
*(volatile mach_port_t *) portloc = *portloc;
DIAG_POP_NEEDS_COMMENT;
diff --git a/include/libc-diag.h b/include/libc-diag.h
index 271c5b8810..bc273716e3 100644
--- a/include/libc-diag.h
+++ b/include/libc-diag.h
@@ -71,4 +71,12 @@
# define DIAG_IGNORE_Os_NEEDS_COMMENT(version, option)
#endif
+/* Some warnings are not support for all compilers. */
+#ifndef __clang__
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION) \
+ DIAG_IGNORE_NEEDS_COMMENT (VERSION, "-Wmaybe-uninitialized")
+#else
+# define DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED(VERSION)
+#endif
+
#endif /* libc-diag.h */
diff --git a/inet/net-internal.h b/inet/net-internal.h
index cdccdd3976..13f25d6a14 100644
--- a/inet/net-internal.h
+++ b/inet/net-internal.h
@@ -106,7 +106,7 @@ __deadline_is_infinite (struct deadline deadline)
* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91691
*/
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Return true if the current time is at the deadline or past it. */
static inline bool
diff --git a/malloc/malloc-check.c b/malloc/malloc-check.c
index e1f68bddfb..cd15865fc1 100644
--- a/malloc/malloc-check.c
+++ b/malloc/malloc-check.c
@@ -319,7 +319,7 @@ realloc_check (void *oldmem, size_t bytes)
#if __GNUC_PREREQ (7, 0)
/* GCC 7 warns about magic_p may be used uninitialized. But we never
reach here if magic_p is uninitialized. */
- DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#endif
/* mem2chunk_check changed the magic byte in the old chunk.
If newmem is NULL, then the old chunk will still be used though,
diff --git a/nis/nis_table.c b/nis/nis_table.c
index 31e763130e..0b2d9c9835 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -180,7 +180,7 @@ __follow_path (char **tablepath, char **tableptr, struct ib_request *ibreq,
/* Since tableptr is only set here, and it's set when tablepath is NULL,
which it is initially defined as, we know it will always be set here. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (*tableptr == NULL)
return NIS_NOTFOUND;
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 5d6be4b82d..b1bcfeaf96 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -266,7 +266,7 @@ __res_context_send (struct resolv_context *ctx,
Here the variable n is set to the return value of send_vc.
See below. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
int n;
DIAG_POP_NEEDS_COMMENT;
@@ -364,7 +364,7 @@ __res_context_send (struct resolv_context *ctx,
return (-1);
/* See comment at the declaration of n. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
if (n == 0 && (buf2 == NULL || *resplen2 == 0))
goto next_ns;
DIAG_POP_NEEDS_COMMENT;
@@ -388,7 +388,7 @@ __res_context_send (struct resolv_context *ctx,
/* See comment at the declaration of n. Note: resplen = n; */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
/* Mask the AD bit in both responses unless it is
marked trusted. */
if (resplen > HFIXEDSZ)
@@ -575,7 +575,7 @@ send_vc(res_state statp,
a false-positive.
*/
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int resplen;
DIAG_POP_NEEDS_COMMENT;
struct iovec iov[4];
@@ -847,7 +847,7 @@ reopen (res_state statp, int *terrno, int ns)
the function return -1 before control flow reaches
the call to connect with slen. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_Os_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (__connect (EXT (statp).nssocks[ns], nsap, slen) < 0) {
DIAG_POP_NEEDS_COMMENT;
__res_iclose(statp, false);
diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
index 2ad34050f3..97ca395102 100644
--- a/stdio-common/vfscanf-internal.c
+++ b/stdio-common/vfscanf-internal.c
@@ -1535,7 +1535,7 @@ __vfscanf_internal (FILE *s, const char *format, va_list argptr,
above, but the test for "map != NULL" is done
inside the loop here and outside the loop there. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.7, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.7);
if (__glibc_unlikely (map != NULL))
wcdigits[n] = wcdigits_extended[n];
diff --git a/stdlib/bug-getcontext.c b/stdlib/bug-getcontext.c
index 55c681c480..d0f607e46e 100644
--- a/stdlib/bug-getcontext.c
+++ b/stdlib/bug-getcontext.c
@@ -56,7 +56,7 @@ do_test (void)
in local variables being clobbered on the second return from
getcontext), in fact an uninitialized use is not possible. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
int mask = fegetexcept ();
if (mask != except_mask)
{
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index ee79b09b40..290fbd410c 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -299,7 +299,7 @@ clntudp_call (/* client handle */
inet/net-internal.h because in some other configurations GCC
gives the warning in an inline function. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (10, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (10);
struct deadline total_deadline; /* Determined once by overall timeout. */
DIAG_POP_NEEDS_COMMENT;
struct deadline response_deadline; /* Determined anew for each query. */
diff --git a/sysdeps/ieee754/dbl-64/e_lgamma_r.c b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
index 5ef289e8e8..b5609afe9e 100644
--- a/sysdeps/ieee754/dbl-64/e_lgamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
@@ -304,7 +304,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/dbl-64/k_rem_pio2.c b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
index 6e2ef5d07b..d5d894cf44 100644
--- a/sysdeps/ieee754/dbl-64/k_rem_pio2.c
+++ b/sysdeps/ieee754/dbl-64/k_rem_pio2.c
@@ -337,7 +337,7 @@ recompute:
to full precision (this function is not called for zero
arguments). */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (9);
fv = math_narrow_eval (fq[0] - fv);
DIAG_POP_NEEDS_COMMENT;
for (i = 1; i <= jz; i++)
diff --git a/sysdeps/ieee754/flt-32/e_lgammaf_r.c b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
index a1a3a60454..0fe7eb4043 100644
--- a/sysdeps/ieee754/flt-32/e_lgammaf_r.c
+++ b/sysdeps/ieee754/flt-32/e_lgammaf_r.c
@@ -239,7 +239,7 @@ __ieee754_lgammaf_r(float x, int *signgamp)
although in the cases where it is used it has always been
set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
return r;
diff --git a/sysdeps/ieee754/ldbl-128/k_tanl.c b/sysdeps/ieee754/ldbl-128/k_tanl.c
index 8e93626a89..f10072d76c 100644
--- a/sysdeps/ieee754/ldbl-128/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-128/k_tanl.c
@@ -143,7 +143,7 @@ __kernel_tanl (_Float128 x, _Float128 y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (5);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
index c6f0e77057..32d89ea405 100644
--- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
+++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c
@@ -431,7 +431,7 @@ __ieee754_lgammal_r (long double x, int *signgamp)
in warnings that it may be used uninitialized although in the
cases where it is used it has always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
if (se & 0x8000)
r = nadj - r;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/ldbl-96/k_tanl.c b/sysdeps/ieee754/ldbl-96/k_tanl.c
index 43a5aa4423..35ead7dce1 100644
--- a/sysdeps/ieee754/ldbl-96/k_tanl.c
+++ b/sysdeps/ieee754/ldbl-96/k_tanl.c
@@ -140,7 +140,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has
always been set. */
DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wmaybe-uninitialized");
+ DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.8);
if (sign < 0)
w = -w;
DIAG_POP_NEEDS_COMMENT;
diff --git a/sysdeps/ieee754/soft-fp/s_ddivl.c b/sysdeps/ieee754/soft-fp/s_ddivl.c
index 2f80cca0ab..9ac7b7a34f 100644
--- a/sysdeps/ieee754/soft-fp/s_ddivl.c
+++ b/sysdeps/ieee754/soft-fp/s_ddivl.c
@@ -37,7 +37,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dfmal.c b/sysdeps/ieee754/soft-fp/s_dfmal.c
index 208ad445a0..75d45efc5d 100644
--- a/sysdeps/ieee754/soft-fp/s_dfmal.c
+++ b/sysdeps/ieee754/soft-fp/s_dfmal.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_dsqrtl.c b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
index 22c0d0cc63..aff55c766f 100644
--- a/sysdeps/ieee754/soft-fp/s_dsqrtl.c
+++ b/sysdeps/ieee754/soft-fp/s_dsqrtl.c
@@ -35,7 +35,7 @@
does not see that they are set in all cases where they are used,
resulting in warnings that they may be used uninitialized. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (7);
#include <soft-fp.h>
#include <double.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdiv.c b/sysdeps/ieee754/soft-fp/s_fdiv.c
index 4c4eb7cae9..a918136e28 100644
--- a/sysdeps/ieee754/soft-fp/s_fdiv.c
+++ b/sysdeps/ieee754/soft-fp/s_fdiv.c
@@ -34,7 +34,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <double.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fdivl.c b/sysdeps/ieee754/soft-fp/s_fdivl.c
index 07196ee787..75055ad755 100644
--- a/sysdeps/ieee754/soft-fp/s_fdivl.c
+++ b/sysdeps/ieee754/soft-fp/s_fdivl.c
@@ -33,7 +33,7 @@
versions of GCC, it may be where R is defined using a macro or it
may be where the macro is defined. This happens only with -O1. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (8, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (8);
#include <soft-fp.h>
#include <single.h>
#include <quad.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffma.c b/sysdeps/ieee754/soft-fp/s_ffma.c
index 3f750be219..0eb92e4232 100644
--- a/sysdeps/ieee754/soft-fp/s_ffma.c
+++ b/sysdeps/ieee754/soft-fp/s_ffma.c
@@ -35,7 +35,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_ffmal.c b/sysdeps/ieee754/soft-fp/s_ffmal.c
index 97f4e68782..c1ff207f1b 100644
--- a/sysdeps/ieee754/soft-fp/s_ffmal.c
+++ b/sysdeps/ieee754/soft-fp/s_ffmal.c
@@ -33,7 +33,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include <soft-fp.h>
#include <single.h>
diff --git a/sysdeps/ieee754/soft-fp/s_fma.c b/sysdeps/ieee754/soft-fp/s_fma.c
index dde16148c4..33250b89ac 100644
--- a/sysdeps/ieee754/soft-fp/s_fma.c
+++ b/sysdeps/ieee754/soft-fp/s_fma.c
@@ -42,7 +42,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "double.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmaf.c b/sysdeps/ieee754/soft-fp/s_fmaf.c
index 5617cec0b7..840871b99d 100644
--- a/sysdeps/ieee754/soft-fp/s_fmaf.c
+++ b/sysdeps/ieee754/soft-fp/s_fmaf.c
@@ -37,7 +37,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "single.h"
diff --git a/sysdeps/ieee754/soft-fp/s_fmal.c b/sysdeps/ieee754/soft-fp/s_fmal.c
index 3ca60a8df7..6c5d6d9dcd 100644
--- a/sysdeps/ieee754/soft-fp/s_fmal.c
+++ b/sysdeps/ieee754/soft-fp/s_fmal.c
@@ -40,7 +40,7 @@
it may be where R is defined using a macro or it may be where the
macro is defined. */
DIAG_PUSH_NEEDS_COMMENT;
-DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
+DIAG_IGNORE_NEEDS_COMMENT_MAYBE_UNINITIALIZED (4.9);
#include "soft-fp.h"
#include "quad.h"
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-16 17:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-16 17:59 [glibc/azanella/clang] Replace DIAG_IGNORE_NEEDS_COMMENT (-Wmaybe-uninitialized) with a macro Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 18:37 Adhemerval Zanella
2022-03-11 17:21 Adhemerval Zanella
2022-03-10 19:20 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).