On 2023-05-21 11:36:35+0200, Thomas Weißschuh wrote: > Now that nolibc enable stackprotector support automatically when the > compiler enables it we only have to get the -fstack-protector flags > correct. > > The cc-options are structured so that -fstack-protector-all is only > enabled if -mstack-protector=guard works, as that is the only mode > supported by nolibc. > > Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx> > --- > tools/testing/selftests/nolibc/Makefile | 13 ++----------- > 1 file changed, 2 insertions(+), 11 deletions(-) > > diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile > index bd41102ea299..445c352b1b33 100644 > --- a/tools/testing/selftests/nolibc/Makefile > +++ b/tools/testing/selftests/nolibc/Makefile > @@ -76,20 +76,11 @@ else > Q=@ > endif > > -CFLAGS_STACKPROTECTOR = -DNOLIBC_STACKPROTECTOR \ > - $(call cc-option,-mstack-protector-guard=global) \ > - $(call cc-option,-fstack-protector-all) > -CFLAGS_STKP_i386 = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_x86_64 = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_x86 = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_arm64 = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_arm = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_mips = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_riscv = $(CFLAGS_STACKPROTECTOR) > -CFLAGS_STKP_loongarch = $(CFLAGS_STACKPROTECTOR) > +CFLAGS_STACKPROTECTOR = $(call cc-option,-mstack-protector-guard=global -fstack-protector-all) > CFLAGS_s390 = -m64 > CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 \ > $(call cc-option,-fno-stack-protector) \ > + $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) \ > $(CFLAGS_STKP_$(ARCH)) $(CFLAGS_$(ARCH)) > LDFLAGS := -s I noticed, of course after having sent the series, that the cleanup here was not done properly. CFLAGS_STACKPROTECTOR and CFLAGS_STKP should be deleted completely. This will be fixed in v2, or feel free to fix it up when applying the series.
