| Message ID | 20230809165648.21071-1-xingmingzheng@iscas.ac.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ca09f772cccaeec4cd05a21528c37a260aa2dd2c |
| Headers | show |
| Series | [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Single patches do not need cover letters |
| conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD 174e8ac0272d |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 4 and now 4 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 9 this patch: 9 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 9 this patch: 9 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 12 this patch: 12 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 57 lines checked |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: > Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default ISA spec to the newer > 20191213 version which moves some instructions from the I extension to the > Zicsr and Zifencei extensions. So if one of the binutils and GCC exceeds > that version, we should explicitly specifying Zicsr and Zifencei via -march > to cope with the new changes. but this only occurs when binutils >= 2.36 > and GCC >= 11.1.0. It's a different story when binutils < 2.36. > > [...] Here is the summary with links: - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils https://git.kernel.org/riscv/c/ca09f772ccca You are awesome, thank you!
On Thu, Aug 17, 2023 at 03:20:24PM +0000, patchwork-bot+linux-riscv@kernel.org wrote: > Hello: > > This patch was applied to riscv/linux.git (fixes) > by Palmer Dabbelt <palmer@rivosinc.com>: > > On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: > > Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default ISA spec to the newer > > 20191213 version which moves some instructions from the I extension to the > > Zicsr and Zifencei extensions. So if one of the binutils and GCC exceeds > > that version, we should explicitly specifying Zicsr and Zifencei via -march > > to cope with the new changes. but this only occurs when binutils >= 2.36 > > and GCC >= 11.1.0. It's a different story when binutils < 2.36. > > > > [...] > > Here is the summary with links: > - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils > https://git.kernel.org/riscv/c/ca09f772ccca *sigh* so this breaks the build for gcc-11 & binutils 2.37 w/ Assembler messages: Error: cannot find default versions of the ISA extension `zicsr' Error: cannot find default versions of the ISA extension `zifencei' I'll have a poke later.
On Wed, Aug 23, 2023 at 12:51:13PM +0100, Conor Dooley wrote: > On Thu, Aug 17, 2023 at 03:20:24PM +0000, patchwork-bot+linux-riscv@kernel.org wrote: > > Hello: > > > > This patch was applied to riscv/linux.git (fixes) > > by Palmer Dabbelt <palmer@rivosinc.com>: > > > > On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: > > > Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default ISA spec to the newer > > > 20191213 version which moves some instructions from the I extension to the > > > Zicsr and Zifencei extensions. So if one of the binutils and GCC exceeds > > > that version, we should explicitly specifying Zicsr and Zifencei via -march > > > to cope with the new changes. but this only occurs when binutils >= 2.36 > > > and GCC >= 11.1.0. It's a different story when binutils < 2.36. > > > > > > [...] > > > > Here is the summary with links: > > - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils > > https://git.kernel.org/riscv/c/ca09f772ccca > > *sigh* so this breaks the build for gcc-11 & binutils 2.37 w/ > Assembler messages: > Error: cannot find default versions of the ISA extension `zicsr' > Error: cannot find default versions of the ISA extension `zifencei' > > I'll have a poke later. So uh, are we sure that this should not be: - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION < 110100) + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION <= 110100) My gcc-11.1 + binutils 2.37 toolchain built from riscv-gnu-toolchain doesn't have the default versions & the above diff fixes the build. Thanks, Conor.
On 8/23/23 21:31, Conor Dooley wrote: > On Wed, Aug 23, 2023 at 12:51:13PM +0100, Conor Dooley wrote: >> On Thu, Aug 17, 2023 at 03:20:24PM +0000, patchwork-bot+linux-riscv@kernel.org wrote: >>> Hello: >>> >>> This patch was applied to riscv/linux.git (fixes) >>> by Palmer Dabbelt <palmer@rivosinc.com>: >>> >>> On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: >>>> Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default ISA spec to the newer >>>> 20191213 version which moves some instructions from the I extension to the >>>> Zicsr and Zifencei extensions. So if one of the binutils and GCC exceeds >>>> that version, we should explicitly specifying Zicsr and Zifencei via -march >>>> to cope with the new changes. but this only occurs when binutils >= 2.36 >>>> and GCC >= 11.1.0. It's a different story when binutils < 2.36. >>>> >>>> [...] >>> Here is the summary with links: >>> - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils >>> https://git.kernel.org/riscv/c/ca09f772ccca >> *sigh* so this breaks the build for gcc-11 & binutils 2.37 w/ >> Assembler messages: >> Error: cannot find default versions of the ISA extension `zicsr' >> Error: cannot find default versions of the ISA extension `zifencei' >> >> I'll have a poke later. > So uh, are we sure that this should not be: > - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION < 110100) > + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION <= 110100) > > My gcc-11.1 + binutils 2.37 toolchain built from riscv-gnu-toolchain > doesn't have the default versions & the above diff fixes the build. I reproduced the error, the combination of gcc-11.1 and binutils 2.37 does cause errors. What a surprise, since binutils 2.36 and 2.38 are fine. I used git bisect to locate this commit[1] for binutils. I'll test this diff in more detail later. Thanks! [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f0bae2552db1dd4f1995608fbf6648fcee4e9e0c Best Regards, Mingzheng. > > Thanks, > Conor.
On 8/24/23 19:32, Mingzheng Xing wrote: > On 8/23/23 21:31, Conor Dooley wrote: >> On Wed, Aug 23, 2023 at 12:51:13PM +0100, Conor Dooley wrote: >>> On Thu, Aug 17, 2023 at 03:20:24PM +0000, >>> patchwork-bot+linux-riscv@kernel.org wrote: >>>> Hello: >>>> >>>> This patch was applied to riscv/linux.git (fixes) >>>> by Palmer Dabbelt <palmer@rivosinc.com>: >>>> >>>> On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: >>>>> Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default ISA spec to >>>>> the newer >>>>> 20191213 version which moves some instructions from the I >>>>> extension to the >>>>> Zicsr and Zifencei extensions. So if one of the binutils and GCC >>>>> exceeds >>>>> that version, we should explicitly specifying Zicsr and Zifencei >>>>> via -march >>>>> to cope with the new changes. but this only occurs when binutils >>>>> >= 2.36 >>>>> and GCC >= 11.1.0. It's a different story when binutils < 2.36. >>>>> >>>>> [...] >>>> Here is the summary with links: >>>> - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils >>>> https://git.kernel.org/riscv/c/ca09f772ccca >>> *sigh* so this breaks the build for gcc-11 & binutils 2.37 w/ >>> Assembler messages: >>> Error: cannot find default versions of the ISA extension `zicsr' >>> Error: cannot find default versions of the ISA extension `zifencei' >>> >>> I'll have a poke later. >> So uh, are we sure that this should not be: >> - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || >> (CC_IS_GCC && GCC_VERSION < 110100) >> + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || >> (CC_IS_GCC && GCC_VERSION <= 110100) >> >> My gcc-11.1 + binutils 2.37 toolchain built from riscv-gnu-toolchain >> doesn't have the default versions & the above diff fixes the build. > > I reproduced the error, the combination of gcc-11.1 and > binutils 2.37 does cause errors. What a surprise, since binutils > 2.36 and 2.38 are fine. > > I used git bisect to locate this commit[1] for binutils. > I'll test this diff in more detail later. Thanks! > > [1] > https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f0bae2552db1dd4f1995608fbf6648fcee4e9e0c > Hi, Conor. The above error does originate from link[1] mentioned above, which was resolved in gcc-12.1.0[2], and gcc-11.3.0 made the backport[3]. So gcc-11.2.0 combined with binutils 2.37 produces the same error. I think we should do the following diff to fix it: - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION < 110100) + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION < 110300) Then below are my test results after the fix: gcc binutils 10.5.0 2.35 ok 10.5.0 2.36 ok 10.5.0 2.37 ok 10.5.0 2.38 ok 11.1.0 2.35 ok 11.1.0 2.36 ok 11.1.0 2.37 ok 11.1.0 2.38 ok 11.2.0 2.35 ok 11.2.0 2.36 ok 11.2.0 2.37 ok 11.2.0 2.38 ok 11.3.0 2.35 ok 11.3.0 2.36 ok 11.3.0 2.37 ok 11.3.0 2.38 ok 11.4.0 2.35 ok 11.4.0 2.36 ok 11.4.0 2.37 ok 11.4.0 2.38 ok 12.1.0 2.35 ok 12.1.0 2.36 ok 12.1.0 2.37 ok 12.1.0 2.38 ok 12.2.0 2.35 ok 12.2.0 2.36 ok 12.2.0 2.37 ok 12.2.0 2.38 ok [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f0bae2552db1dd4f1995608fbf6648fcee4e9e0c [2] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca2bbb88f999f4d3cc40e89bc1aba712505dd598 [3] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d29f5d6ab513c52fd872f532c492e35ae9fd6671 Thanks, Mingzheng. >> >> Thanks, >> Conor. > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Fri, Aug 25, 2023 at 01:30:36AM +0800, Mingzheng Xing wrote: > On 8/24/23 19:32, Mingzheng Xing wrote: > > On 8/23/23 21:31, Conor Dooley wrote: > > > On Wed, Aug 23, 2023 at 12:51:13PM +0100, Conor Dooley wrote: > > > > On Thu, Aug 17, 2023 at 03:20:24PM +0000, > > > > patchwork-bot+linux-riscv@kernel.org wrote: > > > > > Hello: > > > > > > > > > > This patch was applied to riscv/linux.git (fixes) > > > > > by Palmer Dabbelt <palmer@rivosinc.com>: > > > > > > > > > > On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: > > > > > > Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default > > > > > > ISA spec to the newer > > > > > > 20191213 version which moves some instructions from the > > > > > > I extension to the > > > > > > Zicsr and Zifencei extensions. So if one of the binutils > > > > > > and GCC exceeds > > > > > > that version, we should explicitly specifying Zicsr and > > > > > > Zifencei via -march > > > > > > to cope with the new changes. but this only occurs when > > > > > > binutils >= 2.36 > > > > > > and GCC >= 11.1.0. It's a different story when binutils < 2.36. > > > > > > > > > > > > [...] > > > > > Here is the summary with links: > > > > > - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils > > > > > https://git.kernel.org/riscv/c/ca09f772ccca > > > > *sigh* so this breaks the build for gcc-11 & binutils 2.37 w/ > > > > Assembler messages: > > > > Error: cannot find default versions of the ISA extension `zicsr' > > > > Error: cannot find default versions of the ISA extension `zifencei' > > > > > > > > I'll have a poke later. > > > So uh, are we sure that this should not be: > > > - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || > > > (CC_IS_GCC && GCC_VERSION < 110100) > > > + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || > > > (CC_IS_GCC && GCC_VERSION <= 110100) > > > > > > My gcc-11.1 + binutils 2.37 toolchain built from riscv-gnu-toolchain > > > doesn't have the default versions & the above diff fixes the build. > > > > I reproduced the error, the combination of gcc-11.1 and > > binutils 2.37 does cause errors. What a surprise, since binutils > > 2.36 and 2.38 are fine. > > > > I used git bisect to locate this commit[1] for binutils. > > I'll test this diff in more detail later. Thanks! > > > > [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f0bae2552db1dd4f1995608fbf6648fcee4e9e0c > > > > Hi, Conor. > The above error does originate from link[1] mentioned above, which was > resolved in gcc-12.1.0[2], and gcc-11.3.0 made the backport[3]. > So gcc-11.2.0 combined with binutils 2.37 produces the same error. > I think we should do the following diff to fix it: > - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && > GCC_VERSION < 110100) > + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && > GCC_VERSION < 110300) That sounds good to me. Can you make that a real patch please? Thanks for working on it :)
On 8/25/23 01:33, Conor Dooley wrote: > On Fri, Aug 25, 2023 at 01:30:36AM +0800, Mingzheng Xing wrote: >> On 8/24/23 19:32, Mingzheng Xing wrote: >>> On 8/23/23 21:31, Conor Dooley wrote: >>>> On Wed, Aug 23, 2023 at 12:51:13PM +0100, Conor Dooley wrote: >>>>> On Thu, Aug 17, 2023 at 03:20:24PM +0000, >>>>> patchwork-bot+linux-riscv@kernel.org wrote: >>>>>> Hello: >>>>>> >>>>>> This patch was applied to riscv/linux.git (fixes) >>>>>> by Palmer Dabbelt <palmer@rivosinc.com>: >>>>>> >>>>>> On Thu, 10 Aug 2023 00:56:48 +0800 you wrote: >>>>>>> Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default >>>>>>> ISA spec to the newer >>>>>>> 20191213 version which moves some instructions from the >>>>>>> I extension to the >>>>>>> Zicsr and Zifencei extensions. So if one of the binutils >>>>>>> and GCC exceeds >>>>>>> that version, we should explicitly specifying Zicsr and >>>>>>> Zifencei via -march >>>>>>> to cope with the new changes. but this only occurs when >>>>>>> binutils >= 2.36 >>>>>>> and GCC >= 11.1.0. It's a different story when binutils < 2.36. >>>>>>> >>>>>>> [...] >>>>>> Here is the summary with links: >>>>>> - [v5] riscv: Handle zicsr/zifencei issue between gcc and binutils >>>>>> https://git.kernel.org/riscv/c/ca09f772ccca >>>>> *sigh* so this breaks the build for gcc-11 & binutils 2.37 w/ >>>>> Assembler messages: >>>>> Error: cannot find default versions of the ISA extension `zicsr' >>>>> Error: cannot find default versions of the ISA extension `zifencei' >>>>> >>>>> I'll have a poke later. >>>> So uh, are we sure that this should not be: >>>> - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || >>>> (CC_IS_GCC && GCC_VERSION < 110100) >>>> + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || >>>> (CC_IS_GCC && GCC_VERSION <= 110100) >>>> >>>> My gcc-11.1 + binutils 2.37 toolchain built from riscv-gnu-toolchain >>>> doesn't have the default versions & the above diff fixes the build. >>> I reproduced the error, the combination of gcc-11.1 and >>> binutils 2.37 does cause errors. What a surprise, since binutils >>> 2.36 and 2.38 are fine. >>> >>> I used git bisect to locate this commit[1] for binutils. >>> I'll test this diff in more detail later. Thanks! >>> >>> [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f0bae2552db1dd4f1995608fbf6648fcee4e9e0c >>> >> Hi, Conor. >> The above error does originate from link[1] mentioned above, which was >> resolved in gcc-12.1.0[2], and gcc-11.3.0 made the backport[3]. >> So gcc-11.2.0 combined with binutils 2.37 produces the same error. >> I think we should do the following diff to fix it: >> - depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && >> GCC_VERSION < 110100) >> + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && >> GCC_VERSION < 110300) > That sounds good to me. Can you make that a real patch please? Okey. Just a question, I see that the previous patch has been merged into 6.5-rc7, and now a new fix patch should be sent out based on that, right? Best Regards, Mingzheng. > > Thanks for working on it :)
On Fri, Aug 25, 2023 at 01:46:59AM +0800, Mingzheng Xing wrote: > Just a question, I see that the previous patch has been merged > into 6.5-rc7, and now a new fix patch should be sent out based > on that, right? yes
On Thu, 24 Aug 2023 11:05:13 PDT (-0700), Conor Dooley wrote: > On Fri, Aug 25, 2023 at 01:46:59AM +0800, Mingzheng Xing wrote: > >> Just a question, I see that the previous patch has been merged >> into 6.5-rc7, and now a new fix patch should be sent out based >> on that, right? > > yes Ideally ASAP, it's very late in the cycle. I have something for tomorrow morning, but this will need time to test...
On 8/25/23 02:29, Palmer Dabbelt wrote: > On Thu, 24 Aug 2023 11:05:13 PDT (-0700), Conor Dooley wrote: >> On Fri, Aug 25, 2023 at 01:46:59AM +0800, Mingzheng Xing wrote: >> >>> Just a question, I see that the previous patch has been merged >>> into 6.5-rc7, and now a new fix patch should be sent out based >>> on that, right? >> >> yes > > Ideally ASAP, it's very late in the cycle. I have something for > tomorrow morning, but this will need time to test... I sent a new patch here: https://lore.kernel.org/all/20230824190852.45470-1-xingmingzheng@iscas.ac.cn Best Regards, Mingzheng.
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index f52dd125ac5e..ce3a6667cfdb 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -570,24 +570,30 @@ config TOOLCHAIN_HAS_ZIHINTPAUSE config TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI def_bool y # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=aed44286efa8ae8717a77d94b51ac3614e2ca6dc - depends on AS_IS_GNU && AS_VERSION >= 23800 - help - Newer binutils versions default to ISA spec version 20191213 which - moves some instructions from the I extension to the Zicsr and Zifencei - extensions. + # https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=98416dbb0a62579d4a7a4a76bab51b5b52fec2cd + depends on AS_IS_GNU && AS_VERSION >= 23600 + help + Binutils-2.38 and GCC-12.1.0 bumped the default ISA spec to the newer + 20191213 version, which moves some instructions from the I extension to + the Zicsr and Zifencei extensions. This requires explicitly specifying + Zicsr and Zifencei when binutils >= 2.38 or GCC >= 12.1.0. Zicsr + and Zifencei are supported in binutils from version 2.36 onwards. + To make life easier, and avoid forcing toolchains that default to a + newer ISA spec to version 2.2, relax the check to binutils >= 2.36. + For clang < 17 or GCC < 11.1.0, for which this is not possible, this is + dealt with in CONFIG_TOOLCHAIN_NEEDS_OLD_ISA_SPEC. config TOOLCHAIN_NEEDS_OLD_ISA_SPEC def_bool y depends on TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI # https://github.com/llvm/llvm-project/commit/22e199e6afb1263c943c0c0d4498694e15bf8a16 - depends on CC_IS_CLANG && CLANG_VERSION < 170000 - help - Certain versions of clang do not support zicsr and zifencei via -march - but newer versions of binutils require it for the reasons noted in the - help text of CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI. This - option causes an older ISA spec compatible with these older versions - of clang to be passed to GAS, which has the same result as passing zicsr - and zifencei to -march. + # https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b03be74bad08c382da47e048007a78fa3fb4ef49 + depends on (CC_IS_CLANG && CLANG_VERSION < 170000) || (CC_IS_GCC && GCC_VERSION < 110100) + help + Certain versions of clang and GCC do not support zicsr and zifencei via + -march. This option causes an older ISA spec compatible with these older + versions of clang and GCC to be passed to GAS, which has the same result + as passing zicsr and zifencei to -march. config FPU bool "FPU support" diff --git a/arch/riscv/kernel/compat_vdso/Makefile b/arch/riscv/kernel/compat_vdso/Makefile index 189345773e7e..b86e5e2c3aea 100644 --- a/arch/riscv/kernel/compat_vdso/Makefile +++ b/arch/riscv/kernel/compat_vdso/Makefile @@ -11,7 +11,13 @@ compat_vdso-syms += flush_icache COMPAT_CC := $(CC) COMPAT_LD := $(LD) -COMPAT_CC_FLAGS := -march=rv32g -mabi=ilp32 +# binutils 2.35 does not support the zifencei extension, but in the ISA +# spec 20191213, G stands for IMAFD_ZICSR_ZIFENCEI. +ifdef CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI + COMPAT_CC_FLAGS := -march=rv32g -mabi=ilp32 +else + COMPAT_CC_FLAGS := -march=rv32imafd -mabi=ilp32 +endif COMPAT_LD_FLAGS := -melf32lriscv # Disable attributes, as they're useless and break the build.
Binutils-2.38 and GCC-12.1.0 bumped[0][1] the default ISA spec to the newer 20191213 version which moves some instructions from the I extension to the Zicsr and Zifencei extensions. So if one of the binutils and GCC exceeds that version, we should explicitly specifying Zicsr and Zifencei via -march to cope with the new changes. but this only occurs when binutils >= 2.36 and GCC >= 11.1.0. It's a different story when binutils < 2.36. binutils-2.36 supports the Zifencei extension[2] and splits Zifencei and Zicsr from I[3]. GCC-11.1.0 is particular[4] because it add support Zicsr and Zifencei extension for -march. binutils-2.35 does not support the Zifencei extension, and does not need to specify Zicsr and Zifencei when working with GCC >= 12.1.0. To make our lives easier, let's relax the check to binutils >= 2.36 in CONFIG_TOOLCHAIN_NEEDS_EXPLICIT_ZICSR_ZIFENCEI. For the other two cases, where clang < 17 or GCC < 11.1.0, we will deal with them in CONFIG_TOOLCHAIN_NEEDS_OLD_ISA_SPEC. For more information, please refer to: commit 6df2a016c0c8 ("riscv: fix build with binutils 2.38") commit e89c2e815e76 ("riscv: Handle zicsr/zifencei issues between clang and binutils") Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=aed44286efa8ae8717a77d94b51ac3614e2ca6dc [0] Link: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=98416dbb0a62579d4a7a4a76bab51b5b52fec2cd [1] Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=5a1b31e1e1cee6e9f1c92abff59cdcfff0dddf30 [2] Link: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=729a53530e86972d1143553a415db34e6e01d5d2 [3] Link: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=b03be74bad08c382da47e048007a78fa3fb4ef49 [4] Link: https://lore.kernel.org/all/20230308220842.1231003-1-conor@kernel.org Link: https://lore.kernel.org/all/20230223220546.52879-1-conor@kernel.org Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Acked-by: Guo Ren <guoren@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Mingzheng Xing <xingmingzheng@iscas.ac.cn> --- Changelog and test results: v4 -> v5: - Add Reviewed-by and Acked-by to commit message, no other code changes. v3 -> v4: - Update the Kconfig help text and commit message. Link: https://lore.kernel.org/all/20230731150511.38140-1-xingmingzheng@iscas.ac.cn v2 -> v3: - Relax the check to binutils >= 2.36. - Update the Kconfig help text and commit message. Link: https://lore.kernel.org/all/20230731095936.23397-1-xingmingzheng@iscas.ac.cn v1 -> v2: - Update the Kconfig help text and commit message. - Add considerations for low version gcc case. Link: https://lore.kernel.org/all/20230726174524.340952-1-xingmingzheng@iscas.ac.cn v1: Link: https://lore.kernel.org/all/20230725170405.251011-1-xingmingzheng@iscas.ac.cn Here are my test results: * Compiling the kernel for the master branch with a combination of multiple versions of gcc and binutils. gcc binutils patched no patch 11.4.0 2.35 ok ok 11.4.0 2.36 ok ok 11.4.0 2.38 ok ok 12.2.0 2.35 ok error[1] 12.2.0 2.36 ok error[2] 12.2.0 2.38 ok ok 10.5.0 2.35 ok ok 10.5.0 2.36 ok ok 10.5.0 2.38 ok error[3] 11.1.0 2.35 ok ok 11.1.0 2.36 ok ok 11.1.0 2.38 ok ok 11.2.0 2.35 ok ok 11.2.0 2.36 ok ok 11.2.0 2.38 ok ok [1] Assembler messages: Fatal error: -march=rv32imafd_zicsr_zifencei: Invalid or unknown z ISA extension: 'zifencei' make[2]: *** [arch/riscv/kernel/compat_vdso/Makefile:47: arch/riscv/kernel/compat_vdso/rt_sigreturn.o] Error 1 [2] ./arch/riscv/include/asm/vdso/gettimeofday.h: Assembler messages: ./arch/riscv/include/asm/vdso/gettimeofday.h:79: Error: unrecognized opcode `csrr a5,0xc01' ./arch/riscv/include/asm/vdso/gettimeofday.h:79: Error: unrecognized opcode `csrr a5,0xc01' ./arch/riscv/include/asm/vdso/gettimeofday.h:79: Error: unrecognized opcode `csrr a5,0xc01' ./arch/riscv/include/asm/vdso/gettimeofday.h:79: Error: unrecognized opcode `csrr a5,0xc01' make[2]: *** [scripts/Makefile.build:243: arch/riscv/kernel/vdso/vgettimeofday.o] Error 1 [3] cc1: error: '-march=rv64imac_zicsr_zifencei': unsupported ISA subset 'z' cc1: error: ABI requires '-march=rv64' make[2]: *** [scripts/Makefile.build:243: scripts/mod/empty.o] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: error: '-march=rv64imac_zicsr_zifencei': unsupported ISA subset 'z' cc1: error: ABI requires '-march=rv64' arch/riscv/Kconfig | 32 +++++++++++++++----------- arch/riscv/kernel/compat_vdso/Makefile | 8 ++++++- 2 files changed, 26 insertions(+), 14 deletions(-)