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

* commit 'd5565942437e2c0787822604921d034e9df5fc5d': x86: Disable stack-protector until bionic is fixed
2011-04-26 01:12:03 -07:00 · 2011-04-26 01:12:03 -07:00 · 6f9b7562e3
parent 55a461c9b1 d556594243
commit 6f9b7562e3
1 changed files with 3 additions and 0 deletions
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@ -80,6 +80,9 @@ TARGET_GLOBAL_CFLAGS += \
 			-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