From: Greg Kroah-Hartman Date: Wed, 9 Mar 2022 22:29:27 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v4.9.306~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd19eb70eb07d58804fa8d565bba998b6bf47860;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch --- diff --git a/queue-5.10/arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch b/queue-5.10/arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch new file mode 100644 index 00000000000..ad4c4b43eb7 --- /dev/null +++ b/queue-5.10/arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch @@ -0,0 +1,47 @@ +From 36168e387fa7d0f1fe0cd5cf76c8cea7aee714fa Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 9 Mar 2022 15:07:27 -0700 +Subject: ARM: Do not use NOCROSSREFS directive with ld.lld + +From: Nathan Chancellor + +commit 36168e387fa7d0f1fe0cd5cf76c8cea7aee714fa upstream. + +ld.lld does not support the NOCROSSREFS directive at the moment, which +breaks the build after commit b9baf5c8c5c3 ("ARM: Spectre-BHB +workaround"): + + ld.lld: error: ./arch/arm/kernel/vmlinux.lds:34: AT expected, but got NOCROSSREFS + +Support for this directive will eventually be implemented, at which +point a version check can be added. To avoid breaking the build in the +meantime, just define NOCROSSREFS to nothing when using ld.lld, with a +link to the issue for tracking. + +Cc: stable@vger.kernel.org +Fixes: b9baf5c8c5c3 ("ARM: Spectre-BHB workaround") +Link: https://github.com/ClangBuiltLinux/linux/issues/1609 +Signed-off-by: Nathan Chancellor +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/include/asm/vmlinux.lds.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/arm/include/asm/vmlinux.lds.h ++++ b/arch/arm/include/asm/vmlinux.lds.h +@@ -26,6 +26,14 @@ + #define ARM_MMU_DISCARD(x) x + #endif + ++/* ++ * ld.lld does not support NOCROSSREFS: ++ * https://github.com/ClangBuiltLinux/linux/issues/1609 ++ */ ++#ifdef CONFIG_LD_IS_LLD ++#define NOCROSSREFS ++#endif ++ + /* Set start/end symbol names to the LMA for the section */ + #define ARM_LMA(sym, section) \ + sym##_start = LOADADDR(section); \ diff --git a/queue-5.10/series b/queue-5.10/series index 50e502e53cf..222cc894b58 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -42,3 +42,4 @@ arm64-use-the-clearbhb-instruction-in-mitigations.patch arm64-proton-pack-include-unprivileged-ebpf-status-in-spectre-v2-mitigation-reporting.patch arm-fix-build-error-when-bpf_syscall-is-disabled.patch arm-fix-co-processor-register-typo.patch +arm-do-not-use-nocrossrefs-directive-with-ld.lld.patch