From b8c4a6f1f8fe11a1420278f1291482a5865e541e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 8 Dec 2015 02:53:51 +0000 Subject: [PATCH] Revert "enable -fstack-protector-strong" This reverts commit 8765b1035f813be2c26988a73cf3e9815aa5adf6. This prevents x86 from booting. http://b/26046864 Change-Id: Ica3f7e7e639c99fd3158df3643acb49307197881 --- core/combo/TARGET_linux-arm.mk | 2 +- core/combo/TARGET_linux-arm64.mk | 2 +- core/combo/TARGET_linux-x86.mk | 2 +- core/combo/TARGET_linux-x86_64.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 1eb30d020..485e48cc3 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -101,7 +101,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -ffunction-sections \ -fdata-sections \ -funwind-tables \ - -fstack-protector-strong \ + -fstack-protector \ -Wa,--noexecstack \ -Werror=format-security \ -D_FORTIFY_SOURCE=2 \ diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index a300aafa5..18bdbe755 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -75,7 +75,7 @@ TARGET_GLOBAL_CFLAGS += \ -fno-strict-aliasing \ TARGET_GLOBAL_CFLAGS += \ - -fstack-protector-strong \ + -fstack-protector \ -ffunction-sections \ -fdata-sections \ -funwind-tables \ diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index dbe16121d..c4cb0f813 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -94,7 +94,7 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ -fstrict-aliasing \ -funswitch-loops \ -funwind-tables \ - -fstack-protector-strong \ + -fstack-protector \ -m32 \ -no-canonical-prefixes \ -fno-canonical-system-headers \ diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 99bac7299..b7ec50ba6 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -94,7 +94,7 @@ TARGET_GLOBAL_CFLAGS += \ -fstrict-aliasing \ -funswitch-loops \ -funwind-tables \ - -fstack-protector-strong \ + -fstack-protector \ -m64 \ -no-canonical-prefixes \ -fno-canonical-system-headers