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

Remove CFI-related WAR that is no longer necessary 

Bug: http://b/33678192

Clang has been updated past the revision mentioned in the work around.
So this is no longer necessary.

Test: Build
Change-Id: I08f8e75936bbc3527abc86ba4ce0f2c10382d332
This commit is contained in:
Pirama Arumuga Nainar 2017-11-04 16:18:29 -07:00
parent 1d5f330c5b
commit a8f75983a4
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 endif
my_ldflags += $(CFI_EXTRA_LDFLAGS) 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
# 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) ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
my_ldflags := $(filter-out -fsanitize-cfi-cross-dso,$(my_ldflags)) my_ldflags := $(filter-out -fsanitize-cfi-cross-dso,$(my_ldflags))