Fix failure of elf/tst-audit2 when compiled with GCC-5

diff --git a/ChangeLog b/ChangeLog
index 9ae6b8b6db848c57dcbe8b99e8e5b2e8a6966487..82299e5ebe21fbebc76da7d2f2085f84041a1fda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-23  Andreas Schwab  <schwab@suse.de>
+
+       * elf/Makefile (CFLAGS-tst-audit2.c): Define.
+
 2015-02-22  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        [BZ #17269]

diff --git a/elf/Makefile b/elf/Makefile
index b43b48ed95b72ced35d3c1f56829e449cff8b44e..f78642ed09dead70df5cf7bc6f8c28d54f5eacb3 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1017,6 +1017,8 @@ $(objpfx)tst-audit1.out: $(objpfx)tst-auditmod1.so
 tst-audit1-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 
 $(objpfx)tst-audit2.out: $(objpfx)tst-auditmod1.so
+# Prevent GCC-5 from translating a malloc/memset pair into calloc
+CFLAGS-tst-audit2.c += -fno-builtin
 tst-audit2-ENV = LD_AUDIT=$(objpfx)tst-auditmod1.so
 
 $(objpfx)tst-audit9: $(libdl)