]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Ignore -Wrestrict for one strncat test.
authorJoseph Myers <joseph@codesourcery.com>
Thu, 14 Jun 2018 14:20:00 +0000 (14:20 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Thu, 14 Jun 2018 14:20:00 +0000 (14:20 +0000)
With current GCC mainline, one strncat test involving a size close to
SIZE_MAX results in a -Wrestrict warning that that buffer size would
imply that the two buffers must overlap.  This patch fixes the build
by adding disabling of -Wrestrict (for GCC versions supporting that
option) to the already-present disabling of -Wstringop-overflow= and
-Warray-bounds for this test.

Tested with build-many-glibcs.py that this restores the testsuite
build with GCC mainline for aarch64-linux-gnu.

* string/tester.c (test_strncat) [__GNUC_PREREQ (7, 0)]: Also
ignore -Wrestrict for one test.

ChangeLog
string/tester.c

index 87f7a9c8675abcc27fa4dab3c1998f792b15b817..55f989a5a198bf707ba79fdcd913ff64298276d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-14  Joseph Myers  <joseph@codesourcery.com>
+
+       * string/tester.c (test_strncat) [__GNUC_PREREQ (7, 0)]: Also
+       ignore -Wrestrict for one test.
+
 2018-06-14  Steve Ellcey  <sellcey@caviumnetworks.com>
            Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
index 2bb38bfe23a817560dfe5729245dc945893dafc1..601eb01b55bdd3ed052a25331c68a400bf8d43ec 100644 (file)
@@ -485,6 +485,10 @@ test_strncat (void)
               deliberately tested here; GCC 8 gives a -Warray-bounds
               warning about this.  */
            DIAG_IGNORE_NEEDS_COMMENT (7, "-Wstringop-overflow=");
+           /* GCC 9 as of 2018-06-14 warns that the size passed is
+              large enough that, if it were the actual object size,
+              the objects would have to overlap.  */
+           DIAG_IGNORE_NEEDS_COMMENT (9, "-Wrestrict");
 #endif
            DIAG_IGNORE_NEEDS_COMMENT (8, "-Warray-bounds");
            check (strncat (buf1 + n2, buf2 + n1, ~((size_t) 0) - n4)