aboutsummaryrefslogtreecommitdiffstats
path: root/string
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-06-20 22:19:50 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-06-20 22:19:50 +0000
commit99c7adf99fd0ec4526e592816588d9e3de9a8a4e (patch)
tree2fa90b41e7ed110ae36c56c94ab77934a64f3ebc /string
parent1760daadda047a5fac43c7902ca2cd924612dea7 (diff)
downloadtermbaud-99c7adf99fd0ec4526e592816588d9e3de9a8a4e.tar.gz
termbaud-99c7adf99fd0ec4526e592816588d9e3de9a8a4e.tar.xz
termbaud-99c7adf99fd0ec4526e592816588d9e3de9a8a4e.zip
Fix tst-cmp.c build with GCC mainline.
Building the testsuite with GCC mainline fails with -Wstringop-overflow= errors in string/tst-cmp.c. These are for calls to strncmp and strncasecmp with SIZE_MAX size argument. The tests are deliberately using this size that would be dubious in normal code, so this patch disables the warning for the calls in question. Tested with build-many-glibcs.py for aarch64-linux-gnu. * string/tst-cmp.c: Include <libc-diag.h>. (strncmp_max): Disable -Wstringop-overflow= around call to strncmp. (strncasecmp_max): Disable -Wstringop-overflow= around call to strncasecmp.
Diffstat (limited to 'string')
-rw-r--r--string/tst-cmp.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/string/tst-cmp.c b/string/tst-cmp.c
index 1a7f1c8b89e..3b9f7b2506d 100644
--- a/string/tst-cmp.c
+++ b/string/tst-cmp.c
@@ -26,6 +26,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
+#include <libc-diag.h>
static int
signum (int val)
@@ -98,13 +99,27 @@ strncasecmp_64 (const char *left, const char *right)
static int
strncmp_max (const char *left, const char *right)
{
+ DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (7, 0)
+ /* GCC 9 warns about the size passed to strncmp being larger than
+ PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */
+ DIAG_IGNORE_NEEDS_COMMENT (9, "-Wstringop-overflow=");
+#endif
return strncmp (left, right, SIZE_MAX);
+ DIAG_POP_NEEDS_COMMENT;
}
static int
strncasecmp_max (const char *left, const char *right)
{
+ DIAG_PUSH_NEEDS_COMMENT;
+#if __GNUC_PREREQ (7, 0)
+ /* GCC 9 warns about the size passed to strncasecmp being larger
+ than PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */
+ DIAG_IGNORE_NEEDS_COMMENT (9, "-Wstringop-overflow=");
+#endif
return strncasecmp (left, right, SIZE_MAX);
+ DIAG_POP_NEEDS_COMMENT;
}
int