commit 76ceec724fedf751b7436bfa55d73244dc508074
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 06 18:54:45 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 06 18:54:45 2017 +0000
tree 55ff05542fa1914a9cc31eb88f92a84a49025e26
parent 8930bf679bbc97163b5c3e81107b0957216823ca
parent a8f75983a41363ffa1477eb66b21a55a8236f2e9

Merge "Remove CFI-related WAR that is no longer necessary"

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 79604ac..fce0b5a 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -242,11 +242,6 @@
   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))