| Message ID | 87ilughe3c.fsf@oldenburg.str.redhat.com |
|---|---|
| State | Committed |
| Commit | f44820821a4ecdbb398375201b7c4ab9a1dd5983 |
| Headers | show |
| Series | mips: Move DT_MIPS into <ldsodefs.h> | expand |
| Context | Check | Description |
|---|---|---|
| dj/TryBot-apply_patch | success | Patch applied to master at the time it was sent |
| dj/TryBot-32bit | success | Build for i686 |
On Tue, 18 Jan 2022, Florian Weimer via Libc-alpha wrote: > ELF_MACHINE_XHASH_SETUP in that file needs it. > > Fixes commit c90363403b57b3b7919061851cb3e6d9c85e784a > ("elf: Move _dl_setup_hash to its own file"). OK.
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 7c12d70350..9105b5b75c 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -61,10 +61,6 @@ ((((type) == ELF_MACHINE_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \ | (((type) == R_MIPS_COPY) * ELF_RTYPE_CLASS_COPY)) -/* Translate a processor specific dynamic tag to the index - in l_info array. */ -#define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM) - #if ((defined __mips_nan2008 && !defined HAVE_MIPS_NAN2008) \ || (!defined __mips_nan2008 && defined HAVE_MIPS_NAN2008)) # error "Configuration inconsistency: __mips_nan2008 != HAVE_MIPS_NAN2008, overridden CFLAGS?" diff --git a/sysdeps/mips/ldsodefs.h b/sysdeps/mips/ldsodefs.h index c52092e9be..ab04f11b8e 100644 --- a/sysdeps/mips/ldsodefs.h +++ b/sysdeps/mips/ldsodefs.h @@ -26,6 +26,10 @@ struct La_mips_32_retval; struct La_mips_64_regs; struct La_mips_64_retval; +/* Translate a processor specific dynamic tag to the index + in l_info array. */ +#define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM) + #define ELF_MACHINE_GNU_HASH_ADDRIDX (DT_MIPS_XHASH - DT_LOPROC + DT_NUM) /* Calculate the index of a symbol in MIPS xhash. */
ELF_MACHINE_XHASH_SETUP in that file needs it. Fixes commit c90363403b57b3b7919061851cb3e6d9c85e784a ("elf: Move _dl_setup_hash to its own file"). --- sysdeps/mips/dl-machine.h | 4 ---- sysdeps/mips/ldsodefs.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-)