[glibc/azanella/clang] malloc: Disable malloc builtins on tests

[Adhemerval Zanella <azanella@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b3cc16abb1de98b7908c3346084df7af928fa01

commit 0b3cc16abb1de98b7908c3346084df7af928fa01
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Wed Mar 30 15:42:18 2022 -0300

    malloc: Disable malloc builtins on tests
    
    To avoid compiler optimize away memory allocation calls, which might
    interfere when both valid and invalid calls checks.

Diff:
---
 malloc/Makefile       | 11 +++++++++++
 malloc/tst-malloc.c   |  1 +
 malloc/tst-memalign.c |  3 +--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/malloc/Makefile b/malloc/Makefile
index 4e32de2a0b..250717d255 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -367,3 +367,14 @@ tst-mallocstate-malloc-check-ENV = LD_PRELOAD=$(objpfx)libc_malloc_debug.so
 # libc_malloc_debug.so.
 $(objpfx)tst-mallocstate: $(objpfx)libc_malloc_debug.so
 $(objpfx)tst-mallocstate-malloc-check: $(objpfx)libc_malloc_debug.so
+
+CFLAGS-tst-memalign.c += -fno-builtin
+CFLAGS-tst-malloc.c += -fno-builtin
+CFLAGS-tst-malloc-backtrace.c += -fno-builtin
+CFLAGS-tst-malloc-check.c += -fno-builtin
+CFLAGS-tst-malloc-too-large.c += -fno-builtin
+CFLAGS-tst-realloc.c += -fno-builtin
+CFLAGS-tst-valloc.c += -fno-builtin
+CFLAGS-tst-compathooks-off.c += -fno-builtin
+CFLAGS-tst-compathooks-on.c += -fno-builtin
+CFLAGS-tst-mallinfo2.c += -fno-builtin
diff --git a/malloc/tst-malloc.c b/malloc/tst-malloc.c
index 62e3b9b95c..e3855035e7 100644
--- a/malloc/tst-malloc.c
+++ b/malloc/tst-malloc.c
@@ -46,6 +46,7 @@ do_test (void)
   p = malloc (-1);
   DIAG_POP_NEEDS_COMMENT;
   save = errno;
+  asm volatile("" ::: "memory");
 
   if (p != NULL)
     merror ("malloc (-1) succeeded.");
diff --git a/malloc/tst-memalign.c b/malloc/tst-memalign.c
index b5933f4741..5da00954e2 100644
--- a/malloc/tst-memalign.c
+++ b/malloc/tst-memalign.c
@@ -124,5 +124,4 @@ do_test (void)
   return errors != 0;
 }
 
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>