summaryrefslogtreecommitdiff
path: root/gcc/unwind-dw2-fde.c
diff options
context:
space:
mode:
authorpbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-20 22:34:58 +0000
committerpbrook <pbrook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-20 22:34:58 +0000
commitc0d45e556d0c72df6e3c769449f1d7dd0e22186f (patch)
tree278ca55e31dd743391ce22e513a63554e8ff213a /gcc/unwind-dw2-fde.c
parentf2b83d130125320468be14a67dc8fe079e8350fc (diff)
downloadgcc-c0d45e556d0c72df6e3c769449f1d7dd0e22186f.tar.gz
* unwind-dw2-fde.c (get_cie_encoding): Handle dwarf3 CIE format.
* unwind-dw2.c (extract_cie_info): Ditto. (_Unwind_FrameState): Change retaddr_column to word type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82072 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/unwind-dw2-fde.c')
-rw-r--r--gcc/unwind-dw2-fde.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c
index 74e64e5eb80..2a81e3676cc 100644
--- a/gcc/unwind-dw2-fde.c
+++ b/gcc/unwind-dw2-fde.c
@@ -276,7 +276,10 @@ get_cie_encoding (const struct dwarf_cie *cie)
p = aug + strlen (aug) + 1; /* Skip the augmentation string. */
p = read_uleb128 (p, &utmp); /* Skip code alignment. */
p = read_sleb128 (p, &stmp); /* Skip data alignment. */
- p++; /* Skip return address column. */
+ if (cie->version == 1) /* Skip return address column. */
+ p++;
+ else
+ p = read_uleb128 (p, &utmp);
aug++; /* Skip 'z' */
p = read_uleb128 (p, &utmp); /* Skip augmentation length. */