commit 57a477ff2e3dc853d24ca4ce490dbc50feeca3c8
author David Turner <digit@android.com> Tue Apr 26 10:24:24 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 26 10:24:24 2011 -0700
tree afc8a5f72f0f7162e30d2469c200f5a5e7eab085
parent 6e7926a6cdd5fa6815266ecb16d6ba5410f8a182
parent 6f9b7562e36483a7bf23833d99da6a50e57f7266

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

* commit '6f9b7562e36483a7bf23833d99da6a50e57f7266':
  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 25f8aec..3c61a72 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