p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Blacklist code for CFI." am: 5f50896a7f 

am: f1e39159c8

Change-Id: I54c3d78d16069abce64f007942fda7e28f703303
This commit is contained in:
Vishwath Mohan 2017-02-15 23:37:48 +00:00 committed by android-build-merger
parent 5721a9140c f1e39159c8
commit cdf79d7298
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/config_sanitizers.mk
View File

@ -159,8 +159,8 @@ ifneq ($(filter cfi,$(my_sanitize)),)
# LLVM is not set up to do this on a function basis, so force Thumb on the # LLVM is not set up to do this on a function basis, so force Thumb on the
# entire module. # entire module.
LOCAL_ARM_MODE := thumb LOCAL_ARM_MODE := thumb
my_cflags += -flto -fsanitize-cfi-cross-dso -fvisibility=default my_cflags += $(CFI_EXTRA_CFLAGS)
my_ldflags += -flto -fsanitize-cfi-cross-dso -fsanitize=cfi -Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check my_ldflags += $(CFI_EXTRA_LDFLAGS)
my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so
# Workaround for b/33678192. CFI jumptables need Thumb2 codegen. Revert when # Workaround for b/33678192. CFI jumptables need Thumb2 codegen. Revert when
# Clang is updated past r290384. # Clang is updated past r290384.