diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-01 01:32:04 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-01 01:32:04 +0000 |
| commit | 06e2e0a747504a9cce34fa851e7afac2dc8efe42 (patch) | |
| tree | 39e709620557418f0dca0a0626da98a6edac14d8 /sysdeps/powerpc | |
| parent | b6da933bfb2afb240b4a360974533ab3fdf2b0f3 (diff) | |
| download | glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.tar glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.tar.gz glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.tar.bz2 glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.zip | |
Update.
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.
* sysdeps/i386/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add
CFI directives.
* csu/Makefile: Fix Makefile warnings regarding Scrt1.o.
Diffstat (limited to 'sysdeps/powerpc')
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 1922d2a01a..d13649c22f 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -506,6 +506,21 @@ elf_machine_fixup_plt (struct link_map *map, lookup_t sym_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) |