diff options
| author | Nick Kralevich <nnk@google.com> | 2015-12-05 22:20:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-05 22:20:46 +0000 |
| commit | 2a49aba35b9b9216df1da245f1af13c6faa5a850 (patch) | |
| tree | e0a4a3eb07e0c863e4bfb00e973b05c95d8d35f0 | |
| parent | c7d5e54dfe71766dc60adcf06e6ec1a2b12cdda9 (diff) | |
| parent | 8765b1035f813be2c26988a73cf3e9815aa5adf6 (diff) | |
| download | build-2a49aba35b9b9216df1da245f1af13c6faa5a850.tar.gz | |
Merge "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 485e48cc3f..1eb30d0204 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 \ + -fstack-protector-strong \ -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 1eb32407f1..b4d63d6e9c 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 \ + -fstack-protector-strong \ -ffunction-sections \ -fdata-sections \ -funwind-tables \ diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index c4cb0f813d..dbe16121d6 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 \ + -fstack-protector-strong \ -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 b7ec50ba6d..99bac72997 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 \ + -fstack-protector-strong \ -m64 \ -no-canonical-prefixes \ -fno-canonical-system-headers |