commit c72f39664d6e6a9d15b912cd72e7bcef121fcc11
author Stephen Hines <srhines@google.com> Mon Jun 11 14:53:34 2012 -0700
committer Stephen Hines <srhines@google.com> Tue Jun 12 13:34:50 2012 -0700
tree d847f9798119e9c4a21043efaa6d678d16fb6051
parent 6e11c2de4aa3f1b2327566b9a3d2e43a504831b9

EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.

Change-Id: I463217aef573a28069469514ad94cd85a7f38bea

core/llvm_config.mk

diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index 4145028..33cf6d1 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -71,3 +71,9 @@
 ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit
 ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl libasan_preload
 ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan
+
+# This allows us to use the superset of functionality that compiler-rt
+# provides to Clang (for supporting features like -ftrapv).
+ifneq ($(TARGET_ARCH),mips)
+COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler-rt-extras
+endif