From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>, Roland McGrath <roland@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>,
Steve Munroe <sjmunroe@us.ibm.com>
Subject: [PATCH] Fix dl-conflict.c on ppc64
Date: Sat, 31 May 2003 21:34:00 -0000 [thread overview]
Message-ID: <20030531213356.GM24872@sunsite.ms.mff.cuni.cz> (raw)
Hi!
As sym_map is always NULL in dl-conflict.c, elf_machine_fixup_plt would do
nothing during conflict processing. I created a new function for this,
as R_PPC64_JMP_SLOT conflicts can be handled way easier than normal
R_PPC64_JMP_SLOT relocs (e.g. .opd is guaranteed to be already relocated,
there is no need to bother with thread safety, etc.).
2003-05-31 Jakub Jelinek <jakub@redhat.com>
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_plt_conflict):
New function.
(elf_machine_rela) <case R_PPC64_JMP_SLOT>: Avoid
RESOLVE_CONFLICT_FIND_MAP. If RESOLVE_CONFLICT_FIND_MAP is defined,
call elf_machine_plt_conflict instead of elf_machine_fixup_plt.
--- libc/sysdeps/powerpc/powerpc64/dl-machine.h.jj 2003-05-26 09:44:32.000000000 -0400
+++ libc/sysdeps/powerpc/powerpc64/dl-machine.h 2003-05-31 17:25:57.000000000 -0400
@@ -506,6 +506,21 @@ elf_machine_fixup_plt (struct link_map *
return finaladdr;
}
+static inline void
+elf_machine_plt_conflict (Elf64_Addr *reloc_addr, Elf64_Addr finaladdr)
+{
+ Elf64_FuncDesc *plt = (Elf64_FuncDesc *) reloc_addr;
+ Elf64_FuncDesc *rel = (Elf64_FuncDesc *) finaladdr;
+
+ plt->fd_func = rel->fd_func;
+ plt->fd_aux = rel->fd_aux;
+ plt->fd_toc = rel->fd_toc;
+ PPC_DCBST (&plt->fd_func);
+ PPC_DCBST (&plt->fd_aux);
+ PPC_DCBST (&plt->fd_toc);
+ PPC_SYNC;
+}
+
/* Return the final value of a plt relocation. */
static inline Elf64_Addr
elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
@@ -603,9 +618,10 @@ elf_machine_rela (struct link_map *map,
case R_PPC64_JMP_SLOT:
#ifdef RESOLVE_CONFLICT_FIND_MAP
- RESOLVE_CONFLICT_FIND_MAP (map, reloc_addr);
-#endif
+ elf_machine_plt_conflict (reloc_addr, value);
+#else
elf_machine_fixup_plt (map, sym_map, reloc, reloc_addr, value);
+#endif
return;
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
Jakub
next reply other threads:[~2003-05-31 21:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-05-31 21:34 Jakub Jelinek [this message]
2003-06-01 1:31 ` Ulrich Drepper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030531213356.GM24872@sunsite.ms.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
--cc=roland@redhat.com \
--cc=sjmunroe@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).