diff options
Diffstat (limited to 'arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc')
| -rw-r--r-- | arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec | 8 | ||||
| -rw-r--r-- | arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/glibc-suppress-gcc-6-warning.patch | 85 |
2 files changed, 91 insertions, 2 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec index 3a7d82f..d7f635a 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec @@ -43,13 +43,14 @@ Name: %{cross_triplet}-glibc%{pkg_suffix} Version: 2.23 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The GNU C Library (%{cross_triplet}) Group: Development/Libraries License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ URL: https://www.gnu.org/software/libc Source0: https://ftp.gnu.org/gnu/glibc/glibc-%{version}.tar.xz +Patch0: glibc-suppress-gcc-6-warning.patch BuildRequires: %{cross_triplet}-filesystem BuildRequires: %{cross_triplet}-gcc-stage1 @@ -66,7 +67,7 @@ BuildRequires: %{cross_triplet}-gcc-stage2 %prep -%setup -qn glibc-%{version} +%autosetup -p1 -n glibc-%{version} %build @@ -566,6 +567,9 @@ chmod +x %{__ar_no_strip} %changelog +* Sun May 08 2016 Ting-Wei Lan <lantw44@gmail.com> - 2.23-3 +- Fix GCC 6 build issue + * Thu Mar 03 2016 Ting-Wei Lan <lantw44@gmail.com> - 2.23-2 - Rebuilt for Fedora 24 and 25 diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/glibc-suppress-gcc-6-warning.patch b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/glibc-suppress-gcc-6-warning.patch new file mode 100644 index 0000000..43e3932 --- /dev/null +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/glibc-suppress-gcc-6-warning.patch @@ -0,0 +1,85 @@ +From 5769d5d17cdb4770f1e08167b76c1684ad4e1f73 Mon Sep 17 00:00:00 2001 +From: Yvan Roux <yvan.roux@linaro.org> +Date: Fri, 15 Apr 2016 13:29:26 +0200 +Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with + -Wparentheses + +(cherry picked from commit df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c) +--- + ChangeLog | 5 +++++ + nis/nis_call.c | 20 +++++++++++--------- + stdlib/setenv.c | 26 ++++++++++++++------------ + 3 files changed, 30 insertions(+), 21 deletions(-) + +diff --git a/nis/nis_call.c b/nis/nis_call.c +index 3fa37e4..cb7839a 100644 +--- a/nis/nis_call.c ++++ b/nis/nis_call.c +@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent, + /* 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; + +diff --git a/stdlib/setenv.c b/stdlib/setenv.c +index da61ee0..e66045f 100644 +--- 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; +- +- do +- dp[0] = dp[1]; +- while (*dp++); +- /* Continue the loop in case NAME appears again. */ +- } +- else +- ++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; ++ } + + UNLOCK; + +-- +2.8.2 + |