mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

* unexmacosx.c (copy_data_segment): Copy initialized data in statically linked libraries from input file rather than memory.

Browse source
This commit is contained in:
YAMAMOTO Mitsuharu 2012-08-08 14:44:53 +09:00
parent bf1757d19a
commit 8ccd072a2c
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-08-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* unexmacosx.c (copy_data_segment): Copy initialized data in
statically linked libraries from input file rather than memory.
2012-08-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* unexmacosx.c (print_load_command_name): Add cases LC_MAIN,

18
src/unexmacosx.c
View file

@ -815,8 +815,24 @@ 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))
extern char my_edata[];
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);
}