From f1d237df1eec1df8cbc34f95540fd4035776e79c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 27 Oct 2015 23:42:20 +0000 Subject: Remove GCC version conditionals on -Wmaybe-uninitialized pragmas. 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. --- soft-fp/fmadf4.c | 4 ---- soft-fp/fmasf4.c | 4 ---- soft-fp/fmatf4.c | 4 ---- 3 files changed, 12 deletions(-) (limited to 'soft-fp') diff --git a/soft-fp/fmadf4.c b/soft-fp/fmadf4.c index 9330948c3b..fd915f4980 100644 --- a/soft-fp/fmadf4.c +++ b/soft-fp/fmadf4.c @@ -34,11 +34,7 @@ it may be where R is defined using a macro or it may be where the macro is defined. */ DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (4, 7) DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); -#else -DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized"); -#endif #include #include "soft-fp.h" #include "double.h" diff --git a/soft-fp/fmasf4.c b/soft-fp/fmasf4.c index 359d49cdd9..9524913b13 100644 --- a/soft-fp/fmasf4.c +++ b/soft-fp/fmasf4.c @@ -34,11 +34,7 @@ it may be where R is defined using a macro or it may be where the macro is defined. */ DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (4, 7) DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); -#else -DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized"); -#endif #include #include "soft-fp.h" #include "single.h" diff --git a/soft-fp/fmatf4.c b/soft-fp/fmatf4.c index 9c99303e48..ab805c2b52 100644 --- a/soft-fp/fmatf4.c +++ b/soft-fp/fmatf4.c @@ -34,11 +34,7 @@ it may be where R is defined using a macro or it may be where the macro is defined. */ DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (4, 7) DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); -#else -DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wuninitialized"); -#endif #include #include "soft-fp.h" #include "quad.h" -- cgit v1.2.3