djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/mpy_ld.py: Support R_XTENSA_PDIFF32 relocation.

Browse Source 
Newer versions of the ESP-IDF's toolchain use this relocation.

Fixes issue #8436.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-06-09 11:57:22 +10:00
parent 85597aa68e
commit abb3850398
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/mpy_ld.py
View File

@ -75,6 +75,7 @@ R_ARM_THM_JUMP24 = 30
R_X86_64_GOTPCREL = 9 R_X86_64_GOTPCREL = 9
R_X86_64_REX_GOTPCRELX = 42 R_X86_64_REX_GOTPCRELX = 42
R_386_GOT32X = 43 R_386_GOT32X = 43
R_XTENSA_PDIFF32 = 59
################################################################################ ################################################################################
# Architecture configuration # Architecture configuration
@ -572,9 +573,9 @@ def do_relocation_text(env, text_addr, r):
reloc = addr - r_offset reloc = addr - r_offset
reloc_type = "xtensa_l32r" reloc_type = "xtensa_l32r"
elif env.arch.name == "EM_XTENSA" and r_info_type == R_XTENSA_DIFF32: elif env.arch.name == "EM_XTENSA" and r_info_type in (R_XTENSA_DIFF32, R_XTENSA_PDIFF32):
if s.section.name.startswith(".text"): if s.section.name.startswith(".text"):
# it looks like R_XTENSA_DIFF32 into .text is already correctly relocated # it looks like R_XTENSA_[P]DIFF32 into .text is already correctly relocated
return return
assert 0 assert 0