Patchwork Fix glibc testing with GCC 4.9 compiler

login
register
mail settings
Submitter Steve Ellcey
Date Feb. 25, 2016, 7 p.m.
Message ID <1456426851.29579.234.camel@ubuntu-sellcey>
Download mbox | patch
Permalink /patch/11091/
State New
Headers show

Comments

Steve Ellcey - Feb. 25, 2016, 7 p.m.
On Thu, 2016-02-25 at 18:12 +0100, Florian Weimer wrote:

> I think this would need a configure check for detection because you
> can't infer it from the reported compiler version.

So would something like this be acceptable?  I haven't fully tested it,
I just want to see if this approach is OK.

Steve Ellcey
sellcey@imgtec.com

Patch

diff --git a/configure.ac b/configure.ac
index 3c766b7..674f05a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1449,6 +1449,13 @@  if test "$libc_cv_gcc_builtin_memset" = yes ; then
   AC_DEFINE(HAVE_BUILTIN_MEMSET)
 fi
 
+AC_CACHE_CHECK(for -Wmemset-transposed-args, libc_cv_memset_warning, [dnl
+LIBC_TRY_CC_OPTION([-Wmemset-transposed-args], [libc_cv_memset_warning=yes], [libc_cv_memset_warning=no])
+])
+if test "$libc_cv_memset_warning" = yes ; then
+  AC_DEFINE(HAVE_MEMSET_WARNING)
+fi
+
 AC_CACHE_CHECK(for redirection of built-in functions, libc_cv_gcc_builtin_redirection, [dnl
 cat > conftest.c <<\EOF
 extern char *strstr (const char *, const char *) __asm ("my_strstr");
diff --git a/string/tester.c b/string/tester.c
index 7c36591..1659693 100644
--- a/string/tester.c
+++ b/string/tester.c
@@ -1305,7 +1305,7 @@  test_memset (void)
   equal(one, "axxxefgh", 2);		/* Basic test. */
 
   DIAG_PUSH_NEEDS_COMMENT;
-#if __GNUC_PREREQ (5, 0)
+#ifdef HAVE_MEMSET_WARNING
   /* 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 (5.0, "-Wmemset-transposed-args")