diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 17 | ||||
| -rw-r--r-- | sysdeps/mips/ldsodefs.h | 15 | ||||
| -rw-r--r-- | sysdeps/mips/linkmap.h | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/ldsodefs.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/libc-abis | 2 |
5 files changed, 36 insertions, 1 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index b1fc5c3..1e193b0 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -47,6 +47,23 @@ __BEGIN_DECLS #define ADDRIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \ + DT_EXTRANUM + DT_VALNUM + DT_ADDRTAGIDX (tag)) +/* Type of GNU hash which the machine uses. */ +#ifndef ELF_MACHINE_GNU_HASH_ADDRIDX +# define ELF_MACHINE_GNU_HASH_ADDRIDX ADDRIDX (DT_GNU_HASH) +#endif + +/* Calculate the index of a symbol in GNU hash. */ +#ifndef ELF_MACHINE_HASH_SYMIDX +# define ELF_MACHINE_HASH_SYMIDX(map, hasharr) \ + ((hasharr) - (map)->l_gnu_chain_zero) +#endif + +/* Setup MIPS xhash. Defined only for MIPS. */ +#ifndef ELF_MACHINE_XHASH_SETUP +# define ELF_MACHINE_XHASH_SETUP(hash32, symbias, map) \ + ((void) (hash32), (void) (symbias), (void) (map)) +#endif + /* We use this macro to refer to ELF types independent of the native wordsize. `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */ #define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) diff --git a/sysdeps/mips/ldsodefs.h b/sysdeps/mips/ldsodefs.h index f0acb02..95cd38e 100644 --- a/sysdeps/mips/ldsodefs.h +++ b/sysdeps/mips/ldsodefs.h @@ -26,6 +26,21 @@ struct La_mips_32_retval; struct La_mips_64_regs; struct La_mips_64_retval; +#define ELF_MACHINE_GNU_HASH_ADDRIDX (DT_MIPS_XHASH - DT_LOPROC + DT_NUM) + +/* Calculate the index of a symbol in MIPS xhash. */ +#define ELF_MACHINE_HASH_SYMIDX(map, hasharr) \ + ((map)->l_mach.mips_xlat_zero[(hasharr) - (map)->l_gnu_chain_zero]) + +/* Setup MIPS xhash. */ +#define ELF_MACHINE_XHASH_SETUP(hash32, symbias, map) \ + do \ + { \ + (hash32) += (map)->l_info[DT_MIPS (SYMTABNO)]->d_un.d_val - (symbias); \ + (map)->l_mach.mips_xlat_zero = (hash32) - (symbias); \ + } \ + while (0) + #define ARCH_PLTENTER_MEMBERS \ Elf32_Addr (*mips_o32_gnu_pltenter) (Elf32_Sym *, unsigned int, \ uintptr_t *, uintptr_t *, \ diff --git a/sysdeps/mips/linkmap.h b/sysdeps/mips/linkmap.h index 1fb9678..1e640c3 100644 --- a/sysdeps/mips/linkmap.h +++ b/sysdeps/mips/linkmap.h @@ -3,4 +3,5 @@ struct link_map_machine ElfW(Addr) plt; /* Address of .plt */ ElfW(Word) fpabi; /* FP ABI of the object */ unsigned int odd_spreg; /* Does the object require odd_spreg support? */ + const Elf32_Word *mips_xlat_zero; /* .MIPS.xhash */ }; diff --git a/sysdeps/unix/sysv/linux/mips/ldsodefs.h b/sysdeps/unix/sysv/linux/mips/ldsodefs.h index 28257f8..ce7b2f9 100644 --- a/sysdeps/unix/sysv/linux/mips/ldsodefs.h +++ b/sysdeps/unix/sysv/linux/mips/ldsodefs.h @@ -34,7 +34,7 @@ extern void _dl_static_init (struct link_map *map); #undef VALID_ELF_ABIVERSION #define VALID_ELF_ABIVERSION(osabi,ver) \ (ver == 0 \ - || (osabi == ELFOSABI_SYSV && ver < 5) \ + || (osabi == ELFOSABI_SYSV && ver < 6) \ || (osabi == ELFOSABI_GNU && ver < LIBC_ABI_MAX)) #endif /* ldsodefs.h */ diff --git a/sysdeps/unix/sysv/linux/mips/libc-abis b/sysdeps/unix/sysv/linux/mips/libc-abis index eaea558..c0b67da 100644 --- a/sysdeps/unix/sysv/linux/mips/libc-abis +++ b/sysdeps/unix/sysv/linux/mips/libc-abis @@ -16,3 +16,5 @@ UNIQUE MIPS_O32_FP64 mips*-*-linux* # Absolute (SHN_ABS) symbols working correctly. ABSOLUTE +# GNU-style hash table with translation table. +MIPS_XHASH |