From 9f8f79abe83fb6316d8ec2fc125f67101789fdfb Mon Sep 17 00:00:00 2001
From: Sami Tolvanen <samitolvanen@google.com>
Date: Wed, 20 Nov 2019 09:26:05 -0800
Subject: [PATCH] ANDROID: use non-canonical CFI jump tables

Bug: 145210207
Change-Id: I8f59ab53c94087d1e9ec0154337486ad8aad973f
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f5cfa8acefb4..206e5c13bfe2 100644
--- a/Makefile
+++ b/Makefile
@@ -835,7 +835,7 @@ export LTO_CFLAGS DISABLE_LTO
 endif
 
 ifdef CONFIG_CFI_CLANG
-cfi-clang-flags	+= -fsanitize=cfi
+cfi-clang-flags	+= -fsanitize=cfi -fno-sanitize-cfi-canonical-jump-tables
 DISABLE_CFI_CLANG := -fno-sanitize=cfi
 ifdef CONFIG_MODULES
 cfi-clang-flags	+= -fsanitize-cfi-cross-dso