mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tst-cmp.c build with GCC mainline.

Browse Source 
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.
This commit is contained in:
Joseph Myers 2018-06-20 22:19:50 +00:00
parent 1760daadda
commit 99c7adf99f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2018-06-20 Joseph Myers <joseph@codesourcery.com>
* 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.
* string/bug-strpbrk1.c: Include <libc-diag.h>.
(main): Disable -Wunused-value around call to strpbrk.
* string/bug-strspn1.c: Include <libc-diag.h>.

15
string/tst-cmp.c
View File

@ -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