From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sat, 23 Jul 2011 04:04:58 +0000 (+0900)
Subject: Support LC_FUNCTION_STARTS load command on Darwin.
X-Git-Tag: emacs-pretest-24.0.90~104^3~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7963fa061a06d3d3c3bd396246fbb17e6aad9f67;p=emacs.git

Support LC_FUNCTION_STARTS load command on Darwin.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 09a6180e79d..62424f794cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* unexmacosx.c (print_load_command_name): Add cases LC_FUNCTION_STARTS
+	and LC_VERSION_MIN_MACOSX.
+	(copy_linkedit_data) [LC_FUNCTION_STARTS]: New function.
+	(dump_it) [LC_FUNCTION_STARTS]: Use it.
+
 2011-07-22  Chong Yidong  <cyd@stupidchicken.com>
 
 	* frame.c (Fmodify_frame_parameters): In tty case, update the
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index d6f170c9127..e4d0314ce8c 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -589,6 +589,16 @@ print_load_command_name (int lc)
     case LC_DYLD_INFO_ONLY:
       printf ("LC_DYLD_INFO_ONLY");
       break;
+#endif
+#ifdef LC_VERSION_MIN_MACOSX
+    case LC_VERSION_MIN_MACOSX:
+      printf ("LC_VERSION_MIN_MACOSX");
+      break;
+#endif
+#ifdef LC_FUNCTION_STARTS
+    case LC_FUNCTION_STARTS:
+      printf ("LC_FUNCTION_STARTS");
+      break;
 #endif
     default:
       printf ("unknown          ");
@@ -1126,6 +1136,28 @@ copy_dyld_info (struct load_command *lc, long delta)
 }
 #endif
 
+#ifdef LC_FUNCTION_STARTS
+/* Copy a LC_FUNCTION_STARTS load command from the input file to the
+   output file, adjusting the data offset field.  */
+static void
+copy_linkedit_data (struct load_command *lc, long delta)
+{
+  struct linkedit_data_command *ldp = (struct linkedit_data_command *) lc;
+
+  if (ldp->dataoff > 0)
+    ldp->dataoff += delta;
+
+  printf ("Writing ");
+  print_load_command_name (lc->cmd);
+  printf (" command\n");
+
+  if (!unexec_write (curr_header_offset, lc, lc->cmdsize))
+    unexec_error ("cannot write linkedit data command to header");
+
+  curr_header_offset += lc->cmdsize;
+}
+#endif
+
 /* 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
@@ -1197,6 +1229,11 @@ dump_it ()
       case LC_DYLD_INFO_ONLY:
 	copy_dyld_info (lca[i], linkedit_delta);
 	break;
+#endif
+#ifdef LC_FUNCTION_STARTS
+      case LC_FUNCTION_STARTS:
+	copy_linkedit_data (lca[i], linkedit_delta);
+	break;
 #endif
       default:
 	copy_other (lca[i]);