* dwarf2out.c (output_call_frame_info): For dw_cie_version

	>= 4 add also address size and segment size fields into CIE
	header.

	* unwind-dw2.c (extract_cie_info): Handle CIE version 4, as
	long as address size is the same as sizeof (void *) and
	segment size is 0.
	* unwind-dw2-fde.c (get_cie_encoding): Likewise.  If
	address size or segment size is unexpected, return DW_EH_PE_omit.
	(classify_object_over_fdes): If get_cie_encoding returned
	DW_EH_PE_omit, return -1.
	(init_object): If classify_object_over_fdes returned -1,
	pretend there were no FDEs at all.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158589 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4348d3d..6f875d4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2010-04-21  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2out.c (output_call_frame_info): For dw_cie_version
+       >= 4 add also address size and segment size fields into CIE
+       header.
+
+       * unwind-dw2.c (extract_cie_info): Handle CIE version 4, as
+       long as address size is the same as sizeof (void *) and
+       segment size is 0.
+       * unwind-dw2-fde.c (get_cie_encoding): Likewise.  If
+       address size or segment size is unexpected, return DW_EH_PE_omit.
+       (classify_object_over_fdes): If get_cie_encoding returned
+       DW_EH_PE_omit, return -1.
+       (init_object): If classify_object_over_fdes returned -1,
+       pretend there were no FDEs at all.
+
 2010-04-21  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.md (bswap<mode>2): Macroize expander from

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index cfacf96..21a3f75 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3771,6 +3771,11 @@ output_call_frame_info (int for_eh)
     }
 
   dw2_asm_output_nstring (augmentation, -1, "CIE Augmentation");
+  if (dw_cie_version >= 4)
+    {
+      dw2_asm_output_data (1, DWARF2_ADDR_SIZE, "CIE Address Size");
+      dw2_asm_output_data (1, 0, "CIE Segment Size");
+    }
   dw2_asm_output_data_uleb128 (1, "CIE Code Alignment Factor");
   dw2_asm_output_data_sleb128 (DWARF_CIE_DATA_ALIGNMENT,
                               "CIE Data Alignment Factor");