AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove GCC version conditionals on -Wmaybe-uninitialized pragmas.

Browse Source 
One common case of __GNUC_PREREQ (4, 7) conditionals is use of
diagnostic control pragmas for -Wmaybe-uninitialized, an option
introduced in GCC 4.7 where older GCC needed -Wuninitialized to be
controlled instead if the warning appeared with older GCC.  This patch
removes such conditionals.

(There remain several older uses of -Wno-uninitialized in makefiles
that still need to be converted to diagnostic control pragmas if the
issue is still present with current sources and supported GCC
versions, and it's likely that in most cases those pragmas also will
end up controlling -Wmaybe-uninitialized.)

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch, except for libresolv
since res_send.c contains assertions whose line numbers are changed by
the patch).

	* resolv/res_send.c (send_vc) [__GNUC_PREREQ (4, 7)]: Make code
	unconditional.
	* soft-fp/fmadf4.c [__GNUC_PREREQ (4, 7)]: Likewise.
	[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
	* soft-fp/fmasf4.c [__GNUC_PREREQ (4, 7)]: Make code
	unconditional.
	[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
	* soft-fp/fmatf4.c [__GNUC_PREREQ (4, 7)]: Make code
	unconditional.
	[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
	* stdlib/setenv.c
	[((__GNUC__ << 16) + __GNUC_MINOR__) >= ((4 << 16) + 7)]: Make
	code unconditional.
	[!(((__GNUC__ << 16) + __GNUC_MINOR__) >= ((4 << 16) + 7))]:
	Remove conditional code.
	* sysdeps/ieee754/dbl-64/e_lgamma_r.c
	(__ieee754_lgamma_r) [__GNUC_PREREQ (4, 7)]: Make code
	unconditional.
	(__ieee754_lgamma_r) [!__GNUC_PREREQ (4, 7)]: Remove conditional
	code.
	* sysdeps/ieee754/flt-32/e_lgammaf_r.c
	(__ieee754_lgammaf_r) [__GNUC_PREREQ (4, 7)]: Make code
	unconditional.
	(__ieee754_lgammaf_r) [!__GNUC_PREREQ (4, 7)]: Remove conditional
	code.
	* sysdeps/ieee754/ldbl-128/k_tanl.c
	(__kernel_tanl) [__GNUC_PREREQ (4, 7)]: Make code unconditional.
	(__kernel_tanl) [!__GNUC_PREREQ (4, 7)]: Remove conditional code.
	* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
	(__kernel_tanl) [__GNUC_PREREQ (4, 7)]: Make code unconditional.
	(__kernel_tanl) [!__GNUC_PREREQ (4, 7)]: Remove conditional code.
	* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
	(__ieee754_lgammal_r) [__GNUC_PREREQ (4, 7)]: Make code
	unconditional.
	(__ieee754_lgammal_r) [!__GNUC_PREREQ (4, 7)]: Remove conditional
	code.
	* sysdeps/ieee754/ldbl-96/k_tanl.c
	(__kernel_tanl) [__GNUC_PREREQ (4, 7)]: Make code unconditional.
	(__kernel_tanl) [!__GNUC_PREREQ (4, 7)]: Remove conditional code.
This commit is contained in:
Joseph Myers 2015-10-27 23:42:20 +00:00
parent 678443ce17
commit f1d237df1e
12 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ChangeLog
View File

@ -1,5 +1,45 @@
2015-10-27 Joseph Myers <joseph@codesourcery.com> 2015-10-27 Joseph Myers <joseph@codesourcery.com>
* resolv/res_send.c (send_vc) [__GNUC_PREREQ (4, 7)]: Make code
unconditional.
* soft-fp/fmadf4.c [__GNUC_PREREQ (4, 7)]: Likewise.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* soft-fp/fmasf4.c [__GNUC_PREREQ (4, 7)]: Make code
unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* soft-fp/fmatf4.c [__GNUC_PREREQ (4, 7)]: Make code
unconditional.
[!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* stdlib/setenv.c
[((__GNUC__ << 16) + __GNUC_MINOR__) >= ((4 << 16) + 7)]: Make
code unconditional.
[!(((__GNUC__ << 16) + __GNUC_MINOR__) >= ((4 << 16) + 7))]:
Remove conditional code.
* sysdeps/ieee754/dbl-64/e_lgamma_r.c
(__ieee754_lgamma_r) [__GNUC_PREREQ (4, 7)]: Make code
unconditional.
(__ieee754_lgamma_r) [!__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/ieee754/flt-32/e_lgammaf_r.c
(__ieee754_lgammaf_r) [__GNUC_PREREQ (4, 7)]: Make code
unconditional.
(__ieee754_lgammaf_r) [!__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/ieee754/ldbl-128/k_tanl.c
(__kernel_tanl) [__GNUC_PREREQ (4, 7)]: Make code unconditional.
(__kernel_tanl) [!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* sysdeps/ieee754/ldbl-128ibm/k_tanl.c
(__kernel_tanl) [__GNUC_PREREQ (4, 7)]: Make code unconditional.
(__kernel_tanl) [!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* sysdeps/ieee754/ldbl-96/e_lgammal_r.c
(__ieee754_lgammal_r) [__GNUC_PREREQ (4, 7)]: Make code
unconditional.
(__ieee754_lgammal_r) [!__GNUC_PREREQ (4, 7)]: Remove conditional
code.
* sysdeps/ieee754/ldbl-96/k_tanl.c
(__kernel_tanl) [__GNUC_PREREQ (4, 7)]: Make code unconditional.
(__kernel_tanl) [!__GNUC_PREREQ (4, 7)]: Remove conditional code.
* nptl/tst-initializers1-c11.c: New file. * nptl/tst-initializers1-c11.c: New file.
* nptl/tst-initializers1-gnu11.c: Likewise. * nptl/tst-initializers1-gnu11.c: Likewise.
* nptl/Makefile (tests): Add these new tests. * nptl/Makefile (tests): Add these new tests.

8
resolv/res_send.c
View File

@ -655,14 +655,10 @@ send_vc(res_state statp,
times round the loop resplen has been initialized. So this is times round the loop resplen has been initialized. So this is
a false-positive. a false-positive.
*/ */
#if __GNUC_PREREQ (4, 7)
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
#endif
int resplen; int resplen;
#if __GNUC_PREREQ (4, 7)
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;
#endif
struct iovec iov[4]; struct iovec iov[4];
u_short len; u_short len;
u_short len2; u_short len2;
@ -780,10 +776,8 @@ send_vc(res_state statp,
/* No buffer allocated for the first /* No buffer allocated for the first
reply. We can try to use the rest reply. We can try to use the rest
of the user-provided buffer. */ of the user-provided buffer. */
#if __GNUC_PREREQ (4, 7)
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
#endif
#if _STRING_ARCH_unaligned #if _STRING_ARCH_unaligned
*anssizp2 = orig_anssizp - resplen; *anssizp2 = orig_anssizp - resplen;
*ansp2 = *ansp + resplen; *ansp2 = *ansp + resplen;
@ -794,9 +788,7 @@ send_vc(res_state statp,
*anssizp2 = orig_anssizp - aligned_resplen; *anssizp2 = orig_anssizp - aligned_resplen;
*ansp2 = *ansp + aligned_resplen; *ansp2 = *ansp + aligned_resplen;
#endif #endif
#if __GNUC_PREREQ (4, 7)
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;
#endif
} else { } else {
/* The first reply did not fit into the /* The first reply did not fit into the
user-provided buffer. Maybe the second user-provided buffer. Maybe the second

4
soft-fp/fmadf4.c
View File

@ -34,11 +34,7 @@
it may be where R is defined using a macro or it may be where the it may be where R is defined using a macro or it may be where the
macro is defined. */ macro is defined. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized");
#endif
#include <math.h> #include <math.h>
#include "soft-fp.h" #include "soft-fp.h"
#include "double.h" #include "double.h"

4
soft-fp/fmasf4.c
View File

@ -34,11 +34,7 @@
it may be where R is defined using a macro or it may be where the it may be where R is defined using a macro or it may be where the
macro is defined. */ macro is defined. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized");
#endif
#include <math.h> #include <math.h>
#include "soft-fp.h" #include "soft-fp.h"
#include "single.h" #include "single.h"

4
soft-fp/fmatf4.c
View File

@ -34,11 +34,7 @@
it may be where R is defined using a macro or it may be where the it may be where R is defined using a macro or it may be where the
macro is defined. */ macro is defined. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized");
#endif
#include <math.h> #include <math.h>
#include "soft-fp.h" #include "soft-fp.h"
#include "quad.h" #include "quad.h"

6
stdlib/setenv.c
View File

@ -24,11 +24,7 @@
there seems to be no way to pacify GCC selectively, only for the there seems to be no way to pacify GCC selectively, only for the
place where it's needed. Do not use DIAG_IGNORE_NEEDS_COMMENT place where it's needed. Do not use DIAG_IGNORE_NEEDS_COMMENT
here, as it's not defined yet. */ here, as it's not defined yet. */
#if ((__GNUC__ << 16) + __GNUC_MINOR__) >= ((4 << 16) + 7) #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#else
# pragma GCC diagnostic ignored "-Wuninitialized"
#endif
#include <errno.h> #include <errno.h>
#if !_LIBC #if !_LIBC

4
sysdeps/ieee754/dbl-64/e_lgamma_r.c
View File

@ -302,11 +302,7 @@ __ieee754_lgamma_r(double x, int *signgamp)
although in the cases where it is used it has always been although in the cases where it is used it has always been
set. */ set. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized");
#endif
if(hx<0) r = nadj - r; if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;
return r; return r;

4
sysdeps/ieee754/flt-32/e_lgammaf_r.c
View File

@ -238,11 +238,7 @@ __ieee754_lgammaf_r(float x, int *signgamp)
although in the cases where it is used it has always been although in the cases where it is used it has always been
set. */ set. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized");
#endif
if(hx<0) r = nadj - r; if(hx<0) r = nadj - r;
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;
return r; return r;

4
sysdeps/ieee754/ldbl-128/k_tanl.c
View File

@ -141,11 +141,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has uninitialized although in the cases where it is used it has
always been set. */ always been set. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wuninitialized");
#endif
if (sign < 0) if (sign < 0)
w = -w; w = -w;
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;

4
sysdeps/ieee754/ldbl-128ibm/k_tanl.c
View File

@ -141,11 +141,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has uninitialized although in the cases where it is used it has
always been set. */ always been set. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (5, "-Wuninitialized");
#endif
if (sign < 0) if (sign < 0)
w = -w; w = -w;
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;

4
sysdeps/ieee754/ldbl-96/e_lgammal_r.c
View File

@ -430,11 +430,7 @@ __ieee754_lgammal_r (long double x, int *signgamp)
in warnings that it may be used uninitialized although in the in warnings that it may be used uninitialized although in the
cases where it is used it has always been set. */ cases where it is used it has always been set. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized");
#endif
if (se & 0x8000) if (se & 0x8000)
r = nadj - r; r = nadj - r;
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;

4
sysdeps/ieee754/ldbl-96/k_tanl.c
View File

@ -138,11 +138,7 @@ __kernel_tanl (long double x, long double y, int iy)
uninitialized although in the cases where it is used it has uninitialized although in the cases where it is used it has
always been set. */ always been set. */
DIAG_PUSH_NEEDS_COMMENT; DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (4, 7)
DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wmaybe-uninitialized"); DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wmaybe-uninitialized");
#else
DIAG_IGNORE_NEEDS_COMMENT (4.8, "-Wuninitialized");
#endif
if (sign < 0) if (sign < 0)
w = -w; w = -w;
DIAG_POP_NEEDS_COMMENT; DIAG_POP_NEEDS_COMMENT;