Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6926706f authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by android-build-merger
Browse files

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

am: 306b13aa

Change-Id: Ib987d0d96774e536e1f9f0033bd0993ff0797d77
parents 2512ed10 306b13aa

core/config_sanitizers.mk

+0 −5
Original line number Diff line number Diff line
@@ -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))