diff options
| author | Ying Wang <wangying@android.com> | 2011-08-26 12:12:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-26 12:12:48 -0700 |
| commit | a1b603a556e338d4899a62ea37810aff81ab7fa1 (patch) | |
| tree | 897c9d11e845bfa5b12a6c885dd01d778d179eb2 /core | |
| parent | 3db43165b09defcbeebdbeddff158b4e1f85d5c4 (diff) | |
| parent | 4b3987498eb15dc654fe572aadf53396aac36479 (diff) | |
| download | build-a1b603a556e338d4899a62ea37810aff81ab7fa1.zip build-a1b603a556e338d4899a62ea37810aff81ab7fa1.tar.gz build-a1b603a556e338d4899a62ea37810aff81ab7fa1.tar.bz2 | |
am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"
* commit '4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 98a5f2b..2d8fbf9 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -97,10 +97,6 @@ TARGET_GLOBAL_CFLAGS += -fstack-protector #TARGET_GLOBAL_CFLAGS += \ # -DNDEBUG - -# Fix this after ssp.c is fixed for x86 -# TARGET_GLOBAL_CFLAGS += -fstack-protector - TARGET_GLOBAL_CPPFLAGS += \ -fno-use-cxa-atexit |