From 6ae2ca620a955f1e3465e58b5180c5a7fd596dd0 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 14 Nov 2017 17:50:36 +0000 Subject: [PATCH] Fix string/bug-strncat1.c build with GCC 8. GCC 8 warns about strncat calls with truncated output. string/bug-strncat1.c tests such a call; this patch disables the warning for it. Tested (compilation) with GCC 8 for x86_64-linux-gnu with build-many-glibcs.py (in conjunction with Martin's patch to allow glibc to build). * string/bug-strncat1.c: Include . (main): Disable -Wstringop-truncation for strncat call for GCC 8. (cherry picked from commit ec72135e5f1d061cb5cf7cd1b855fd6290be10d9) --- ChangeLog | 5 +++++ string/bug-strncat1.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 65633dbc7fb..d4223dbb9e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-11-14 Joseph Myers + + * string/bug-strncat1.c: Include . + (main): Disable -Wstringop-truncation for strncat call for GCC 8. + 2018-06-14 Joseph Myers * string/tester.c (test_strncat) [__GNUC_PREREQ (7, 0)]: Also diff --git a/string/bug-strncat1.c b/string/bug-strncat1.c index f1b5c37c5cd..b22beba4d3d 100644 --- a/string/bug-strncat1.c +++ b/string/bug-strncat1.c @@ -4,13 +4,21 @@ #include #include #include +#include char d[3] = "\0\1\2"; int main (void) { + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (8, 0) + /* GCC 8 warns about strncat truncating output; this is deliberately + tested here. */ + DIAG_IGNORE_NEEDS_COMMENT (8, "-Wstringop-truncation"); +#endif strncat (d, "\5\6", 1); + DIAG_POP_NEEDS_COMMENT; if (d[0] != '\5') { puts ("d[0] != '\\5'"); -- 2.47.2