From e9fad6911f0d1bb2dcf01ade72ff978b4b273bb4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 9 Sep 2004 13:32:46 +0000 Subject: [PATCH] * dw2gencfi.c (select_cie_for_fde): When separating CIE out from FDE, treat a CFI_escape as we do a DW_CFA_advance_loc. --- gas/ChangeLog | 5 +++++ gas/dw2gencfi.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index dcfe99b949..3ee610f206 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2004-09-09 Alan Modra + + * dw2gencfi.c (select_cie_for_fde): When separating CIE out + from FDE, treat a CFI_escape as we do a DW_CFA_advance_loc. + 2004-09-08 Paul Brook * config/obj-elf.c (obj_elf_section_type): Handle init_array, diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c index 05d7e3d60f..3937329e40 100644 --- a/gas/dw2gencfi.c +++ b/gas/dw2gencfi.c @@ -975,8 +975,12 @@ select_cie_for_fde (struct fde_entry *fde, struct cfi_insn_data **pfirst) } /* Success if we reached the end of the CIE list, and we've either - run out of FDE entries or we've encountered an advance. */ - if (i == cie->last && (!j || j->insn == DW_CFA_advance_loc)) + run out of FDE entries or we've encountered an advance or + escape. */ + if (i == cie->last + && (!j + || j->insn == DW_CFA_advance_loc + || j->insn == CFI_escape)) { *pfirst = j; return cie; @@ -992,7 +996,8 @@ select_cie_for_fde (struct fde_entry *fde, struct cfi_insn_data **pfirst) cie->first = fde->data; for (i = cie->first; i ; i = i->next) - if (i->insn == DW_CFA_advance_loc) + if (i->insn == DW_CFA_advance_loc + || i->insn == CFI_escape) break; cie->last = i; -- 2.34.1