From a8f75983a41363ffa1477eb66b21a55a8236f2e9 Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Sat, 4 Nov 2017 16:18:29 -0700
Subject: [PATCH] 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
---
 core/config_sanitizers.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 79604acdd..fce0b5a8b 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -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))