firmware: Rename __rel_dyn_start/end to __rela_dyn_start/end
PATCH 1/1 firmware: Rename __rel_dyn_start/end to __rela_dyn_start/end
We are using and expecting the RELA format, not the REL format, and this is the conventional linker-generated name for the start/end symbols, so use it rather than confusing things by making it look like we're accessing .rel.dyn, which would be in the REL format with no explicit addend.
--- firmware/fw_base.S | 4 ++-- firmware/fw_base.ldS | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
firmware/fw_base.S +2 -2
@@ -76,8 +76,8 @@ _sc_fail: li t0, FW_TEXT_START /* link start */ lla t1, _fw_start /* load start */ sub t2, t1, t0 /* load offset */ - lla t0, __rel_dyn_start - lla t1, __rel_dyn_end + lla t0, __rela_dyn_start + lla t1, __rela_dyn_end beq t0, t1, _relocate_done 2: REG_L t5, __SIZEOF_LONG__(t0) /* t5 <-- relocation info:type */
firmware/fw_base.ldS +2 -2
@@ -47,9 +47,9 @@ . = ALIGN(0x1000); /* Ensure next section is page aligned */ .rela.dyn : { - PROVIDE(__rel_dyn_start = .); + PROVIDE(__rela_dyn_start = .); *(.rela*) - PROVIDE(__rel_dyn_end = .); + PROVIDE(__rela_dyn_end = .); } PROVIDE(_rodata_end = .);
Signature · 7 lines
2.34.1 -- opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi
Quoted 11 lines · Jessica Clarke
We are using and expecting the RELA format, not the REL format, and this is the conventional linker-generated name for the start/end symbols, so use it rather than confusing things by making it look like we're accessing .rel.dyn, which would be in the REL format with no explicit addend.
Signed-off-by Jessica Clarke <[email protected]>--- firmware/fw_base.S | 4 ++-- firmware/fw_base.ldS | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 3 lines
opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi
Anup Patel
AppliedQuoted 8 lines · Jessica Clarke
We are using and expecting the RELA format, not the REL format, and this is the conventional linker-generated name for the start/end symbols, so use it rather than confusing things by making it look like we're accessing .rel.dyn, which would be in the REL format with no explicit addend.
Signed-off-by Jessica Clarke <[email protected]>
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
Quoted 44 lines
--- firmware/fw_base.S | 4 ++-- firmware/fw_base.ldS | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)firmware/fw_base.S +2
-2@@ -76,8 +76,8 @@ _sc_fail: li t0, FW_TEXT_START /* link start */ lla t1, _fw_start /* load start */ sub t2, t1, t0 /* load offset */ - lla t0, __rel_dyn_start - lla t1, __rel_dyn_end + lla t0, __rela_dyn_start + lla t1, __rela_dyn_end beq t0, t1, _relocate_done 2: REG_L t5, __SIZEOF_LONG__(t0) /* t5 <-- relocation info:type */firmware/fw_base.ldS +2
-3@@ -47,9 +47,9 @@ . = ALIGN(0x1000); /* Ensure next section is page aligned */ .rela.dyn : { - PROVIDE(__rel_dyn_start = .); + PROVIDE(__rela_dyn_start = .); *(.rela*) - PROVIDE(__rel_dyn_end = .); + PROVIDE(__rela_dyn_end = .); } PROVIDE(_rodata_end = .); --2.34.1
--
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Signature · 3 lines
opensbi mailing list [email protected] http://lists.infradead.org/mailman/listinfo/opensbi