malloc: Fix tst-tcfree3 build csky-linux-gnuabiv2 with fortify source

With gcc 13.1 with --enable-fortify-source=2, tst-tcfree3 fails to
build on csky-linux-gnuabiv2 with:

../string/bits/string_fortified.h: In function ‘do_test’:
../string/bits/string_fortified.h:26:8: error: inlining failed in call
to ‘always_inline’ ‘memcpy’: target specific option mismatch
   26 | __NTH (memcpy (void *__restrict __dest, const void *__restrict
      __src,
      |        ^~~~~~
../misc/sys/cdefs.h:81:62: note: in definition of macro ‘__NTH’
   81 | #  define __NTH(fct)    __attribute__ ((__nothrow__ __LEAF)) fct
      |                                                              ^~~
tst-tcfree3.c:45:3: note: called from here
   45 |   memcpy (c, a, 32);
      |   ^~~~~~~~~~~~~~~~~

Instead of relying on -O0 to avoid malloc/free to be optimized away,
disable the builtin.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Adhemerval Zanella 2023-10-23 13:33:47 -03:00
parent 97290559c3
commit 83d13972f2
2 changed files with 2 additions and 3 deletions

View File

@ -298,6 +298,8 @@ CPPFLAGS-malloc.c += -DUSE_TCACHE=1
# Uncomment this for test releases. For public releases it is too expensive.
#CPPFLAGS-malloc.o += -DMALLOC_DEBUG=1
CFLAGS-tst-tcfree3.c += -fno-builtin-malloc -fno-builtin-free
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
$(objpfx)mtrace: mtrace.pl

View File

@ -19,9 +19,6 @@
#include <malloc.h>
#include <string.h>
/* Prevent GCC from optimizing away any malloc/free pairs. */
#pragma GCC optimize ("O0")
static int
do_test (void)
{