| commit | d5565942437e2c0787822604921d034e9df5fc5d | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Mon Apr 25 23:35:09 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Mon Apr 25 23:35:09 2011 -0700 |
| tree | 32bd9fb3b9025debf296e2a85bca6cd4435228f3 | |
| parent | f245dd7975abedcb35e30aca1b1e6e3eb273388d [diff] | |
| parent | 6ddd4ead924ac27c7e6655badeb6521dafd0a1ea [diff] |
Merge "x86: Disable stack-protector until bionic is fixed"
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