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

about load commands.

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

Fixes: debbugs:18505

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ea4dde398a7..684de498522 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 8cd80a7a544..7d4762fdab2 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -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);