commit a5948157fd34acb2b1d1bfaf129901af865ab5fc
author Andrew Hsieh <andrewhsieh@google.com> Wed Jun 20 18:37:47 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Jun 20 18:37:48 2012 -0700
tree 27812988f268a0b66e8e0c7fcfab112bcfb82743
parent 028ccf5d40dd9a945ea92aa79822c08c6f6aa1d2
parent 6973e3da873c5694d0011734c7c6841a46150cb1

Merge "Define __stack_chk_fail_local.S"

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index 8f8cc2b..c61e351 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -24,7 +24,9 @@
 ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true)
     LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
 endif
-LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/private
+LOCAL_CFLAGS += \
+    -I$(LOCAL_PATH)/../libc/private \
+    -I$(LOCAL_PATH)/../libc/arch-$(TARGET_ARCH)/bionic
 
 ifeq ($(TARGET_ARCH),arm)
 LOCAL_CFLAGS += -DANDROID_ARM_LINKER

linker/arch/x86/begin.S

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