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

Commit fd317f84 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Merge "Blacklist code for CFI." am: 5f50896a am: f1e39159 am: cdf79d72

am: 7832d873

Change-Id: Ibcc690ab5303c12298b55e4819c2448808cf3616
parents d1404401 7832d873
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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
  # entire module.
  LOCAL_ARM_MODE := thumb
  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_cflags += $(CFI_EXTRA_CFLAGS)
  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.