diff options
author | Ondřej Bílka <neleai@seznam.cz> | 2015-01-06 18:43:28 +0100 |
---|---|---|
committer | Ondřej Bílka <neleai@seznam.cz> | 2015-01-06 18:43:28 +0100 |
commit | 500bfbd4922902ea278adab06e58b77eb355ba82 (patch) | |
tree | ce1779d0f66f9c5183b834427356885cdd3a22c9 | |
parent | 1cf98e27a7280b55f42aae191b6083d71e42e993 (diff) | |
download | glibc-500bfbd4922902ea278adab06e58b77eb355ba82.tar.gz glibc-500bfbd4922902ea278adab06e58b77eb355ba82.tar.xz glibc-500bfbd4922902ea278adab06e58b77eb355ba82.zip |
Revert "Suppress warning in string/tester.c for gcc 4.9"
This reverts commit 9300797ee93422a87f443d5ba7e1411167e7a837.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | string/tester.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index fdd7253138..cb65294dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,6 @@ * sysdeps/unix/sysv/linux/check_pf.c (make_request): Clean up check_pf allocation pattern. addresses - * string/tester.c (test_memset): Suppress warning for gcc 4.9 2015-01-06 Adhemerval Zanella <azanella@linux.vnet.ibm.com> diff --git a/string/tester.c b/string/tester.c index 64dc056084..f957ed29d4 100644 --- a/string/tester.c +++ b/string/tester.c @@ -1305,10 +1305,10 @@ test_memset (void) equal(one, "axxxefgh", 2); /* Basic test. */ DIAG_PUSH_NEEDS_COMMENT; -#if __GNUC_PREREQ (4, 9) - /* GCC 4.9 warns about a zero-length memset because the arguments to memset +#if __GNUC_PREREQ (5, 0) + /* GCC 5.0 warns about a zero-length memset because the arguments to memset may be in the wrong order. But we really want to test this. */ - DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmemset-transposed-args") + DIAG_IGNORE_NEEDS_COMMENT (5.0, "-Wmemset-transposed-args") #endif (void) memset(one+2, 'y', 0); equal(one, "axxxefgh", 3); /* Zero-length set. */ |