p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0a00ef50: Merge "Do not pack relocations for executables" 

* commit '0a00ef5084d6cb6adf3cc2a6f159410b51d2c13b':
  Do not pack relocations for executables
This commit is contained in:
Dmitriy Ivanov 2015-05-07 21:22:44 +00:00 committed by Android Git Automerger
parent 2e286f467b 0a00ef5084
commit d64be40d11
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/config_sanitizers.mk
View File

@ -87,13 +87,6 @@ ifneq ($(filter address,$(my_sanitize)),)
$(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES)
my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
my_ldflags += -Wl,-rpath,$($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RPATH)
# http://b/20665974
# The relocation packer is causing the kernel to load the executable
# overlapping ASAN's shadow space.
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
LOCAL_PACK_MODULE_RELOCATIONS := false
endif
endif
endif

6
core/dynamic_binary.mk
View File

@ -50,8 +50,10 @@ ifeq ($(my_pack_module_relocations),)
my_pack_module_relocations := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_PACK_MODULE_RELOCATIONS)
endif
# Do not pack relocations for static executables.
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
# Do not pack relocations for executables. Because packing results in
# non-zero p_vaddr which causes kernel to load executables to lower
# address (starting at 0x8000) http://b/20665974
ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)
my_pack_module_relocations := false
endif