diff mbox series

riscv: add correct as-options for assembly in modules

Message ID 20211208192607.660787-1-ben.dooks@codethink.co.uk (mailing list archive)
State New, archived
Headers show
Series riscv: add correct as-options for assembly in modules | expand

Commit Message

Ben Dooks Dec. 8, 2021, 7:26 p.m. UTC
When trying to load modules built for riscv which include assembly
the kernel loader errors with "unexpected relocation type 'R_RISCV_ALIGN'"
due to R_RISCV_ALIGN relocations being generated by the assembler.

In commit 7a8e7da42250138 ("RISC-V: Fixes to module loading") the
CFLAGS have -mno-relax added. This however does not get applied to
KBUILD_AFLAGS_MODULE so when a module builds a .S file, the -mno-relax
is not passed and the above error is seen. Fix it by adding the flags
'-Wa,-mno-relax' to KBUILD_AFLAGS_MODULE.

This may have been fixed in gcc, in:
 https://github.com/gcc-mirror/gcc/commit/3b0a7d624e64eeb81e4d5e8c62c46d86ef521857

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
--
Changes since v1:
- added Bin Meng's review of the original patch
---
 arch/riscv/Makefile | 1 +
 1 file changed, 1 insertion(+)

Comments

Ben Dooks Jan. 10, 2022, 3:51 p.m. UTC | #1
On 08/12/2021 19:26, Ben Dooks wrote:
> When trying to load modules built for riscv which include assembly
> the kernel loader errors with "unexpected relocation type 'R_RISCV_ALIGN'"
> due to R_RISCV_ALIGN relocations being generated by the assembler.
> 
> In commit 7a8e7da42250138 ("RISC-V: Fixes to module loading") the
> CFLAGS have -mno-relax added. This however does not get applied to
> KBUILD_AFLAGS_MODULE so when a module builds a .S file, the -mno-relax
> is not passed and the above error is seen. Fix it by adding the flags
> '-Wa,-mno-relax' to KBUILD_AFLAGS_MODULE.
> 
> This may have been fixed in gcc, in:
>   https://github.com/gcc-mirror/gcc/commit/3b0a7d624e64eeb81e4d5e8c62c46d86ef521857

Can I just check this can be included in the next release?
Bin Meng Jan. 11, 2022, 7:41 a.m. UTC | #2
On Thu, Dec 9, 2021 at 3:26 AM Ben Dooks <ben.dooks@codethink.co.uk> wrote:
>
> When trying to load modules built for riscv which include assembly
> the kernel loader errors with "unexpected relocation type 'R_RISCV_ALIGN'"
> due to R_RISCV_ALIGN relocations being generated by the assembler.
>
> In commit 7a8e7da42250138 ("RISC-V: Fixes to module loading") the
> CFLAGS have -mno-relax added. This however does not get applied to
> KBUILD_AFLAGS_MODULE so when a module builds a .S file, the -mno-relax
> is not passed and the above error is seen. Fix it by adding the flags
> '-Wa,-mno-relax' to KBUILD_AFLAGS_MODULE.
>
> This may have been fixed in gcc, in:
>  https://github.com/gcc-mirror/gcc/commit/3b0a7d624e64eeb81e4d5e8c62c46d86ef521857
>
> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
> --
> Changes since v1:
> - added Bin Meng's review of the original patch

Looks like you forgot to include the RB tag? :)

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

> ---
>  arch/riscv/Makefile | 1 +
>  1 file changed, 1 insertion(+)
>

Regards,
Bin
diff mbox series

Patch

diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 0289a97325d1..cf2ea9a1ac20 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -58,6 +58,7 @@  ifeq ($(CONFIG_PERF_EVENTS),y)
 endif
 
 KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)
+KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax)
 
 # GCC versions that support the "-mstrict-align" option default to allowing
 # unaligned accesses.  While unaligned accesses are explicitly allowed in the