commit e0b4844a20ffd022a568abb4203b3f7c759c7ff5
author Bruce Beare <bruce.j.beare@intel.com> Tue May 03 21:04:40 2011 -0700
committer Bruce Beare <bruce.j.beare@intel.com> Tue May 24 13:32:14 2011 -0700
tree 6105d32ac5682170ae58b7a4aa141fd496135400
parent dc3bc87b43d0d73d89cca59692b80de878e11a5d

x86: Enable -fstack-protector

Change-Id: Ib69514c3afcb4c1f5e5f3f8cd91acfd145a0866c
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index da311cd..e613397 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -50,6 +50,7 @@
 else
   ifeq ($(TARGET_ARCH),x86)
     LOCAL_CFLAGS += -DANDROID_X86_LINKER
+    LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/arch-x86/bionic
   else
     ifeq ($(TARGET_ARCH),sh)
       LOCAL_CFLAGS += -DANDROID_SH_LINKER

linker/arch/x86/begin.S

diff --git a/linker/arch/x86/begin.S b/linker/arch/x86/begin.S
index b4427e0..5be59cb 100644
--- a/linker/arch/x86/begin.S
+++ b/linker/arch/x86/begin.S
@@ -44,3 +44,5 @@
         popl   %esp
         jmp    *%eax
 
+
+#include "__stack_chk_fail_local.S"