Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d0ec893 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by Gerrit Code Review
Browse files

Merge "Use a different linker for ASan binaries."

parents ecb7b37b 8f5e67a9

core/binary.mk

+3 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ $(foreach lib, $(LOCAL_HAL_STATIC_LIBRARIES), \ 
b_lib :=

endif



my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LINKER)



include $(BUILD_SYSTEM)/config_sanitizers.mk



ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)
@@ -361,6 +363,7 @@ ifneq ($(LOCAL_NO_SYNTAX_CHECK),true) 
  my_cxx := $(SYNTAX_TOOLS_PREFIX)/cxx-syntax $(my_syntax_arch) "$(my_cxx)"

endif

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_LINKER := $(my_linker)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(my_cxx)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CLANG := $(my_clang)

core/clang/TARGET_arm.mk

+1 −0
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.p 
# Address sanitizer clang config

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm-android

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RPATH := /data/vendor/lib:/$(TARGET_COPY_OUT_VENDOR)/lib:/data/lib

$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan

core/clang/TARGET_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64-android.a 
# Address sanitizer clang config

ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm64-android

ADDRESS_SANITIZER_RPATH := /data/vendor/lib64:/$(TARGET_COPY_OUT_VENDOR)/lib64:/data/lib64

ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64

core/config_sanitizers.mk

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ 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)

    my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_LINKER)

  endif

endif

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -1510,7 +1510,7 @@ endef 
define transform-o-to-executable-inner

$(hide) $(PRIVATE_CXX) -pie \

	-nostdlib -Bdynamic \

	-Wl,-dynamic-linker,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_LINKER) \

	-Wl,-dynamic-linker,$(PRIVATE_LINKER) \

	-Wl,--gc-sections \

	-Wl,-z,nocopyreloc \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \