Merge "Disable stack protection explicitly" into integration

494d57e8 · Paul Beesley · TrustedFirmware Code Review · f60ad9b7 · 7af195e2 · 494d57e8
Commit 494d57e8 authored 5 years ago by Paul Beesley Committed by TrustedFirmware Code Review 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 1 deletion
+3 -1
--- a/lib/stack_protector/stack_protector.mk
+++ b/lib/stack_protector/stack_protector.mk
@@ -11,7 +11,9 @@ ifeq (${ENABLE_STACK_PROTECTOR},0)
  ENABLE_STACK_PROTECTOR := none
 endif

-ifneq (${ENABLE_STACK_PROTECTOR},none)
+ifeq (${ENABLE_STACK_PROTECTOR},none)
+  TF_CFLAGS            +=      -fno-stack-protector
+else
  STACK_PROTECTOR_ENABLED := 1
  BL_COMMON_SOURCES	+=	lib/stack_protector/stack_protector.c	\
 				lib/stack_protector/${ARCH}/asm_stack_protector.S