GitHub-Mirror/opensbi
2
0
Fork 0
mirror of https://github.com/Fishwaldo/opensbi.git synced 2025-06-30 10:09:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fw_base.S: Fix assembler error with clang 16+

Browse source 
Attempting to build OpenSBI with clang 16 and the following command:

   $ make LLVM=1 PLATFORM=generic

Results in the following error:

    AS        platform/generic/firmware/fw_dynamic.o
   /tmp/fw_dynamic-d000a6.s:429:9: error: symbol '_fw_start' can not be undefined in a subtraction expression
    .dword _fw_rw_start - _fw_start

Work around this issue by eliminating the __fw_rw_offset variable and
performing the offset calculation at run-time instead. This takes
advantage of the fact that the a4 register contains the value of
_fw_start.

Signed-off-by: Mitchell Horne <mhorne@FreeBSD.org>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Mitchell Horne 2023-08-06 10:45:36 +05:30 • committed by Anup Patel
parent f46a5643bc
commit 94197a8c49
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/fw_base.S
View file

@ -309,8 +309,8 @@ _scratch_init:
REG_S a5, SBI_SCRATCH_FW_SIZE_OFFSET(tp) REG_S a5, SBI_SCRATCH_FW_SIZE_OFFSET(tp)
/* Store R/W section's offset in scratch space */ /* Store R/W section's offset in scratch space */
lla a4, __fw_rw_offset lla a5, _fw_rw_start
REG_L a5, 0(a4) sub a5, a5, a4
REG_S a5, SBI_SCRATCH_FW_RW_OFFSET(tp) REG_S a5, SBI_SCRATCH_FW_RW_OFFSET(tp)
/* Store fw_heap_offset and fw_heap_size in scratch space */ /* Store fw_heap_offset and fw_heap_size in scratch space */
@ -536,8 +536,6 @@ _link_start:
RISCV_PTR FW_TEXT_START RISCV_PTR FW_TEXT_START
_link_end: _link_end:
RISCV_PTR _fw_reloc_end RISCV_PTR _fw_reloc_end
__fw_rw_offset:
RISCV_PTR _fw_rw_start - _fw_start
.section .entry, "ax", %progbits .section .entry, "ax", %progbits
.align 3 .align 3