Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 3b03660

Browse files
Darksonnmetti
authored andcommitted
Revert "FROMLIST: cfi: fix conditions in HAVE_CFI_ICALL_NORMALIZE_INTEGERS"
This reverts commit 022a49a. We ended up using a different solution for this upstream. Change-Id: Ie1738f3c65f7a9e6e25063a3b7dc87bb0d5dc9ce Signed-off-by: Alice Ryhl <[email protected]>
1 parent c783e8a commit 3b03660

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -852,9 +852,8 @@ config CFI_ICALL_NORMALIZE_INTEGERS
852852
This option is necessary for using CFI with Rust. If unsure, say N.
853853

854854
config HAVE_CFI_ICALL_NORMALIZE_INTEGERS
855-
bool "Are normalized CFI tags for integers available?"
856-
default !GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS
857-
depends on EXPERT || (!GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS)
855+
def_bool !GCOV_KERNEL && !KASAN
856+
depends on CFI_CLANG
858857
depends on $(cc-option,-fsanitize=kcfi -fsanitize-cfi-icall-experimental-normalize-integers)
859858
help
860859
Is CFI_ICALL_NORMALIZE_INTEGERS supported with the set of compilers

0 commit comments

Comments
 (0)