unexmacosx.c: Now corrects the offset in two hints table to allow prebinding

to be redone and allow the executable to be stripped.

2 files changed, 28 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f48bed6deb2..3275ca3759d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-01  Steven Tamm  <steventamm@mac.com>
+
+        * unexmacosx.c (copy_twolevelhints, dump_it):  Now corrects the
+        offset in two hints table to allow prebinding to be redone and
+        allow the executable to be stripped.
+
 2002-11-29  Dave Love  <fx@gnu.org>
 
         * fns.c (Frequire): Don't call LOADHIST_ATTACH if feature was
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index d9c91e5abb0..03aafd2912a 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -753,6 +753,25 @@ copy_dysymtab (struct load_command *lc)
   curr_header_offset += lc->cmdsize;
 }
 
+/* Copy a LC_TWOLEVEL_HINTS load command from the input file to the output
+   file, adjusting the file offset fields.  */
+static void
+copy_twolevelhints (struct load_command *lc)
+{
+  struct twolevel_hints_command *tlhp = (struct twolevel_hints_command *) lc;
+
+  if (tlhp->nhints > 0) {
+    tlhp->offset += delta;
+  }
+
+  printf ("Writing LC_TWOLEVEL_HINTS command\n");
+
+  if (!unexec_write (curr_header_offset, lc, lc->cmdsize))
+    unexec_error ("cannot write two level hint command to header");
+
+  curr_header_offset += lc->cmdsize;
+}
+
 /* Copy other kinds of load commands from the input file to the output
    file, ones that do not require adjustments of file offsets.  */
 static void
@@ -799,6 +818,9 @@ dump_it ()
       case LC_DYSYMTAB:
         copy_dysymtab (lca[i]);
         break;
+      case LC_TWOLEVEL_HINTS:
+        copy_twolevelhints (lca[i]);
+        break;
       default:
         copy_other (lca[i]);
         break;