malloc: Fix tst-tcfree3 build csky-linux-gnuabiv2 with fortify source
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
redhat-pt-bot/TryBot-32bit |
success
|
Build for i686
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
Commit Message
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.
---
malloc/Makefile | 2 ++
malloc/tst-tcfree3.c | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
Comments
LGTM but would it make sense to have -fno-builtin-malloc for *all* the
malloc tests?
Reviewed-by: DJ Delorie <dj@redhat.com>
On 19/10/23 14:59, DJ Delorie wrote:
>
> LGTM but would it make sense to have -fno-builtin-malloc for *all* the
> malloc tests?
>
> Reviewed-by: DJ Delorie <dj@redhat.com>
>
I think it would be valuable, this is what I did in azanella/clang [1] to
avoid clang optimize ways most of the calls.
[1] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=malloc/Makefile;h=0e47b8446f59fab9d05364543aff8d988f640a3e;hp=c1db3347d88e112fcdfd78c90564c6d5d95abb33;hb=ca27004e1096ab2942dc770acccf835e52bc9d74;hpb=9fd866d9a7ac9b55b6a796df207aa3cd0899e451
@@ -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
@@ -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)
{