aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2012-08-07 12:47:26 +0900
committerYAMAMOTO Mitsuharu2012-08-07 12:47:26 +0900
commitdb74a5fcb7ebed92c0a944c38b61de1c7ebb87d0 (patch)
treeae56c5dff1c09318bd380e90054095ae019839e0
parent7178e7222c34f2654ccc126c64eb16fbe5f382b5 (diff)
downloademacs-db74a5fcb7ebed92c0a944c38b61de1c7ebb87d0.tar.gz
emacs-db74a5fcb7ebed92c0a944c38b61de1c7ebb87d0.zip
Add new load commands for OS X 10.8.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/unexmacosx.c23
2 files changed, 27 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8ad531db846..eac08d19da4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12012-08-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * unexmacosx.c (print_load_command_name): Add cases LC_MAIN,
4 LC_SOURCE_VERSION, and LC_DYLIB_CODE_SIGN_DRS.
5 (dump_it) [LC_DYLIB_CODE_SIGN_DRS]: Call copy_linkedit_data.
6
12012-07-19 Chong Yidong <cyd@gnu.org> 72012-07-19 Chong Yidong <cyd@gnu.org>
2 8
3 * window.c (Fwindow_absolute_pixel_edges) 9 * window.c (Fwindow_absolute_pixel_edges)
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 2e77d3e17bc..8661ee4be1b 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -609,6 +609,21 @@ print_load_command_name (int lc)
609 printf ("LC_FUNCTION_STARTS"); 609 printf ("LC_FUNCTION_STARTS");
610 break; 610 break;
611#endif 611#endif
612#ifdef LC_MAIN
613 case LC_MAIN:
614 printf ("LC_MAIN ");
615 break;
616#endif
617#ifdef LC_SOURCE_VERSION
618 case LC_SOURCE_VERSION:
619 printf ("LC_SOURCE_VERSION");
620 break;
621#endif
622#ifdef LC_DYLIB_CODE_SIGN_DRS
623 case LC_DYLIB_CODE_SIGN_DRS:
624 printf ("LC_DYLIB_CODE_SIGN_DRS");
625 break;
626#endif
612 default: 627 default:
613 printf ("unknown "); 628 printf ("unknown ");
614 } 629 }
@@ -1146,8 +1161,9 @@ copy_dyld_info (struct load_command *lc, long delta)
1146#endif 1161#endif
1147 1162
1148#ifdef LC_FUNCTION_STARTS 1163#ifdef LC_FUNCTION_STARTS
1149/* Copy a LC_FUNCTION_STARTS load command from the input file to the 1164/* Copy a LC_FUNCTION_STARTS/LC_DYLIB_CODE_SIGN_DRS load command from
1150 output file, adjusting the data offset field. */ 1165 the input file to the output file, adjusting the data offset
1166 field. */
1151static void 1167static void
1152copy_linkedit_data (struct load_command *lc, long delta) 1168copy_linkedit_data (struct load_command *lc, long delta)
1153{ 1169{
@@ -1241,6 +1257,9 @@ dump_it (void)
1241#endif 1257#endif
1242#ifdef LC_FUNCTION_STARTS 1258#ifdef LC_FUNCTION_STARTS
1243 case LC_FUNCTION_STARTS: 1259 case LC_FUNCTION_STARTS:
1260#ifdef LC_DYLIB_CODE_SIGN_DRS
1261 case LC_DYLIB_CODE_SIGN_DRS:
1262#endif
1244 copy_linkedit_data (lca[i], linkedit_delta); 1263 copy_linkedit_data (lca[i], linkedit_delta);
1245 break; 1264 break;
1246#endif 1265#endif