From 7b04b63e1c620add6570fb88e747e2e24c5c4787 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Fri, 21 May 2021 09:16:17 -0700 Subject: [PATCH] Revert "ANDROID: vmlinux.lds.h: Define SANITIZER_DISCARDS with CONFIG_CFI_CLANG" This reverts commit 5896d00f9c4694198767fc7e7bd0c363a6a52361 because discarding the .eh_frame section currently breaks backtraces in the T32 debugger. Bug: 188764690 Change-Id: Id8e037ef40051e297078f315be030d6b630ed33c Signed-off-by: Sami Tolvanen --- include/asm-generic/vmlinux.lds.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 5630c09aeb03..fde8db0040c4 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -1033,8 +1033,7 @@ * keep any .init_array.* sections. * https://bugs.llvm.org/show_bug.cgi?id=46478 */ -#if defined(CONFIG_GCOV_KERNEL) || defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KCSAN) || \ - defined(CONFIG_CFI_CLANG) +#if defined(CONFIG_GCOV_KERNEL) || defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KCSAN) # ifdef CONFIG_CONSTRUCTORS # define SANITIZER_DISCARDS \ *(.eh_frame)