From 1feba0288f96de12ea102ec6e8da994ceae77788 Mon Sep 17 00:00:00 2001 From: liqingqing_1229 Date: Thu, 18 Nov 2021 17:34:46 +0800 Subject: [PATCH] revert supress -Wcast-qual warnings in bsearch --- Suppress-Wcast-qual-warnings-in-bsearch.patch | 46 ------------------- glibc.spec | 6 ++- 2 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 Suppress-Wcast-qual-warnings-in-bsearch.patch diff --git a/Suppress-Wcast-qual-warnings-in-bsearch.patch b/Suppress-Wcast-qual-warnings-in-bsearch.patch deleted file mode 100644 index 656f412..0000000 --- a/Suppress-Wcast-qual-warnings-in-bsearch.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a725ff1de965f4cc4f36a7e8ae795d40ca0350d7 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Wed, 19 May 2021 16:48:19 +0100 -Subject: [PATCH] Suppress -Wcast-qual warnings in bsearch - -The first cast to (void *) is redundant but should be (const void *) -anyway, because that's the type of the lvalue being assigned to. - -The second cast is necessary and intentionally not const-correct, so -tell the compiler not to warn about it. - -Reviewed-by: Florian Weimer ---- - bits/stdlib-bsearch.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/bits/stdlib-bsearch.h b/bits/stdlib-bsearch.h -index 4132dc6..d688ed2 100644 ---- a/bits/stdlib-bsearch.h -+++ b/bits/stdlib-bsearch.h -@@ -29,14 +29,21 @@ bsearch (const void *__key, const void *__base, size_t __nmemb, size_t __size, - while (__l < __u) - { - __idx = (__l + __u) / 2; -- __p = (void *) (((const char *) __base) + (__idx * __size)); -+ __p = (const void *) (((const char *) __base) + (__idx * __size)); - __comparison = (*__compar) (__key, __p); - if (__comparison < 0) - __u = __idx; - else if (__comparison > 0) - __l = __idx + 1; - else -+#if __GNUC_PREREQ(4, 6) -+# pragma GCC diagnostic push -+# pragma GCC diagnostic ignored "-Wcast-qual" -+#endif - return (void *) __p; -+#if __GNUC_PREREQ(4, 6) -+# pragma GCC diagnostic pop -+#endif - } - - return NULL; --- -1.8.3.1 - diff --git a/glibc.spec b/glibc.spec index 4c23b05..6631723 100644 --- a/glibc.spec +++ b/glibc.spec @@ -65,7 +65,7 @@ ############################################################################## Name: glibc Version: 2.34 -Release: 25 +Release: 26 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -133,7 +133,6 @@ Patch46: ld.so-Replace-DL_RO_DYN_SECTION-with-dl_relocate_ld-.patch Patch47: ld.so-Initialize-bootstrap_map.l_ld_readonly-BZ-2834.patch Patch48: Avoid-warning-overriding-recipe-for-.-tst-ro-dynamic.patch Patch49: posix-Fix-attribute-access-mode-on-getcwd-BZ-27476.patch -Patch50: Suppress-Wcast-qual-warnings-in-bsearch.patch #Patch9000: turn-REP_STOSB_THRESHOLD-from-2k-to-1M.patch Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch @@ -1323,6 +1322,9 @@ fi %endif %changelog +* Fri Nov 19 2021 Qingqing Li - 2.34-26 +- revert supress -Wcast-qual warnings in bsearch + * Mon Nov 15 2021 Qingqing Li - 2.34-25 - fix attribute access mode on getcwd [BZ #27476] - supress -Wcast-qual warnings in bsearch -- Gitee