[Trusty][PATCH 4/4] Revert "UBUNTU: SAUCE: disable stack-protector for ARM compressed bootloader"

Kamal Mostafa kamal at canonical.com
Fri Dec 11 19:53:26 UTC 2015


This reverts commit 900be9e1bdc70f08ee67326254e1f340fba09541.

This SAUCE is no longer needed, since these commits fix the broken
stack-protector logic in arch/arm/Makefile:

stackprotector: Introduce CONFIG_CC_STACKPROTECTOR_STRONG
stackprotector: Unify the HAVE_CC_STACKPROTECTOR logic between architectures

Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 arch/arm/boot/compressed/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0fcf9e7..e7190bb 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -3,7 +3,6 @@
 #
 # create a compressed vmlinuz image from the original vmlinux
 #
-KBUILD_CFLAGS := $(filter-out -fstack-protector, $(KBUILD_CFLAGS)) -fno-stack-protector
 
 OBJS		=
 
-- 
1.9.1





More information about the kernel-team mailing list