X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9f6f48455f7d25e5cc2d50485d98ff3af43946a2..c6e9f7838aaf2efbb519c7401a60caffa36a4f9d:/src/unexmacosx.c diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 0f5ad5498b..fe6637e2ef 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -1,5 +1,5 @@ /* Dump Emacs in Mach-O format for use on Mac OS X. - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -97,6 +97,7 @@ along with GNU Emacs. If not, see . */ #undef free #include "unexec.h" +#include "lisp.h" #include #include @@ -106,9 +107,6 @@ along with GNU Emacs. If not, see . */ #include #include #include -#if defined (__ppc__) -#include -#endif #ifdef HAVE_MALLOC_MALLOC_H #include #else @@ -117,6 +115,13 @@ along with GNU Emacs. If not, see . */ #include +/* 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) - September 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 @@ -606,6 +611,26 @@ print_load_command_name (int lc) case LC_FUNCTION_STARTS: printf ("LC_FUNCTION_STARTS"); break; +#endif +#ifdef LC_MAIN + case LC_MAIN: + 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"); + break; +#endif +#ifdef LC_DYLIB_CODE_SIGN_DRS + case LC_DYLIB_CODE_SIGN_DRS: + printf ("LC_DYLIB_CODE_SIGN_DRS"); + break; #endif default: printf ("unknown "); @@ -798,8 +823,23 @@ copy_data_segment (struct load_command *lc) file. */ if (strncmp (sectp->sectname, SECT_DATA, 16) == 0) { - if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size)) + unsigned long my_size; + + /* The __data section is basically dumped from memory. But + initialized data in statically linked libraries are + copied from the input file. In particular, + add_image_hook.names and add_image_hook.pointers stored + by libarclite_macosx.a, are restored so that they will be + reinitialized when the dumped binary is executed. */ + my_size = (unsigned long)my_edata - sectp->addr; + if (!(sectp->addr <= (unsigned long)my_edata + && my_size <= sectp->size)) + unexec_error ("my_edata is not in section %s", SECT_DATA); + if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size)) unexec_error ("cannot write section %s", SECT_DATA); + if (!unexec_copy (sectp->offset + my_size, old_file_offset + my_size, + sectp->size - my_size)) + unexec_error ("cannot copy section %s", SECT_DATA); if (!unexec_write (header_offset, sectp, sizeof (struct section))) unexec_error ("cannot write section %s's header", SECT_DATA); } @@ -813,7 +853,6 @@ copy_data_segment (struct load_command *lc) } else if (strncmp (sectp->sectname, SECT_BSS, 16) == 0) { - extern char *my_endbss_static; unsigned long my_size; sectp->flags = S_REGULAR; @@ -837,6 +876,27 @@ copy_data_segment (struct load_command *lc) if (!unexec_write (header_offset, sectp, sizeof (struct section))) unexec_error ("cannot write section %.16s's header", sectp->sectname); } + else if (strncmp (sectp->sectname, "__bss", 5) == 0 + || strncmp (sectp->sectname, "__pu_bss", 8) == 0) + { + sectp->flags = S_REGULAR; + + /* These sections are produced by GCC 4.6+. + + FIXME: We possibly ought to clear uninitialized local + variables in statically linked libraries like for + SECT_BSS (__bss) above, but setting up the markers we + need in lastfile.c would be rather messy. See + darwin_output_aligned_bss () in gcc/config/darwin.c for + the root of the problem, keeping in mind that the + sections are numbered by their alignment in GCC 4.6, but + by log2(alignment) in GCC 4.7. */ + + if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size)) + unexec_error ("cannot copy section %.16s", sectp->sectname); + if (!unexec_write (header_offset, sectp, sizeof (struct section))) + unexec_error ("cannot write section %.16s's header", sectp->sectname); + } else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0 || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0 || strncmp (sectp->sectname, "__got", 16) == 0 @@ -848,6 +908,7 @@ copy_data_segment (struct load_command *lc) || strncmp (sectp->sectname, "__program_vars", 16) == 0 || strncmp (sectp->sectname, "__mod_init_func", 16) == 0 || strncmp (sectp->sectname, "__mod_term_func", 16) == 0 + || strncmp (sectp->sectname, "__static_data", 16) == 0 || strncmp (sectp->sectname, "__objc_", 7) == 0) { if (!unexec_copy (sectp->offset, old_file_offset, sectp->size)) @@ -969,17 +1030,8 @@ unrelocate (const char *name, off_t reloff, int nrel, vm_address_t base) name, i, reloc_info.r_type); } else - switch (sc_reloc_info->r_type) - { -#if defined (__ppc__) - case PPC_RELOC_PB_LA_PTR: - /* nothing to do for prebound lazy pointer */ - break; -#endif - default: - unexec_error ("unrelocate: %s:%d cannot handle scattered type = %d", - name, i, sc_reloc_info->r_type); - } + unexec_error ("unrelocate: %s:%d cannot handle scattered type = %d", + name, i, sc_reloc_info->r_type); } if (nrel > 0) @@ -987,35 +1039,6 @@ unrelocate (const char *name, off_t reloff, int nrel, vm_address_t base) unreloc_count, nrel, name); } -#if __ppc64__ -/* Rebase r_address in the relocation table. */ -static void -rebase_reloc_address (off_t reloff, int nrel, long linkedit_delta, long diff) -{ - int i; - struct relocation_info reloc_info; - struct scattered_relocation_info *sc_reloc_info - = (struct scattered_relocation_info *) &reloc_info; - - for (i = 0; i < nrel; i++, reloff += sizeof (reloc_info)) - { - if (lseek (infd, reloff - linkedit_delta, L_SET) - != reloff - linkedit_delta) - unexec_error ("rebase_reloc_table: cannot seek to reloc_info"); - if (!unexec_read (&reloc_info, sizeof (reloc_info))) - unexec_error ("rebase_reloc_table: cannot read reloc_info"); - - if (sc_reloc_info->r_scattered == 0 - && reloc_info.r_type == GENERIC_RELOC_VANILLA) - { - reloc_info.r_address -= diff; - if (!unexec_write (reloff, &reloc_info, sizeof (reloc_info))) - unexec_error ("rebase_reloc_table: cannot write reloc_info"); - } - } -} -#endif - /* Copy a LC_DYSYMTAB load command from the input file to the output file, adjusting the file offset fields. */ static void @@ -1025,28 +1048,8 @@ copy_dysymtab (struct load_command *lc, long delta) vm_address_t base; #ifdef _LP64 -#if __ppc64__ - { - int i; - - base = 0; - for (i = 0; i < nlc; i++) - if (lca[i]->cmd == LC_SEGMENT) - { - struct segment_command *scp = (struct segment_command *) lca[i]; - - if (scp->vmaddr + scp->vmsize > 0x100000000 - && (scp->initprot & VM_PROT_WRITE) != 0) - { - base = data_segment_scp->vmaddr; - break; - } - } - } -#else /* First writable segment address. */ base = data_segment_scp->vmaddr; -#endif #else /* First segment address in the file (unless MH_SPLIT_SEGS set). */ base = 0; @@ -1072,29 +1075,6 @@ copy_dysymtab (struct load_command *lc, long delta) unexec_error ("cannot write symtab command to header"); curr_header_offset += lc->cmdsize; - -#if __ppc64__ - /* Check if the relocation base needs to be changed. */ - if (base == 0) - { - vm_address_t newbase = 0; - int i; - - for (i = 0; i < num_unexec_regions; i++) - if (unexec_regions[i].range.address + unexec_regions[i].range.size - > 0x100000000) - { - newbase = data_segment_scp->vmaddr; - break; - } - - if (newbase) - { - rebase_reloc_address (dstp->locreloff, dstp->nlocrel, delta, newbase); - rebase_reloc_address (dstp->extreloff, dstp->nextrel, delta, newbase); - } - } -#endif } /* Copy a LC_TWOLEVEL_HINTS load command from the input file to the output @@ -1147,8 +1127,9 @@ 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. */ +/* 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) { @@ -1242,6 +1223,12 @@ dump_it (void) #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 copy_linkedit_data (lca[i], linkedit_delta); break; #endif @@ -1251,7 +1238,9 @@ dump_it (void) } if (curr_header_offset > text_seg_lowest_offset) - unexec_error ("not enough room for load commands for new __DATA segments"); + unexec_error ("not enough room for load commands for new __DATA segments" + " (increase headerpad_extra in configure.in to at least %lX)", + num_unexec_regions * sizeof (struct segment_command)); printf ("%ld unused bytes follow Mach-O header\n", text_seg_lowest_offset - curr_header_offset); @@ -1272,16 +1261,16 @@ unexec (const char *outfile, const char *infile) unexec_error ("Unexec from a dumped executable is not supported."); pagesize = getpagesize (); - infd = open (infile, O_RDONLY, 0); + infd = emacs_open (infile, O_RDONLY, 0); if (infd < 0) { unexec_error ("cannot open input file `%s'", infile); } - outfd = open (outfile, O_WRONLY | O_TRUNC | O_CREAT, 0755); + outfd = emacs_open (outfile, O_WRONLY | O_TRUNC | O_CREAT, 0777); if (outfd < 0) { - close (infd); + emacs_close (infd); unexec_error ("cannot open output file `%s'", outfile); } @@ -1295,7 +1284,7 @@ unexec (const char *outfile, const char *infile) dump_it (); - close (outfd); + emacs_close (outfd); }