tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Define __stack_chk_fail_local.S"

Browse source
This commit is contained in:
Andrew Hsieh 2012-06-20 18:37:47 -07:00 committed by android code review
commit a5948157fd
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

@ -24,7 +24,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

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

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