From: Adhemerval Zanella Date: Mon, 23 Oct 2023 16:33:47 +0000 (-0300) Subject: malloc: Fix tst-tcfree3 build csky-linux-gnuabiv2 with fortify source X-Git-Tag: glibc-2.39~350 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83d13972f23546758b600ba940e0d53248dd0339;p=thirdparty%2Fglibc.git 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 --- diff --git a/malloc/Makefile b/malloc/Makefile index c1db3347d88..f6cdf7bf0be 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -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 diff --git a/malloc/tst-tcfree3.c b/malloc/tst-tcfree3.c index ce6d958f8a9..30886b6f499 100644 --- a/malloc/tst-tcfree3.c +++ b/malloc/tst-tcfree3.c @@ -19,9 +19,6 @@ #include #include -/* Prevent GCC from optimizing away any malloc/free pairs. */ -#pragma GCC optimize ("O0") - static int do_test (void) {