diff mbox series

[1/3] Revert "EXP: tools/nolibc: partially revert stackprotector compiler flags"

Message ID 20230523-nolibc-stackprotector-gcc9-v1-1-3e4804235d50@weissschuh.net (mailing list archive)
State New
Headers show
Series tools/nolibc: stack protector compatibility fixes | expand

Commit Message

Thomas Weißschuh May 24, 2023, 6:44 a.m. UTC 
This reverts commit 8213b0cdb51d1f66af713e00fd0dff3c2eb47636.

A nicer solution for the same problem is implemented later in this series.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 tools/testing/selftests/nolibc/Makefile | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile
index e479e9fec5f8..882ba6a33dbb 100644
--- a/tools/testing/selftests/nolibc/Makefile
+++ b/tools/testing/selftests/nolibc/Makefile
@@ -76,20 +76,11 @@  else
 Q=@
 endif
 
-CFLAGS_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_s390 = -m64
 CFLAGS  ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 \
 		$(call cc-option,-fno-stack-protector) \
-		$(CFLAGS_STKP_$(ARCH)) $(CFLAGS_$(ARCH))
+		$(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) \
+		$(CFLAGS_$(ARCH))
 LDFLAGS := -s
 
 help: