generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a5948157: Merge "Define __stack_chk_fail_local.S"

Browse Source 
* commit 'a5948157fd34acb2b1d1bfaf129901af865ab5fc':
  Define __stack_chk_fail_local.S
This commit is contained in:
Andrew Hsieh 2012-06-20 18:58:18 -07:00 committed by Android Git Automerger
commit fa136e8ca7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker/Android.mk
View File

@ -26,7 +26,9 @@ LOCAL_CFLAGS += -DLINKER_DEBUG=0
ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true) ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif 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) ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -DANDROID_ARM_LINKER LOCAL_CFLAGS += -DANDROID_ARM_LINKER

1
linker/arch/x86/begin.S
View File

@ -44,3 +44,4 @@ _start:
popl %esp popl %esp
jmp *%eax jmp *%eax
#include "__stack_chk_fail_local.S"