* dwarf2out.c (output_call_frame_info): Support dwarf3 cie entries.

From-SVN: r83108

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fdcffcd778a01fe92403aeaf3c7590f7d896cbb2..b9b6d09013d0dad65adc2662061399be895aee76 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-14  Paul Brook  <paul@codesourcery.com>
+
+       * dwarf2out.c (output_call_frame_info): Support dwarf3 cie entries.
+
 2004-06-14  Zdenek Dvorak  <rakdver@atrey.karlin.mff.cuni.cz>
 
        * Makefile.in (FLAGS_H): New.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index fa1bdad359e1bcb61f71df132c80abf9907de5a6..0ad017be1fdaabb2ff15b0c7825e265711374f2b 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2082,7 +2082,11 @@ output_call_frame_info (int for_eh)
   dw2_asm_output_data_uleb128 (1, "CIE Code Alignment Factor");
   dw2_asm_output_data_sleb128 (DWARF_CIE_DATA_ALIGNMENT,
                               "CIE Data Alignment Factor");
-  dw2_asm_output_data (1, DWARF_FRAME_RETURN_COLUMN, "CIE RA Column");
+
+  if (DW_CIE_VERSION == 1)
+    dw2_asm_output_data (1, DWARF_FRAME_RETURN_COLUMN, "CIE RA Column");
+  else
+    dw2_asm_output_data_uleb128 (DWARF_FRAME_RETURN_COLUMN, "CIE RA Column");
 
   if (augmentation[0])
     {