From 878c4bc78f4fa214ca756e3f11c8a43a53fdb0df833a9a0268fc63395a0b156e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 26 Apr 2016 14:28:50 +0000 Subject: [PATCH] Accepting request 391528 from home:jirislaby:branches:Base:System Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses OBS-URL: https://build.opensuse.org/request/show/391528 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=433 --- glibc-gcc6.patch | 88 +++++++++++++++++++++++++++++++++++++++++ glibc-testsuite.changes | 6 +++ glibc-testsuite.spec | 3 ++ glibc-utils.changes | 6 +++ glibc-utils.spec | 3 ++ glibc.changes | 6 +++ glibc.spec | 3 ++ 7 files changed, 115 insertions(+) create mode 100644 glibc-gcc6.patch diff --git a/glibc-gcc6.patch b/glibc-gcc6.patch new file mode 100644 index 0000000..e0d3f54 --- /dev/null +++ b/glibc-gcc6.patch @@ -0,0 +1,88 @@ +From: Yvan Roux +Date: Fri, 15 Apr 2016 13:29:26 +0200 +Subject: Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses +Patch-mainline: yes +Git-commit: df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c + +Signed-off-by: Jiri Slaby +--- + ChangeLog | 5 +++++ + nis/nis_call.c | 20 +++++++++++--------- + stdlib/setenv.c | 24 +++++++++++++----------- + 3 files changed, 29 insertions(+), 20 deletions(-) + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2016-04-15 Yvan Roux ++ ++ * stdlib/setenv.c (unsetenv): Fix ambiguous 'else'. ++ * nis/nis_call.c (nis_server_cache_add): Likewise. ++ + 2016-02-18 Adhemerval Zanella + + * version.h (RELEASE): Set to "stable". +--- a/nis/nis_call.c ++++ b/nis/nis_call.c +@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name nam + /* Choose which entry should be evicted from the cache. */ + loc = &nis_server_cache[0]; + if (*loc != NULL) +- for (i = 1; i < 16; ++i) +- if (nis_server_cache[i] == NULL) +- { ++ { ++ for (i = 1; i < 16; ++i) ++ if (nis_server_cache[i] == NULL) ++ { ++ loc = &nis_server_cache[i]; ++ break; ++ } ++ else if ((*loc)->uses > nis_server_cache[i]->uses ++ || ((*loc)->uses == nis_server_cache[i]->uses ++ && (*loc)->expires > nis_server_cache[i]->expires)) + loc = &nis_server_cache[i]; +- break; +- } +- else if ((*loc)->uses > nis_server_cache[i]->uses +- || ((*loc)->uses == nis_server_cache[i]->uses +- && (*loc)->expires > nis_server_cache[i]->expires)) +- loc = &nis_server_cache[i]; ++ } + old = *loc; + *loc = new; + +--- a/stdlib/setenv.c ++++ b/stdlib/setenv.c +@@ -278,18 +278,20 @@ unsetenv (const char *name) + ep = __environ; + if (ep != NULL) + while (*ep != NULL) +- if (!strncmp (*ep, name, len) && (*ep)[len] == '=') +- { +- /* Found it. Remove this pointer by moving later ones back. */ +- char **dp = ep; ++ { ++ if (!strncmp (*ep, name, len) && (*ep)[len] == '=') ++ { ++ /* Found it. Remove this pointer by moving later ones back. */ ++ char **dp = ep; + +- do +- dp[0] = dp[1]; +- while (*dp++); +- /* Continue the loop in case NAME appears again. */ +- } +- else +- ++ep; ++ do ++ dp[0] = dp[1]; ++ while (*dp++); ++ /* Continue the loop in case NAME appears again. */ ++ } ++ else ++ ++ep; ++ } + + UNLOCK; + diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes index 2d69bea..2e3e737 100644 --- a/glibc-testsuite.changes +++ b/glibc-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 25 08:55:47 UTC 2016 - jslaby@suse.com + +- glibc-gcc6.patch: Suppress GCC 6 warning about ambiguous 'else' with + -Wparentheses + ------------------------------------------------------------------- Mon Apr 11 08:00:07 UTC 2016 - schwab@suse.de diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec index 05d9b9b..4615d9b 100644 --- a/glibc-testsuite.spec +++ b/glibc-testsuite.spec @@ -244,6 +244,8 @@ Patch306: glibc-fix-double-loopback.diff Patch1000: resolv-mem-leak.patch # PATCH-FIX-UPSTREAM Don't use long double functions if NO_LONG_DOUBLE Patch1001: no-long-double.patch +# PATCH-FIX-UPSTREAM Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses +Patch1002: glibc-gcc6.patch ### # Patches awaiting upstream approval @@ -468,6 +470,7 @@ rm nscd/s-stamp %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %patch2000 -p1 %patch2001 -p1 diff --git a/glibc-utils.changes b/glibc-utils.changes index 2d69bea..2e3e737 100644 --- a/glibc-utils.changes +++ b/glibc-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 25 08:55:47 UTC 2016 - jslaby@suse.com + +- glibc-gcc6.patch: Suppress GCC 6 warning about ambiguous 'else' with + -Wparentheses + ------------------------------------------------------------------- Mon Apr 11 08:00:07 UTC 2016 - schwab@suse.de diff --git a/glibc-utils.spec b/glibc-utils.spec index 58435a2..32cbea0 100644 --- a/glibc-utils.spec +++ b/glibc-utils.spec @@ -243,6 +243,8 @@ Patch306: glibc-fix-double-loopback.diff Patch1000: resolv-mem-leak.patch # PATCH-FIX-UPSTREAM Don't use long double functions if NO_LONG_DOUBLE Patch1001: no-long-double.patch +# PATCH-FIX-UPSTREAM Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses +Patch1002: glibc-gcc6.patch ### # Patches awaiting upstream approval @@ -468,6 +470,7 @@ rm nscd/s-stamp %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %patch2000 -p1 %patch2001 -p1 diff --git a/glibc.changes b/glibc.changes index 2d69bea..2e3e737 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 25 08:55:47 UTC 2016 - jslaby@suse.com + +- glibc-gcc6.patch: Suppress GCC 6 warning about ambiguous 'else' with + -Wparentheses + ------------------------------------------------------------------- Mon Apr 11 08:00:07 UTC 2016 - schwab@suse.de diff --git a/glibc.spec b/glibc.spec index 5e019f9..3b320c7 100644 --- a/glibc.spec +++ b/glibc.spec @@ -244,6 +244,8 @@ Patch306: glibc-fix-double-loopback.diff Patch1000: resolv-mem-leak.patch # PATCH-FIX-UPSTREAM Don't use long double functions if NO_LONG_DOUBLE Patch1001: no-long-double.patch +# PATCH-FIX-UPSTREAM Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses +Patch1002: glibc-gcc6.patch ### # Patches awaiting upstream approval @@ -468,6 +470,7 @@ rm nscd/s-stamp %patch1000 -p1 %patch1001 -p1 +%patch1002 -p1 %patch2000 -p1 %patch2001 -p1