commit 4b3987498eb15dc654fe572aadf53396aac36479
author Ying Wang <wangying@android.com> Fri Aug 26 12:10:45 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 26 12:10:45 2011 -0700
tree 24335ec96bd149a2fce09d2055c284d8cc1e9619
parent 80d41e4b7555aed399c7bd23647947d7eade3fe6
parent c5033a3357b824a8285da67357a0d289750f4a72

am c5033a33: Merge "x86: remove obsolete comments"

* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
  x86: remove obsolete comments

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 989f7e3..5e0b895 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -97,10 +97,6 @@
 #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