diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-11-05 11:32:22 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2009-11-05 11:32:22 +0100 |
| commit | ad263dbcc2ed618ec529108f475a941f6689df51 (patch) | |
| tree | 464b514f54763c0f23b186ff762f7bedd838c9c9 | |
| parent | bf88d9cb9f9f82c74334a014bb5fb8592d8e2e1f (diff) | |
| download | glibc-ad263dbcc2ed618ec529108f475a941f6689df51.tar.gz glibc-ad263dbcc2ed618ec529108f475a941f6689df51.tar.xz glibc-ad263dbcc2ed618ec529108f475a941f6689df51.zip | |
Fix R_PPC64_{JMP_IREL,IRELATIVE} handling in dl-conflict.c
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f168e46d27..c29e77dff2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-11-03 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/powerpc/powerpc64/dl-machine.h (resolve_ifunc): Don't + relocate opd entry when resolving prelink conflicts. + 2009-11-03 Andreas Schwab <schwab@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 8a720ae9c2..00888587af 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -531,13 +531,14 @@ auto inline Elf64_Addr __attribute__ ((always_inline)) resolve_ifunc (Elf64_Addr value, const struct link_map *map, const struct link_map *sym_map) { +#ifndef RESOLVE_CONFLICT_FIND_MAP /* The function we are calling may not yet have its opd entry relocated. */ Elf64_FuncDesc opd; if (map != sym_map -#if !defined RTLD_BOOTSTRAP && defined SHARED +# if !defined RTLD_BOOTSTRAP && defined SHARED /* Bootstrap map doesn't have l_relocated set for it. */ && sym_map != &GL(dl_rtld_map) -#endif +# endif && !sym_map->l_relocated) { Elf64_FuncDesc *func = (Elf64_FuncDesc *) value; @@ -546,6 +547,7 @@ resolve_ifunc (Elf64_Addr value, opd.fd_aux = func->fd_aux; value = (Elf64_Addr) &opd; } +#endif return ((Elf64_Addr (*) (void)) value) (); } |