Skip to content

Commit 9164083

Browse files
committed
cfi: tweak llvm version for HAVE_CFI_ICALL_NORMALIZE_INTEGERS
The llvm fix [1] did not make it for 19.0.0, but ended up getting backported to llvm 19.1.3 [2]. Thus, fix the version requirement to correctly specify which versions have the bug. Link: llvm/llvm-project#104826 [1] Link: llvm/llvm-project#113938 [2] Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-lkp/[email protected] Fixes: 8b8ca9c ("cfi: fix conditions for HAVE_CFI_ICALL_NORMALIZE_INTEGERS") Signed-off-by: Alice Ryhl <[email protected]>
1 parent 8b8ca9c commit 9164083

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/Kconfig

+2-2
Original file line numberDiff line numberDiff line change
@@ -855,14 +855,14 @@ config HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG
855855
def_bool y
856856
depends on $(cc-option,-fsanitize=kcfi -fsanitize-cfi-icall-experimental-normalize-integers)
857857
# With GCOV/KASAN we need this fix: https://github.com/llvm/llvm-project/pull/104826
858-
depends on CLANG_VERSION >= 190000 || (!GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS)
858+
depends on CLANG_VERSION >= 190103 || (!GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS)
859859

860860
config HAVE_CFI_ICALL_NORMALIZE_INTEGERS_RUSTC
861861
def_bool y
862862
depends on HAVE_CFI_ICALL_NORMALIZE_INTEGERS_CLANG
863863
depends on RUSTC_VERSION >= 107900
864864
# With GCOV/KASAN we need this fix: https://github.com/rust-lang/rust/pull/129373
865-
depends on (RUSTC_LLVM_VERSION >= 190000 && RUSTC_VERSION >= 108200) || \
865+
depends on (RUSTC_LLVM_VERSION >= 190103 && RUSTC_VERSION >= 108200) || \
866866
(!GCOV_KERNEL && !KASAN_GENERIC && !KASAN_SW_TAGS)
867867

868868
config CFI_PERMISSIVE

0 commit comments

Comments
 (0)