diff --git a/glibc-gcc-strict-overflow.patch b/glibc-gcc-strict-overflow.patch deleted file mode 100644 index 694df51..0000000 --- a/glibc-gcc-strict-overflow.patch +++ /dev/null @@ -1,37 +0,0 @@ -Builds with gcc 7.0 fail with: - -../test-skeleton.c: In function ‘legacy_test_function’: -cc1: error: assuming signed overflow does not occur when \ -assuming that (X - c) <= X is always true [-Werror=strict-overflow] - -Ignoring this warning until the test or compiler is adjusted. -Disabled with -Wno-strict-overflow. Attempted -Wstrict-overflow=1, -but it still results in the same warning. - -Index: glibc-2.24-661-g5653ab1/string/Makefile -=================================================================== ---- glibc-2.24-661-g5653ab1.orig/string/Makefile -+++ glibc-2.24-661-g5653ab1/string/Makefile -@@ -71,7 +71,9 @@ include ../Rules - CFLAGS-inl-tester.c = -fno-builtin - CFLAGS-noinl-tester.c = -fno-builtin - CFLAGS-tst-strlen.c = -fno-builtin --CFLAGS-stratcliff.c = -fno-builtin -+# Added '-Wno-strict-overflow' for gcc 7.0 until the test or compiler -+# is adjusted. -+CFLAGS-stratcliff.c = -fno-builtin -Wno-strict-overflow - CFLAGS-test-ffs.c = -fno-builtin - CFLAGS-tst-inlcall.c = -fno-builtin - CFLAGS-tst-xbzero-opt.c = -O3 -Index: glibc-2.24-661-g5653ab1/wcsmbs/Makefile -=================================================================== ---- glibc-2.24-661-g5653ab1.orig/wcsmbs/Makefile -+++ glibc-2.24-661-g5653ab1/wcsmbs/Makefile -@@ -102,3 +102,7 @@ CPPFLAGS += $(libio-mtsafe) - CPPFLAGS-wcstold_l.c = -I../stdlib - - $(objpfx)tst-wcstod-nan-locale: $(libm) -+ -+# Added '-Wno-strict-overflow' for gcc 7.0 until the test or compiler -+# is adjusted. -+CFLAGS-wcsatcliff.c = -Wno-strict-overflow diff --git a/glibc.spec b/glibc.spec index d8d0b19..5ac3f73 100644 --- a/glibc.spec +++ b/glibc.spec @@ -243,9 +243,6 @@ Patch0059: glibc-c-utf8-locale.patch # Build libcrypt twice, with and without NSS. Patch0060: glibc-rh1324623.patch -# Fix -Wstrict-overflow issues with gcc 7.0. -Patch0061: glibc-gcc-strict-overflow.patch - ############################################################################## # # Patches from upstream @@ -882,7 +879,6 @@ microbenchmark tests on the system. %patch2037 -p1 %patch2110 -p1 %patch2112 -p1 -%patch0061 -p1 ############################################################################## # %%prep - Additional prep required...