[Emacs-diffs] emacs-24 r117513: * configure.ac: Increase headerpad_extra to 1000, update the comment

[Jan D.]

------------------------------------------------------------
revno: 117513
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18505
author: David Caldwell <address@hidden>
committer: Jan D. <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-09-21 22:35:22 +0200
message:
  * configure.ac: Increase headerpad_extra to 1000, update the comment
  about load commands.
  
  * src/unexmacosx.c (dump_it): Improve error message.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/unexmacosx.c               
unexmacosx.c-20091113204419-o5vbwnq5f7feedwu-2413

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-09-13 07:10:40 +0000
+++ b/ChangeLog 2014-09-21 20:35:22 +0000
@@ -1,3 +1,8 @@
+2014-09-21  Jan Djärv  <address@hidden>
+
+       * configure.ac: Increase headerpad_extra to 1000, update the comment
+       about load commands (Bug#18505).
+
 2014-09-13  Eli Zaretskii  <address@hidden>
 
        * configure.ac (HAVE_SOUND): Check for mmsystem.h header that

=== modified file 'configure.ac'
--- a/configure.ac      2014-09-13 07:10:40 +0000
+++ b/configure.ac      2014-09-21 20:35:22 +0000
@@ -4859,17 +4859,19 @@
   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"
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-18 20:59:55 +0000
+++ b/src/ChangeLog     2014-09-21 20:35:22 +0000
@@ -1,3 +1,7 @@
+2014-09-21  David Caldwell <address@hidden> (tiny change)
+
+       * unexmacosx.c (dump_it): Improve error message.
+
 2014-09-18  Juri Linkov  <address@hidden>
 
        * image.c (imagemagick_load_image): Add delay to imagemagick metadata.

=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c  2014-01-01 07:43:34 +0000
+++ b/src/unexmacosx.c  2014-09-21 20:35:22 +0000
@@ -1302,7 +1302,9 @@
       }
 
   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);