From 3b036607a8acb64cac0e458bac9f7f0805d79786 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Tue, 15 Oct 2024 11:35:22 +0000 Subject: [PATCH] Revert "FROMLIST: cfi: fix conditions in HAVE_CFI_ICALL_NORMALIZE_INTEGERS" This reverts commit 022a49a61492b313cc77712556762e60b7951baa. We ended up using a different solution for this upstream. Change-Id: Ie1738f3c65f7a9e6e25063a3b7dc87bb0d5dc9ce Signed-off-by: Alice Ryhl --- arch/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 2632de28c05a..8af374ea1adc 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -852,9 +852,8 @@ config CFI_ICALL_NORMALIZE_INTEGERS This option is necessary for using CFI with Rust. If unsure, say N. config HAVE_CFI_ICALL_NORMALIZE_INTEGERS - bool "Are normalized CFI tags for integers available?" - default !GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS - depends on EXPERT || (!GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS) + def_bool !GCOV_KERNEL && !KASAN + depends on CFI_CLANG depends on $(cc-option,-fsanitize=kcfi -fsanitize-cfi-icall-experimental-normalize-integers) help Is CFI_ICALL_NORMALIZE_INTEGERS supported with the set of compilers