commit 5f50896a7f5fb1e7f33185f0008ca2b899c8b124
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 15 22:52:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 15 22:52:46 2017 +0000
tree a2667a5ea65d4e8dbec5c7559df727c1803c4ba7
parent 74dcb9feb326e665c63fe26249cfa14f54afe06b
parent 5b69c06f1f8ba3743cc447bed9521eb4ef186dec

Merge "Blacklist code for CFI."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 57a7993..729ef48 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -159,8 +159,8 @@
   # 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.