Fix unwind abort while compiling glibc, reported by HJ.

	* config/tc-ia64.c (dot_endp): Delete call to output_endp.
	(generate_unwind_image): Re-add it here.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b5114e5..fa62220 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-06  James E Wilson  <wilson@specifixinc.com>
+
+       * config/tc-ia64.c (dot_endp): Delete call to output_endp.
+       (generate_unwind_image): Re-add it here.
+
 2004-02-06  Nathan Sidwell  <nathan@codesourcery.com>
 
        * dwarf2dbg.c (DWARF2_ADDR_SIZE): Remove trailing ';'

diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 2082241..450b91f 100644 (file)
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -3254,6 +3254,10 @@ generate_unwind_image (text_name)
   int size, pad;
   unw_rec_list *list;
 
+  /* Mark the end of the unwind info, so that we can compute the size of the
+     last unwind region.  */
+  add_unwind_entry (output_endp ());
+
   /* Force out pending instructions, to make sure all unwind records have
      a valid slot_number field.  */
   ia64_flush_insns ();
@@ -4046,8 +4050,6 @@ dot_endp (dummy)
 
   insn_group_break (1, 0, 0);
 
-  add_unwind_entry (output_endp ());
-
   /* If there wasn't a .handlerdata, we haven't generated an image yet.  */
   if (!unwind.info)
     generate_unwind_image (text_name);