From 4ffe3f5b9ffea2725dbc981230127840aee5be81 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 20 Oct 2014 13:30:00 -0700 Subject: [PATCH] We also need -rdynamic for host ASAN. Change-Id: Iee33ca85c25d9bf126be8318a3b837074ab10076 --- core/binary.mk | 2 ++ core/clang/config.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index 6db8ae47f2..750e783f51 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -182,12 +182,14 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS) ifdef LOCAL_IS_HOST_MODULE + my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST) my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST) my_shared_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST) my_static_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST) else + my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET) my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET) my_shared_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET) diff --git a/core/clang/config.mk b/core/clang/config.mk index 246690f220..03b5362216 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -93,10 +93,12 @@ endif ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit +ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST := -rdynamic ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST := -lpthread -ldl ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST := ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST := libasan +ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET := ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET := ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl libasan_preload ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan