TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

tools/mpy_ld.py: Support R_ARM_ABS32 relocation in text.

Browse Source 
Add support for R_ARM_ABS32 relocations in native .mpy files.  These can be
rewritten in the same way that data relocations are.

Fixes issue #14430.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2025-05-28 14:27:35 +10:00
parent 5f4abeb385
commit 718ff4fdd5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/mpy_ld.py
View File

@@ -711,8 +711,9 @@ def do_relocation_text(env, text_addr, r):
(addr, value) = process_riscv32_relocation(env, text_addr, r) (addr, value) = process_riscv32_relocation(env, text_addr, r)
elif env.arch.name == "EM_ARM" and r_info_type == R_ARM_ABS32: elif env.arch.name == "EM_ARM" and r_info_type == R_ARM_ABS32:
# happens for soft-float on armv6m # Absolute relocation, handled as a data relocation.
raise ValueError("Absolute relocations not supported on ARM") do_relocation_data(env, text_addr, r)
return
else: else:
# Unknown/unsupported relocation # Unknown/unsupported relocation
@@ -781,9 +782,9 @@ def do_relocation_data(env, text_addr, r):
): ):
# Relocation in data.rel.ro to internal/external symbol # Relocation in data.rel.ro to internal/external symbol
if env.arch.word_size == 4: if env.arch.word_size == 4:
struct_type = "<I" struct_type = "<i"
elif env.arch.word_size == 8: elif env.arch.word_size == 8:
struct_type = "<Q" struct_type = "<q"
if hasattr(s, "resolved"): if hasattr(s, "resolved"):
s = s.resolved s = s.resolved
sec = s.section sec = s.section