StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Stephen Hines
2012-06-12 15:38:21 -07:00
committed by Android (Google) Code Review
parent 0951ce6aa2 c72f39664d
commit 2897f052d4
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/binary.mk
View File

@@ -132,6 +132,11 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES) LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
endif endif
# Add in libcompiler-rt for all device builds
ifndef LOCAL_IS_HOST_MODULE
LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
endif
my_compiler_dependencies := my_compiler_dependencies :=
ifeq ($(strip $(LOCAL_CLANG)),true) ifeq ($(strip $(LOCAL_CLANG)),true)
LOCAL_CFLAGS += $(CLANG_CONFIG_EXTRA_CFLAGS) LOCAL_CFLAGS += $(CLANG_CONFIG_EXTRA_CFLAGS)

6
core/llvm_config.mk
View File

@@ -71,3 +71,9 @@ ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -faddress-sanitizer
ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit
ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl libasan_preload ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl libasan_preload
ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan 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