1From e389d5fbc296e496db15368b2b621e0f178f7f34 Mon Sep 17 00:00:00 2001 2From: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3Date: Sat, 8 May 2021 21:28:10 +0200 4Subject: [PATCH] Makefile: unconditionally disable SSP 5 6Though -nostdlib is passed in {C,+AS,DTSCPP}FLAGS, -fno-stack-protector 7must also be passed to avoid linking errors related to undefined 8references to '__stack_chk_guard' and '__stack_chk_fail' if toolchain 9enforces -fstack-protector. 10 11Fixes: 12 - https://gitlab.com/kubu93/buildroot/-/jobs/1247043359 13 14Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 15[Upstream status: https://github.com/riscv/opensbi/pull/211] 16--- 17 Makefile | 6 +++--- 18 1 file changed, 3 insertions(+), 3 deletions(-) 19 20diff --git a/Makefile b/Makefile 21index eeffe6b..1419360 100644 22--- a/Makefile 23+++ b/Makefile 24@@ -203,7 +203,7 @@ GENFLAGS += $(libsbiutils-genflags-y) 25 GENFLAGS += $(platform-genflags-y) 26 GENFLAGS += $(firmware-genflags-y) 27 28-CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 29+CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-stack-protector -fno-strict-aliasing -O2 30 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 31 CFLAGS += -mno-save-restore -mstrict-align 32 CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) 33@@ -217,7 +217,7 @@ CPPFLAGS += $(GENFLAGS) 34 CPPFLAGS += $(platform-cppflags-y) 35 CPPFLAGS += $(firmware-cppflags-y) 36 37-ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ 38+ASFLAGS = -g -Wall -nostdlib -fno-stack-protector -D__ASSEMBLY__ 39 ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls 40 ASFLAGS += -mno-save-restore -mstrict-align 41 ASFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) 42@@ -236,7 +236,7 @@ MERGEFLAGS += -r 43 MERGEFLAGS += -b elf$(PLATFORM_RISCV_XLEN)-littleriscv 44 MERGEFLAGS += -m elf$(PLATFORM_RISCV_XLEN)lriscv 45 46-DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-builtin -D__DTS__ -x assembler-with-cpp 47+DTSCPPFLAGS = $(CPPFLAGS) -nostdinc -nostdlib -fno-stack-protector -fno-builtin -D__DTS__ -x assembler-with-cpp 48 49 # Setup functions for compilation 50 define dynamic_flags 51-- 522.30.2 53 54