public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] mips: Move DT_MIPS into <ldsodefs.h>
@ 2022-01-18 22:29 Florian Weimer
  2022-01-19 18:58 ` Joseph Myers
  0 siblings, 1 reply; 2+ messages in thread
From: Florian Weimer @ 2022-01-18 22:29 UTC (permalink / raw)
  To: libc-alpha

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(-)

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.  */


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] mips: Move DT_MIPS into <ldsodefs.h>
  2022-01-18 22:29 [PATCH] mips: Move DT_MIPS into <ldsodefs.h> Florian Weimer
@ 2022-01-19 18:58 ` Joseph Myers
  0 siblings, 0 replies; 2+ messages in thread
From: Joseph Myers @ 2022-01-19 18:58 UTC (permalink / raw)
  To: Florian Weimer; +Cc: libc-alpha

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.

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-01-19 18:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-18 22:29 [PATCH] mips: Move DT_MIPS into <ldsodefs.h> Florian Weimer
2022-01-19 18:58 ` Joseph Myers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).