From 6cfae52edfb487ca3b78336a061acb6694338f72 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 2 Jun 2015 12:58:45 -0700 Subject: [PATCH] Fix setenv.c diagnostic pragma to be compatible with GCC 4.6 --- ChangeLog | 5 +++++ stdlib/setenv.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e78a97a1cc..33636ba1fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-06-02 Roland McGrath + + * stdlib/setenv.c [__GNUC__,__GNUC_MINOR__ < 4,7]: Use + "-Wuninitialized" rather than "-Wmaybe-uninitialized" in pragma. + 2015-06-02 Szabolcs Nagy * sysdeps/aarch64/libm-test-ulps: Update. diff --git a/stdlib/setenv.c b/stdlib/setenv.c index 184a8cdd07..b9e0ba808d 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -24,7 +24,11 @@ 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 here, as it's not defined yet. */ -#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#if ((__GNUC__ << 16) + __GNUC_MINOR__) >= ((4 << 16) + 7) +# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#else +# pragma GCC diagnostic ignored "-Wuninitialized" +#endif #include #if !_LIBC -- 2.11.4.GIT