Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* configure.ac: Increase headerpad_extra to 1000, update the comment

Browse source 
about load commands.

* src/unexmacosx.c (dump_it): Improve error message.

Fixes: debbugs:18505
This commit is contained in:
David Caldwell 2014-09-21 22:35:22 +02:00 committed by Jan Djärv
parent b761843bb0
commit 63126683db
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-09-21 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac: Increase headerpad_extra to 1000, update the comment
about load commands (Bug#18505).
2014-09-13 Eli Zaretskii <eliz@gnu.org>
* configure.ac (HAVE_SOUND): Check for mmsystem.h header that

10
configure.ac
View file

@ -4859,17 +4859,19 @@ case "$opsys" in
darwin)
## The -headerpad option tells ld (see man page) to leave room at the
## end of the header for adding load commands. Needed for dumping.
## 0x690 is the total size of 30 segment load commands (at 56
## each); under Cocoa 31 commands are required.
## 0x1000 is enough for roughly 52 load commands on the x86_64
## architecture (where they are 78 bytes each). The actual number of
## load commands added is not consistent but normally ranges from
## about 14 to about 34. Setting it high gets us plenty of slop and
## only costs about 1.5K of wasted binary space.
headerpad_extra=1000
if test "$HAVE_NS" = "yes"; then
libs_nsgui="-framework AppKit"
if test "$NS_IMPL_COCOA" = "yes"; then
libs_nsgui="$libs_nsgui -framework IOKit"
fi
headerpad_extra=6C8
else
libs_nsgui=
headerpad_extra=690
fi
LD_SWITCH_SYSTEM_TEMACS="-fno-pie -prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra"

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2014-09-21 David Caldwell <david@porkrind.org> (tiny change)
* unexmacosx.c (dump_it): Improve error message.
2014-09-18 Juri Linkov <juri@jurta.org>
* image.c (imagemagick_load_image): Add delay to imagemagick metadata.

4
src/unexmacosx.c
View file

@ -1302,7 +1302,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);