From c97b7ef6e65412b72fe1625654adf0dd20e29dc2 Mon Sep 17 00:00:00 2001 From: Jim Wilson Date: Sat, 7 Feb 2004 02:41:20 +0000 Subject: [PATCH] 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. --- gas/ChangeLog | 5 +++++ gas/config/tc-ia64.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index b5114e5d507..fa6222088ca 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2004-02-06 James E Wilson + + * config/tc-ia64.c (dot_endp): Delete call to output_endp. + (generate_unwind_image): Re-add it here. + 2004-02-06 Nathan Sidwell * dwarf2dbg.c (DWARF2_ADDR_SIZE): Remove trailing ';' diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c index 2082241d93f..450b91fafeb 100644 --- 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); -- 2.30.2