Skip to content

patchelf.cc: handle DT_MIPS_XHASH and .MIPS.xhash #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mic92 merged 3 commits into from Jun 29, 2022
Merged

patchelf.cc: handle DT_MIPS_XHASH and .MIPS.xhash #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8db45c6
elf.h: resynchronize with glibc elf.h
Jun 19, 2022
820da7b
patchelf.cc: handle DT_MIPS_XHASH and .MIPS.xhash
Jun 19, 2022
7b155fd
formatting: fix incorrect indentation in previous commit
Jun 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/elf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,7 @@ typedef struct
#define SHT_MIPS_EH_REGION 0x70000027
#define SHT_MIPS_XLATE_OLD 0x70000028
#define SHT_MIPS_PDR_EXCEPTION 0x70000029
#define SHT_MIPS_XHASH 0x7000002b

/* Legal values for sh_flags field of Elf32_Shdr. */

Expand Down Expand Up @@ -1647,7 +1648,9 @@ typedef struct
in a PIE as it stores a relative offset from the address of the tag
rather than an absolute address. */
#define DT_MIPS_RLD_MAP_REL 0x70000035
#define DT_MIPS_NUM 0x36
/* GNU-style hash table with xlat. */
#define DT_MIPS_XHASH 0x70000036
#define DT_MIPS_NUM 0x37

/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */

Expand Down
4 changes: 4 additions & 0 deletions src/patchelf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,10 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress)
// some binaries might this section stripped
// in which case we just ignore the value.
if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr;
} else if (d_tag == DT_MIPS_XHASH) {
// the .MIPS.xhash section was added to the glibc-ABI
// in commit 23c1c256ae7b0f010d0fcaff60682b620887b164
dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr;
} else if (d_tag == DT_JMPREL) {
auto shdr = tryFindSectionHeader(".rel.plt");
if (!shdr) shdr = tryFindSectionHeader(".rela.plt");
Expand Down