[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108144: Add new load command for Xcode 4.5.

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 108144
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-09-20 17:28:48 +0900
message:
  Add new load command for Xcode 4.5.
modified:
  src/ChangeLog
  src/unexmacosx.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-18 01:07:13 +0000
+++ b/src/ChangeLog     2012-09-20 08:28:48 +0000
@@ -1,3 +1,9 @@
+2012-09-20  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * unexmacosx.c: Define LC_DATA_IN_CODE if not defined.
+       (print_load_command_name): Add case LC_DATA_IN_CODE.
+       (dump_it) [LC_DATA_IN_CODE]: Call copy_linkedit_data.
+
 2012-09-18  Glenn Morris  <address@hidden>
 
        * eval.c (Frun_hook_with_args_until_success)

=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c  2012-08-08 05:44:53 +0000
+++ b/src/unexmacosx.c  2012-09-20 08:28:48 +0000
@@ -117,6 +117,13 @@
 
 #include <assert.h>
 
+/* LC_DATA_IN_CODE is not defined in mach-o/loader.h on OS X 10.7.
+   But it is used if we build with "Command Line Tools for Xcode 4.5
+   (OS X Lion) - Septemper 2012".  */
+#ifndef LC_DATA_IN_CODE
+#define LC_DATA_IN_CODE 0x29 /* table of non-instructions in __text */
+#endif
+
 #ifdef _LP64
 #define mach_header                    mach_header_64
 #define segment_command                        segment_command_64
@@ -614,6 +621,11 @@
       printf ("LC_MAIN          ");
       break;
 #endif
+#ifdef LC_DATA_IN_CODE
+    case LC_DATA_IN_CODE:
+      printf ("LC_DATA_IN_CODE");
+      break;
+#endif
 #ifdef LC_SOURCE_VERSION
     case LC_SOURCE_VERSION:
       printf ("LC_SOURCE_VERSION");
@@ -1177,9 +1189,9 @@
 #endif
 
 #ifdef LC_FUNCTION_STARTS
-/* Copy a LC_FUNCTION_STARTS/LC_DYLIB_CODE_SIGN_DRS load command from
-   the input file to the output file, adjusting the data offset
-   field.  */
+/* Copy a LC_FUNCTION_STARTS/LC_DATA_IN_CODE/LC_DYLIB_CODE_SIGN_DRS
+   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)
 {
@@ -1273,6 +1285,9 @@
 #endif
 #ifdef LC_FUNCTION_STARTS
       case LC_FUNCTION_STARTS:
+#ifdef LC_DATA_IN_CODE
+      case LC_DATA_IN_CODE:
+#endif
 #ifdef LC_DYLIB_CODE_SIGN_DRS
       case LC_DYLIB_CODE_SIGN_DRS:
 #endif