From b4852084e39525c5021f411813d844f6c4e6fdb6 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Thu, 16 Jan 2025 10:48:50 +0000 Subject: [PATCH] ANDROID: adjust version numbers for RUST+KASAN This `depends on` currently causes KASAN builds to run with CONFIG_RUST=n. However, the relevant fix has been backported and is available in Android's prebuilt for rustc 1.82.0, thus update the version requirement to match. Bug: 359429865 Link: https://r.android.com/3368203 Change-Id: I35bc9ead0e9777f9926b4d990593e2e16ad60c38 Signed-off-by: Alice Ryhl --- init/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index 9d2d2635f6fb..a3432dd96208 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1983,7 +1983,8 @@ config RUST select CFI_ICALL_NORMALIZE_INTEGERS if CFI_CLANG depends on !CALL_PADDING || RUSTC_VERSION >= 108100 depends on !KASAN_SW_TAGS - depends on !(MITIGATION_RETHUNK && KASAN) || RUSTC_VERSION >= 108300 + # ANDROID: This version number has been changed due to backports in Android's compiler. + depends on !(MITIGATION_RETHUNK && KASAN) || RUSTC_VERSION >= 108200 help Enables Rust support in the kernel.