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

Merge "Force Thumb for CFI targets."

Browse Source 
am: 34eb9f7f60

Change-Id: Ie28255f6d8eb78ff5813623e167ad51ea1ab768b
This commit is contained in:
Evgenii Stepanov
2017-01-24 20:54:57 +00:00
committed by android-build-merger
parent e729e804fe 34eb9f7f60
commit 9e8e3de9d8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/config_sanitizers.mk
View File

@@ -143,6 +143,10 @@ ifneq ($(my_sanitize),)
endif endif
ifneq ($(filter cfi,$(my_sanitize)),) ifneq ($(filter cfi,$(my_sanitize)),)
# __cfi_check needs to be built as Thumb (see the code in linker_cfi.cpp).
# LLVM is not set up to do this on a function basis, so force Thumb on the
# entire module.
LOCAL_ARM_MODE := thumb
my_cflags += -flto -fsanitize-cfi-cross-dso -fvisibility=default my_cflags += -flto -fsanitize-cfi-cross-dso -fvisibility=default
my_ldflags += -flto -fsanitize-cfi-cross-dso -fsanitize=cfi -Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check my_ldflags += -flto -fsanitize-cfi-cross-dso -fsanitize=cfi -Wl,-plugin-opt,O1 -Wl,-export-dynamic-symbol=__cfi_check
my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so