Skip to contentSkip to conversation

riscv: add correct as-options for assembly in modules

PATCH In review Ben Dooks 1 participant 2 messages May 29, 2022 RISC-V

lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

PATCH 1/1 riscv: add correct as-options for assembly in modules

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

--
Changes since v1:
- added Bin Meng's review of the original patch

---
 arch/riscv/Makefile | 1 +
 1 file changed, 1 insertion(+)
arch/riscv/Makefile +1 -0
index 0289a97325d1..cf2ea9a1ac20 100644
@@ -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
Signature · 7 lines
2.35.1


_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
author
#1 lore raw
Quoted 10 lines · Ben Dooks

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.

Quoted 5 lines

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

Apologies, this was the wrong branch. Will resen

Signature · 9 lines
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

https://www.codethink.co.uk/privacy.html

_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv