diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2012-06-20 19:00:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-20 19:00:55 -0700 |
| commit | 63d0ceec75927155947c07bc45cb9fed5e527922 (patch) | |
| tree | ea40b42ebea8dfa43a40218cfb100e324a8fa221 /linker | |
| parent | 214feeba196435d26b4b8ba6ca6959695ebb892c (diff) | |
| parent | fa136e8ca71cb20956cd1792251869cac8bed257 (diff) | |
| download | bionic-63d0ceec75927155947c07bc45cb9fed5e527922.zip bionic-63d0ceec75927155947c07bc45cb9fed5e527922.tar.gz bionic-63d0ceec75927155947c07bc45cb9fed5e527922.tar.bz2 | |
am fa136e8c: am a5948157: Merge "Define __stack_chk_fail_local.S"
* commit 'fa136e8ca71cb20956cd1792251869cac8bed257':
Define __stack_chk_fail_local.S
Diffstat (limited to 'linker')
| -rw-r--r-- | linker/Android.mk | 4 | ||||
| -rw-r--r-- | linker/arch/x86/begin.S | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index 4a81681..2f39cbe 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -26,7 +26,9 @@ LOCAL_CFLAGS += -DLINKER_DEBUG=0 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 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 @@ _start: popl %esp jmp *%eax +#include "__stack_chk_fail_local.S" |