diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-08 02:54:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-08 02:54:01 +0000 |
| commit | 27ab42654ebd5ffdc55bb6b727723e6980649ef9 (patch) | |
| tree | f76396678c2bc9434de544a98b5c59bca74ae051 | |
| parent | b437f58006af3d8b15eb3308ab5174da1a7c6c0d (diff) | |
| parent | b8c4a6f1f8fe11a1420278f1291482a5865e541e (diff) | |
| download | build-27ab42654ebd5ffdc55bb6b727723e6980649ef9.tar.gz | |
Merge "Revert "enable -fstack-protector-strong""
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 2 | ||||
| -rw-r--r-- | 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 1eb30d0204..485e48cc3f 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 b4d63d6e9c..1eb32407f1 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 dbe16121d6..c4cb0f813d 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 99bac72997..b7ec50ba6d 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 |