picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

string: Work around GCC PR 98512 in rawmemchr

Browse source
This commit is contained in:
Florian Weimer 2021-02-19 13:29:00 +01:00
parent 7b15dabfdd
commit 044e603b69
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
string/rawmemchr.c
View file

@ -22,24 +22,28 @@
# define RAWMEMCHR __rawmemchr
#endif
/* The pragmata should be nested inside RAWMEMCHR below, but that
triggers GCC PR 98512. */
DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (7, 0)
/* GCC 8 warns about the size passed to memchr being larger than
PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */
DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow=");
#endif
#if __GNUC_PREREQ (11, 0)
/* Likewise GCC 11, with a different warning option. */
DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
#endif
/* Find the first occurrence of C in S. */
void *
RAWMEMCHR (const void *s, int c)
{
DIAG_PUSH_NEEDS_COMMENT;
#if __GNUC_PREREQ (7, 0)
/* GCC 8 warns about the size passed to memchr being larger than
PTRDIFF_MAX; the use of SIZE_MAX is deliberate here. */
DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-overflow=");
#endif
#if __GNUC_PREREQ (11, 0)
/* Likewise GCC 11, with a different warning option. */
DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overread");
#endif
if (c != '\0')
return memchr (s, c, (size_t)-1);
DIAG_POP_NEEDS_COMMENT;
return (char *)s + strlen (s);
}
libc_hidden_def (__rawmemchr)
weak_alias (__rawmemchr, rawmemchr)
DIAG_POP_NEEDS_COMMENT;