[PATCH] RISC-V: Guard alternative asm macros with !LINKER_SCRIPT

[PATCH] RISC-V: Guard alternative asm macros with !LINKER_SCRIPT

[Palmer Dabbelt]

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(+)

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>
-- 
2.39.0


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

Re: [PATCH] RISC-V: Guard alternative asm macros with !LINKER_SCRIPT

[Palmer Dabbelt]

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>

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

Re: [PATCH] RISC-V: Guard alternative asm macros with !LINKER_SCRIPT

[Conor Dooley]

[-- Attachment #1.1: Type: text/plain, Size: 688 bytes --]

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...


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 161 bytes --]

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv