commit 6f9b7562e36483a7bf23833d99da6a50e57f7266
author David Turner <digit@android.com> Tue Apr 26 01:12:03 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 26 01:12:03 2011 -0700
tree 2eae8787fc07820491f8cc336d26fb9cc73f25fe
parent 55a461c9b1ab92bf6250650afcacc8de85c1e01a
parent d5565942437e2c0787822604921d034e9df5fc5d

am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"

* commit 'd5565942437e2c0787822604921d034e9df5fc5d':
  x86: Disable stack-protector until bionic is fixed

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 449af83..8a2f841 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -80,6 +80,9 @@
 			-fPIC \
 			-include $(call select-android-config-h,target_linux-x86)
 
+# Fix this after ssp.c is fixed for x86
+# TARGET_GLOBAL_CFLAGS += -fstack-protector
+
 TARGET_GLOBAL_CPPFLAGS += \
 			-fno-use-cxa-atexit