| Message ID | 20230214201358.10647-1-palmer@rivosinc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Palmer Dabbelt |
| Headers | show |
| Series | RISC-V: Guard alternative asm macros with !LINKER_SCRIPT | 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 |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 13 and now 13 |
| 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: 2471 this patch: 2471 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 17343 this patch: 17343 |
| conchuod/alphanumeric_selects | success | Out of order selects before the patch: 754 and now 754 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 2 this patch: 2 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| conchuod/source_inline | success | Was 0 now: 0 |
| 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 |
On Tue, 14 Feb 2023 12:13:58 PST (-0800), Palmer Dabbelt wrote: > Without this I get a handful of .macro related directives that trip up > LD. > > Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> > --- > I'm not sure when this started failing, but I recently tried a build on > my local machine (with crossdev-based toolchains) and it failed. It's actually just because I had https://lore.kernel.org/all/20221216062109.865573-3-panqinglin2020@iscas.ac.cn/ applied, I'll squash this in if that's OK with folks over there. > --- > arch/riscv/include/asm/alternative-macros.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h > index cc6a81c00f2f..afc87528cf71 100644 > --- a/arch/riscv/include/asm/alternative-macros.h > +++ b/arch/riscv/include/asm/alternative-macros.h > @@ -6,6 +6,8 @@ > > #ifdef __ASSEMBLY__ > > +#ifndef LINKER_SCRIPT > + > .macro ALT_ENTRY oldptr newptr vendor_id errata_id new_len > .4byte \oldptr - . > .4byte \newptr - . > @@ -53,6 +55,8 @@ > #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ > #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ > > +#endif /* LINKER_SCRIPT */ > + > #else /* !__ASSEMBLY__ */ > > #include <asm/asm.h>
On Tue, Feb 14, 2023 at 04:02:48PM -0800, Palmer Dabbelt wrote: > On Tue, 14 Feb 2023 12:13:58 PST (-0800), Palmer Dabbelt wrote: > > Without this I get a handful of .macro related directives that trip up > > LD. > > > > Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> > > --- > > I'm not sure when this started failing, but I recently tried a build on > > my local machine (with crossdev-based toolchains) and it failed. > > It's actually just because I had https://lore.kernel.org/all/20221216062109.865573-3-panqinglin2020@iscas.ac.cn/ > applied, I'll squash this in if that's OK with folks over there. Since I had left on ack on that series, it's fine by me...
diff --git a/arch/riscv/include/asm/alternative-macros.h b/arch/riscv/include/asm/alternative-macros.h index cc6a81c00f2f..afc87528cf71 100644 --- a/arch/riscv/include/asm/alternative-macros.h +++ b/arch/riscv/include/asm/alternative-macros.h @@ -6,6 +6,8 @@ #ifdef __ASSEMBLY__ +#ifndef LINKER_SCRIPT + .macro ALT_ENTRY oldptr newptr vendor_id errata_id new_len .4byte \oldptr - . .4byte \newptr - . @@ -53,6 +55,8 @@ #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#endif /* LINKER_SCRIPT */ + #else /* !__ASSEMBLY__ */ #include <asm/asm.h>
Without this I get a handful of .macro related directives that trip up LD. Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com> --- I'm not sure when this started failing, but I recently tried a build on my local machine (with crossdev-based toolchains) and it failed. --- arch/riscv/include/asm/alternative-macros.h | 4 ++++ 1 file changed, 4 insertions(+)