diff -u -r ../emacs-22.3.org/configure ./configure
old
|
new
|
|
15486 | 15486 | __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \ |
15487 | 15487 | sendto recvfrom getsockopt setsockopt getsockname getpeername \ |
15488 | 15488 | gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \ |
15489 | | memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign |
| 15489 | memset memcmp difftime memcpy mempcpy mblen mbrlen |
15490 | 15490 | do |
15491 | 15491 | as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` |
15492 | 15492 | { echo "$as_me:$LINENO: checking for $ac_func" >&5 |
diff -u -r ../emacs-22.3.org/configure.in ./configure.in
old
|
new
|
|
2628 | 2628 | __fpending mblen mbrlen mbsinit strsignal setitimer ualarm index rindex \ |
2629 | 2629 | sendto recvfrom getsockopt setsockopt getsockname getpeername \ |
2630 | 2630 | gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \ |
2631 | | memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign) |
| 2631 | memset memcmp difftime memcpy mempcpy mblen mbrlen) |
2632 | 2632 | |
2633 | 2633 | AC_CHECK_HEADERS(sys/un.h) |
2634 | 2634 | |
diff -u -r ../emacs-22.3.org/src/s/darwin.h ./src/s/darwin.h
old
|
new
|
|
260 | 260 | /* Definitions for how to compile & link. */ |
261 | 261 | |
262 | 262 | /* Indicate that we are compiling for Mac OS X. */ |
263 | | #define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX |
| 263 | /* #define C_SWITCH_SYSTEM -fpascal-strings -DMAC_OSX */ |
| 264 | #define C_SWITCH_SYSTEM -DMAC_OSX |
264 | 265 | |
265 | 266 | #ifdef HAVE_CARBON |
266 | 267 | |
diff -u -r ../emacs-22.3.org/src/unexmacosx.c ./src/unexmacosx.c
old
|
new
|
|
584 | 584 | printf ("LC_UUID "); |
585 | 585 | break; |
586 | 586 | #endif |
| 587 | #ifdef LC_DYLD_INFO |
| 588 | case LC_DYLD_INFO: |
| 589 | printf ("LC_DYLD_INFO "); |
| 590 | break; |
| 591 | case LC_DYLD_INFO_ONLY: |
| 592 | printf ("LC_DYLD_INFO_ONLY"); |
| 593 | break; |
| 594 | #endif |
587 | 595 | default: |
588 | 596 | printf ("unknown "); |
589 | 597 | } |
… |
… |
|
821 | 829 | || strncmp (sectp->sectname, "__const", 16) == 0 |
822 | 830 | || strncmp (sectp->sectname, "__cfstring", 16) == 0 |
823 | 831 | || strncmp (sectp->sectname, "__gcc_except_tab", 16) == 0 |
| 832 | || strncmp (sectp->sectname, "__program_vars", 16) == 0 |
824 | 833 | || strncmp (sectp->sectname, "__objc_", 7) == 0) |
825 | 834 | { |
826 | 835 | if (!unexec_copy (sectp->offset, old_file_offset, sectp->size)) |
… |
… |
|
1088 | 1097 | curr_header_offset += lc->cmdsize; |
1089 | 1098 | } |
1090 | 1099 | |
| 1100 | #ifdef LC_DYLD_INFO |
| 1101 | /* Copy a LC_DYLD_INFO(_ONLY) load command from the input file to the output |
| 1102 | file, adjusting the file offset fields. */ |
| 1103 | static void |
| 1104 | copy_dyld_info (struct load_command *lc, long delta) |
| 1105 | { |
| 1106 | struct dyld_info_command *dip = (struct dyld_info_command *) lc; |
| 1107 | |
| 1108 | if (dip->rebase_off > 0) |
| 1109 | dip->rebase_off += delta; |
| 1110 | if (dip->bind_off > 0) |
| 1111 | dip->bind_off += delta; |
| 1112 | if (dip->weak_bind_off > 0) |
| 1113 | dip->weak_bind_off += delta; |
| 1114 | if (dip->lazy_bind_off > 0) |
| 1115 | dip->lazy_bind_off += delta; |
| 1116 | if (dip->export_off > 0) |
| 1117 | dip->export_off += delta; |
| 1118 | |
| 1119 | printf ("Writing "); |
| 1120 | print_load_command_name (lc->cmd); |
| 1121 | printf (" command\n"); |
| 1122 | |
| 1123 | if (!unexec_write (curr_header_offset, lc, lc->cmdsize)) |
| 1124 | unexec_error ("cannot write dyld info command to header"); |
| 1125 | |
| 1126 | curr_header_offset += lc->cmdsize; |
| 1127 | } |
| 1128 | #endif |
| 1129 | |
1091 | 1130 | /* Copy other kinds of load commands from the input file to the output |
1092 | 1131 | file, ones that do not require adjustments of file offsets. */ |
1093 | 1132 | static void |
… |
… |
|
1154 | 1193 | case LC_TWOLEVEL_HINTS: |
1155 | 1194 | copy_twolevelhints (lca[i], linkedit_delta); |
1156 | 1195 | break; |
| 1196 | #ifdef LC_DYLD_INFO |
| 1197 | case LC_DYLD_INFO: |
| 1198 | case LC_DYLD_INFO_ONLY: |
| 1199 | copy_dyld_info (lca[i], linkedit_delta); |
| 1200 | break; |
| 1201 | #endif |
1157 | 1202 | default: |
1158 | 1203 | copy_other (lca[i]); |
1159 | 1204 | break; |
… |
… |
|
1320 | 1365 | void |
1321 | 1366 | unexec_free (void *ptr) |
1322 | 1367 | { |
| 1368 | if (ptr == NULL) |
| 1369 | return; |
1323 | 1370 | if (in_dumped_exec) |
1324 | 1371 | { |
1325 | 1372 | if (!ptr_in_unexec_regions (ptr)) |