Fix R_PPC64_{JMP_IREL,IRELATIVE} handling in dl-conflict.c

diff --git a/ChangeLog b/ChangeLog
index f168e46d27a19e2427b4f5ac447bd2d27b57d68a..c29e77dff2c1a1f94c049678f5f97aa6fb9358db 100644 (file)
--- 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 8a720ae9c2d854dc6cb107d0e8923f68654e44df..00888587affd457266b859858d8924f47bfbade8 100644 (file)
--- 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) ();
 }