openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove CFI-related WAR that is no longer necessary" am: 76ceec724f 

am: d4a9a3281e

Change-Id: I9db667776cfa95847cec0b1c11c062357759daab
This commit is contained in:
Pirama Arumuga Nainar 2017-11-06 22:01:04 +00:00 committed by android-build-merger
parent 5cd6fd64fb d4a9a3281e
commit 306b13aa17
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/config_sanitizers.mk
View File

@ -242,11 +242,6 @@ ifneq ($(filter cfi,$(my_sanitize)),)
endif
my_ldflags += $(CFI_EXTRA_LDFLAGS)
my_arflags += --plugin $(LLVM_PREBUILTS_PATH)/../lib64/LLVMgold.so
# Workaround for b/33678192. CFI jumptables need Thumb2 codegen. Revert when
# Clang is updated past r290384.
ifneq ($(filter arm,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)
my_ldflags += -march=armv7-a
endif
ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_ldflags := $(filter-out -fsanitize-cfi-cross-dso,$(my_ldflags))