From: Thomas Weißschuh Date: Sat, 25 Mar 2023 15:45:13 +0000 (+0100) Subject: tools/nolibc: tests: fold in no-stack-protector cflags X-Git-Tag: v6.4-rc1~201^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=255ffeee718d4ba9c4e9ae05df980bb32f509046;p=thirdparty%2Fkernel%2Flinux.git tools/nolibc: tests: fold in no-stack-protector cflags For the cflags to enable stack protectors to work properly they need to be specified after -fno-stack-protector. To do this fold all cflags into a single variable and move -fno-stack-protector before the arch-specific cflags and another one specific to stack protectors since we don't want to enable them on all archs. Signed-off-by: Thomas Weißschuh Signed-off-by: Willy Tarreau Signed-off-by: Paul E. McKenney --- diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index c99bbcda7495b..4469dcb0c9d77 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -77,8 +77,9 @@ Q=@ endif CFLAGS_s390 = -m64 -CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables $(CFLAGS_$(ARCH)) -CFLAGS += $(call cc-option,-fno-stack-protector) +CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables \ + $(call cc-option,-fno-stack-protector) \ + $(CFLAGS_STKP_$(ARCH)) $(CFLAGS_$(ARCH)) LDFLAGS := -s help: