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