From: Jiaxun Yang jiaxun.yang@flygoat.com
[ Upstream commit 18ca63a2e23c5e170d2d7552b64b1f5ad019cd9b ]
msym32 is not supported by LLVM toolchain. Workaround by probe toolchain support of msym32 for KBUILD_SYM32 feature.
Link: https://github.com/ClangBuiltLinux/linux/issues/1544 Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com Signed-off-by: Thomas Bogendoerfer tsbogend@alpha.franken.de Signed-off-by: WangYuli wangyuli@uniontech.com --- arch/mips/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index f49807e1f19b..0888074f4dfe 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -299,7 +299,7 @@ drivers-$(CONFIG_PCI) += arch/mips/pci/ ifdef CONFIG_64BIT ifndef KBUILD_SYM32 ifeq ($(shell expr $(load-y) < 0xffffffff80000000), 0) - KBUILD_SYM32 = y + KBUILD_SYM32 = $(call cc-option-yn, -msym32) endif endif
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 18ca63a2e23c5e170d2d7552b64b1f5ad019cd9b
WARNING: Author mismatch between patch and upstream commit: Backport author: WangYuli wangyuli@uniontech.com Commit author: Jiaxun Yang jiaxun.yang@flygoat.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Not found
Note: The patch differs from the upstream commit: --- 1: 18ca63a2e23c ! 1: 8e84f3858fcf MIPS: Probe toolchain support of -msym32 @@ Metadata ## Commit message ## MIPS: Probe toolchain support of -msym32
+ [ Upstream commit 18ca63a2e23c5e170d2d7552b64b1f5ad019cd9b ] + msym32 is not supported by LLVM toolchain. Workaround by probe toolchain support of msym32 for KBUILD_SYM32 feature. @@ Commit message Link: https://github.com/ClangBuiltLinux/linux/issues/1544 Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com Signed-off-by: Thomas Bogendoerfer tsbogend@alpha.franken.de + Signed-off-by: WangYuli wangyuli@uniontech.com
## arch/mips/Makefile ## @@ arch/mips/Makefile: drivers-$(CONFIG_PCI) += arch/mips/pci/ ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success | | stable/linux-5.4.y | Success | Success |
Hi Sasha Levin,
I'm wondering if there might be a bot output issue.
In fact, this patch should be backported to every LTS version from 5.4 to 6.6, including 5.10, 5.15 and 6.1.
Thanks,
On 2024/12/26 09:21, Sasha Levin wrote:
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 18ca63a2e23c5e170d2d7552b64b1f5ad019cd9b
WARNING: Author mismatch between patch and upstream commit: Backport author: WangYuli wangyuli@uniontech.com Commit author: Jiaxun Yang jiaxun.yang@flygoat.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Not found
Note: The patch differs from the upstream commit:
1: 18ca63a2e23c ! 1: 8e84f3858fcf MIPS: Probe toolchain support of -msym32 @@ Metadata ## Commit message ## MIPS: Probe toolchain support of -msym32 + [ Upstream commit 18ca63a2e23c5e170d2d7552b64b1f5ad019cd9b ] + msym32 is not supported by LLVM toolchain. Workaround by probe toolchain support of msym32 for KBUILD_SYM32 feature. @@ Commit message Link: https://github.com/ClangBuiltLinux/linux/issues/1544 Signed-off-by: Jiaxun Yang jiaxun.yang@flygoat.com Signed-off-by: Thomas Bogendoerfer tsbogend@alpha.franken.de + Signed-off-by: WangYuli wangyuli@uniontech.com ## arch/mips/Makefile ## @@ arch/mips/Makefile: drivers-$(CONFIG_PCI) += arch/mips/pci/
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success | | stable/linux-5.4.y | Success | Success |
Thanks,
On Tue, 24 Dec 2024, WangYuli wrote:
From: Jiaxun Yang jiaxun.yang@flygoat.com
[ Upstream commit 18ca63a2e23c5e170d2d7552b64b1f5ad019cd9b ]
msym32 is not supported by LLVM toolchain. Workaround by probe toolchain support of msym32 for KBUILD_SYM32 feature.
Doesn't this reintroduce the failure fixed with commit a79a404e6c22 ("MIPS: Fix CONFIG_CPU_DADDI_WORKAROUNDS `modules_install' regression")?
If this call to `cc-option-yn' does need to be made here, then this whole stuff has to be wrapped into a `need-compiler' check, see the discussion: https://lore.kernel.org/r/alpine.DEB.2.21.2307180025120.62448@angie.orcam.me.uk/ and the other patches in the series.
Maciej
Are you suggesting that a commit from v6.8 reintroduced a regression that was fixed in v6.6?
If so, we should address this issue in the mainline first before backporting.
As a general rule, we avoid introducing out-of-tree commits to linux-stable except for reverts.
For this patch, merging it into linux-stable is crucial, as it would prevent certain configurations like loongson3_defconfig from building the kernel with clang.
To fix follow error with clang-19: clang: error: unknown argument: '-msym32'
Thanks, -- WangYuli
On Fri, 3 Jan 2025, WangYuli wrote:
Are you suggesting that a commit from v6.8 reintroduced a regression that was fixed in v6.6?
Correct.
If so, we should address this issue in the mainline first before backporting.
I do not disagree.
As a general rule, we avoid introducing out-of-tree commits to linux-stable except for reverts.
Understood.
For this patch, merging it into linux-stable is crucial, as it would prevent certain configurations like loongson3_defconfig from building the kernel with clang.
Conversely I don't think it's acceptable for -stable to merge a change that replaces one known bug with another; it violates our rule #2:
- It must be obviously correct and tested.
If you care about support for building with Clang, then please either fix your fix or fix the compiler to handle `-msym32' or an equivalent option (which seems a good idea for n64 MIPS performance anyway -- you're wasting a lot of cycles to explicitly put the sign-extension of bit 31 into the high order 32 bits where the CPU architecture does it for you already). And only then offer a backport of whatever you feel is needed to -stable.
Maciej
linux-stable-mirror@lists.linaro.org
-
Maciej W. Rozycki -
Sasha Levin -
WangYuli