From 84c5fb51746a59408ffca8ee7176160c266e165a Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Fri, 17 Jul 2020 15:00:02 +0200
Subject: [PATCH] Revert "ANDROID: CC_FLAGS_CFI add -fno-sanitize-blacklist"

This reverts commit 5ef359df159afa82c1b89357b617aa4860da550d as CFI is
being removed from the tree to come back later as a "clean" set of
patches.

Bug: 145210207
Cc: Sami Tolvanen <samitolvanen@google.com>
Cc: Ramon Pantin <pantin@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9170a1ccc796c37e0e5b98c2b2329db13947ff3c
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7f18e4e1d0a4..dad8f18c8144 100644
--- a/Makefile
+++ b/Makefile
@@ -886,8 +886,7 @@ endif
 
 ifdef CONFIG_CFI_CLANG
 CC_FLAGS_CFI	:= -fsanitize=cfi \
-		   -fno-sanitize-cfi-canonical-jump-tables \
-		   -fno-sanitize-blacklist
+		   -fno-sanitize-cfi-canonical-jump-tables
 
 ifdef CONFIG_MODULES
 CC_FLAGS_CFI	+= -fsanitize-cfi-cross-dso