summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2012-09-12 13:44:00 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-12 13:44:01 -0700
commit7e300d60bfc325e3cbf3e7656297c14109e513b8 (patch)
tree80329afc188f5939fd475fbe86052c57016ac5d9 /core
parent4458452ef64f271906914e79ffd9923630ae22f2 (diff)
parentc2fb2391f459ad4ea2ce939dac02b4f4e33b9739 (diff)
downloadbuild-7e300d60bfc325e3cbf3e7656297c14109e513b8.zip
build-7e300d60bfc325e3cbf3e7656297c14109e513b8.tar.gz
build-7e300d60bfc325e3cbf3e7656297c14109e513b8.tar.bz2
Merge "Enable stack-protector for x86"
Diffstat (limited to 'core')
-rw-r--r--core/combo/TARGET_linux-x86.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index f12ad3e..9a6e08e 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -94,6 +94,7 @@ TARGET_GLOBAL_CFLAGS += \
-fstrict-aliasing \
-funswitch-loops \
-funwind-tables \
+ -fstack-protector \
-include $(call select-android-config-h,target_linux-x86)
# XXX: Not sure this is still needed. Must check with our toolchains.