From: Dan Albert <danalbert@google.com>
Date: Mon, 20 Oct 2014 22:42:23 +0000 (+0000)
Subject: am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."
X-Git-Tag: android-x86-6.0-r1~144^2~474
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94d4214094552d8f6853ef9168b3e44174fdd753;p=android-x86%2Fbuild.git

am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."

* commit 'cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
  We also need -rdynamic for host ASAN.
---

94d4214094552d8f6853ef9168b3e44174fdd753
diff --cc core/clang/config.mk
index 37eeae19d,03b536221..0027cbf66
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@@ -90,16 -90,17 +90,18 @@@ include $(BUILD_SYSTEM)/clang/TARGET_$(
  endif
  
  # Address sanitizer clang config
 -ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address
 +ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan_$(TARGET_ARCH)_android
 +ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address -fno-omit-frame-pointer
  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_SHARED_LIBRARIES_TARGET := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)
  ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan
  
  # This allows us to use the superset of functionality that compiler-rt