diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2017-01-11 14:02:23 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2017-01-11 14:02:23 +0000 |
| commit | 3c9378265a8633e2c85a393b54a16abcf64fe616 (patch) | |
| tree | 0f6ff383099de1314f7134b24a8b05cae339a82e /stdio-common | |
| parent | 436cfba0abf749e5993b52dce589bae482f8c58a (diff) | |
| download | glibc-3c9378265a8633e2c85a393b54a16abcf64fe616.tar.gz glibc-3c9378265a8633e2c85a393b54a16abcf64fe616.tar.xz glibc-3c9378265a8633e2c85a393b54a16abcf64fe616.zip | |
Fix testsuite build for GCC 7 -Wformat-truncation.
This patch fixes the glibc testsuite build for GCC 7 -Wformat-truncation, newly moved out of -Wformat-length and with some further warnings that didn't previously appear. Two tests that previously disabled -Wformat-length are changed to disable -Wformat-truncation instead; two others are made to disable that option as well. Tested (compilation only) with build-many-glibcs.py for aarch64 with GCC mainline. * stdio-common/tst-printf.c [__GNUC_PREREQ (7, 0)]: Ignore -Wformat-truncation instead of -Wformat-length. * time/tst-strptime2.c (mkbuf) [__GNUC_PREREQ (7, 0)]: Likewise. * stdio-common/tstdiomisc.c (F): Ignore -Wformat-truncation for GCC 7. * wcsmbs/tst-wcstof.c: Include <libc-internal.h>. (do_test): Ignore -Wformat-truncation for GCC 7.
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/tst-printf.c | 5 | ||||
| -rw-r--r-- | stdio-common/tstdiomisc.c | 10 |
2 files changed, 13 insertions, 2 deletions
diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c index 74150c5e54..719b3eb08c 100644 --- a/stdio-common/tst-printf.c +++ b/stdio-common/tst-printf.c @@ -33,8 +33,9 @@ DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat"); #if __GNUC_PREREQ (7, 0) -/* Compiler warnings about format lengths should also be ignored. */ -DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-length"); +/* Compiler warnings about snprintf output truncation should also be + ignored. */ +DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation"); #endif static void rfg1 (void); diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c index 5548a71e52..9c7342d55f 100644 --- a/stdio-common/tstdiomisc.c +++ b/stdio-common/tstdiomisc.c @@ -94,6 +94,14 @@ F (void) qnanval = NAN; + /* The %f and %F arguments are in fact constants, but GCC is + prevented from seeing this (volatile is used) so it cannot tell + that the output is not truncated. */ + DIAG_PUSH_NEEDS_COMMENT; +#if __GNUC_PREREQ (7, 0) + DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-truncation"); +#endif + snprintf (buf, sizeof buf, "%a %A %e %E %f %F %g %G", qnanval, qnanval, qnanval, qnanval, qnanval, qnanval, qnanval, qnanval); @@ -260,6 +268,8 @@ F (void) printf ("expected L\"-inf -INF -inf -INF -inf -INF -inf -INF\", got L\"%S\"\n", wbuf); + DIAG_POP_NEEDS_COMMENT; + return result; } |