(unrelocate): New argument BASE. Use it instead of

reloc_base.
(copy_dysymtab): Compute relocation base here.
(rebase_reloc_address) [__ppc64__]: New function.
(copy_dysymtab) [__ppc64__]: Use it if relocation base needs to be
changed.

diff --git a/src/ChangeLog b/src/ChangeLog
index 13edfa07e901c61184dea1335383b212c18327a5..7c7fb76378a4b07704985b87e5cc56a848c28e7d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * unexmacosx.c (unrelocate): New argument BASE.  Use it instead of
+       reloc_base.
+       (copy_dysymtab): Compute relocation base here.
+       (rebase_reloc_address) [__ppc64__]: New function.
+       (copy_dysymtab) [__ppc64__]: Use it if relocation base needs to be
+       changed.
+
 2007-11-26  Jason Rumney  <jasonr@gnu.org>
 
        * w32proc.c (sys_spawnve): Quote args with wildcards.

diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index eceffc4af4bb74565147df82ba159cf166d8c39a..dadc19d52e326a63df353265c9bf5956536bfeca 100644 (file)
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -900,26 +900,13 @@ copy_symtab (struct load_command *lc, long delta)
 
 /* Fix up relocation entries. */
 static void
-unrelocate (const char *name, off_t reloff, int nrel)
+unrelocate (const char *name, off_t reloff, int nrel, vm_address_t base)
 {
   int i, unreloc_count;
   struct relocation_info reloc_info;
   struct scattered_relocation_info *sc_reloc_info
     = (struct scattered_relocation_info *) &reloc_info;
-  vm_address_t reloc_base, location;
-
-#ifdef _LP64
-#if __ppc64__
-  reloc_base = (data_segment_scp->vmaddr >= 0x100000000
-               ? data_segment_scp->vmaddr : 0);
-#else
-  /* First writable segment address.  */
-  reloc_base = data_segment_scp->vmaddr;
-#endif
-#else
-  /* First segment address in the file (unless MH_SPLIT_SEGS set). */
-  reloc_base = 0;
-#endif
+  vm_address_t location;
 
   for (unreloc_count = 0, i = 0; i < nrel; i++)
     {
@@ -933,7 +920,7 @@ unrelocate (const char *name, off_t reloff, int nrel)
        switch (reloc_info.r_type)
          {
          case GENERIC_RELOC_VANILLA:
-           location = reloc_base + reloc_info.r_address;
+           location = base + reloc_info.r_address;
            if (location >= data_segment_scp->vmaddr
                && location < (data_segment_scp->vmaddr
                               + data_segment_scp->vmsize))
@@ -972,15 +959,73 @@ unrelocate (const char *name, off_t reloff, int nrel)
            unreloc_count, nrel, name);
 }
 
+#if __ppc64__
+/* Rebase r_address in the relocation table.  */
+static void
+rebase_reloc_address (off_t reloff, int nrel, long linkedit_delta, long diff)
+{
+  int i;
+  struct relocation_info reloc_info;
+  struct scattered_relocation_info *sc_reloc_info
+    = (struct scattered_relocation_info *) &reloc_info;
+
+  for (i = 0; i < nrel; i++, reloff += sizeof (reloc_info))
+    {
+      if (lseek (infd, reloff - linkedit_delta, L_SET)
+         != reloff - linkedit_delta)
+       unexec_error ("rebase_reloc_table: cannot seek to reloc_info");
+      if (!unexec_read (&reloc_info, sizeof (reloc_info)))
+       unexec_error ("rebase_reloc_table: cannot read reloc_info");
+
+      if (sc_reloc_info->r_scattered == 0
+         && reloc_info.r_type == GENERIC_RELOC_VANILLA)
+       {
+         reloc_info.r_address -= diff;
+         if (!unexec_write (reloff, &reloc_info, sizeof (reloc_info)))
+           unexec_error ("rebase_reloc_table: cannot write reloc_info");
+       }
+    }
+}
+#endif
+
 /* Copy a LC_DYSYMTAB load command from the input file to the output
    file, adjusting the file offset fields.  */
 static void
 copy_dysymtab (struct load_command *lc, long delta)
 {
   struct dysymtab_command *dstp = (struct dysymtab_command *) lc;
+  vm_address_t base;
 
-  unrelocate ("local", dstp->locreloff, dstp->nlocrel);
-  unrelocate ("external", dstp->extreloff, dstp->nextrel);
+#ifdef _LP64
+#if __ppc64__
+  {
+    int i;
+
+    base = 0;
+    for (i = 0; i < nlc; i++)
+      if (lca[i]->cmd == LC_SEGMENT)
+       {
+         struct segment_command *scp = (struct segment_command *) lca[i];
+
+         if (scp->vmaddr + scp->vmsize > 0x100000000
+             && (scp->initprot & VM_PROT_WRITE) != 0)
+           {
+             base = data_segment_scp->vmaddr;
+             break;
+           }
+       }
+  }
+#else
+  /* First writable segment address.  */
+  base = data_segment_scp->vmaddr;
+#endif
+#else
+  /* First segment address in the file (unless MH_SPLIT_SEGS set). */
+  base = 0;
+#endif
+
+  unrelocate ("local", dstp->locreloff, dstp->nlocrel, base);
+  unrelocate ("external", dstp->extreloff, dstp->nextrel, base);
 
   if (dstp->nextrel > 0) {
     dstp->extreloff += delta;
@@ -999,6 +1044,29 @@ copy_dysymtab (struct load_command *lc, long delta)
     unexec_error ("cannot write symtab command to header");
 
   curr_header_offset += lc->cmdsize;
+
+#if __ppc64__
+  /* Check if the relocation base needs to be changed.  */
+  if (base == 0)
+    {
+      vm_address_t newbase = 0;
+      int i;
+
+      for (i = 0; i < num_unexec_regions; i++)
+       if (unexec_regions[i].range.address + unexec_regions[i].range.size
+           > 0x100000000)
+         {
+           newbase = data_segment_scp->vmaddr;
+           break;
+         }
+
+      if (newbase)
+       {
+         rebase_reloc_address (dstp->locreloff, dstp->nlocrel, delta, newbase);
+         rebase_reloc_address (dstp->extreloff, dstp->nextrel, delta, newbase);
+       }
+    }
+#endif
 }
 
 /* Copy a LC_TWOLEVEL_HINTS load command from the input file to the output