aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-04-29 20:51:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-04-29 20:51:27 +0000
commit042723c0151980fee315678736751f7385977d90 (patch)
treeeb02d43b5c03da616044b6dc1720d275739a6bbf
parent835816ae9eb9de2ae7b75e2318d5eba596f1275c (diff)
parentfb45baa7e7f7909fb58460194476e8f7ffd23cde (diff)
downloadbuild-042723c0151980fee315678736751f7385977d90.tar.gz
Merge "x86/mips: enable _FORTIFY_SOURCE=2"
-rw-r--r--core/combo/TARGET_linux-mips.mk2
-rw-r--r--core/combo/TARGET_linux-x86.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index 41928f8724..85eaec9991 100644
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -93,7 +93,7 @@ TARGET_GLOBAL_CFLAGS += \
-funwind-tables \
-Wa,--noexecstack \
-Werror=format-security \
- -D_FORTIFY_SOURCE=1 \
+ -D_FORTIFY_SOURCE=2 \
$(arch_variant_cflags)
android_config_h := $(call select-android-config-h,linux-mips)
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 04531b2912..5c9a76bb1a 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -90,7 +90,7 @@ TARGET_GLOBAL_CFLAGS += \
-Ulinux \
-Wa,--noexecstack \
-Werror=format-security \
- -D_FORTIFY_SOURCE=1 \
+ -D_FORTIFY_SOURCE=2 \
-Wstrict-aliasing=2 \
-fPIC -fPIE \
-ffunction-sections \