re PR target/18655 (Incorrect data in .debug_frame section for PowerPC)

	PR 18655
	* dwarf2out.c (output_call_frame_info): Use DWARF2_FRAME_REG_OUT
	before outputting DWARF_FRAME_RETURN_COLUMN.

From-SVN: r99470

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 950061c599ea7a31f9b751bf2d6be49dda3f5ab9..e9a1a6ac2587420a0446b843fd42d8745e684a41 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-09  Mark Mitchell  <mark@codesourcery.com>
+
+       PR 18655
+       * dwarf2out.c (output_call_frame_info): Use DWARF2_FRAME_REG_OUT
+       before outputting DWARF_FRAME_RETURN_COLUMN.
+
 2005-05-09  Adrian Straetling  <straetling@de.ibm.com>
 
        * config/s390/s390.c: (s390_branch_condition_mask,

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index f78f86043f1f7ac020561b00b88fe2709a451c66..9804bcf3c6d493b1ab2413e33fe4890d8363c034 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2075,6 +2075,7 @@ output_call_frame_info (int for_eh)
   int fde_encoding = DW_EH_PE_absptr;
   int per_encoding = DW_EH_PE_absptr;
   int lsda_encoding = DW_EH_PE_absptr;
+  int return_reg;
 
   /* Don't emit a CIE if there won't be any FDEs.  */
   if (fde_table_in_use == 0)
@@ -2213,10 +2214,11 @@ output_call_frame_info (int for_eh)
   dw2_asm_output_data_sleb128 (DWARF_CIE_DATA_ALIGNMENT,
                               "CIE Data Alignment Factor");
 
+  return_reg = DWARF2_FRAME_REG_OUT (DWARF_FRAME_RETURN_COLUMN, for_eh);
   if (DW_CIE_VERSION == 1)
-    dw2_asm_output_data (1, DWARF_FRAME_RETURN_COLUMN, "CIE RA Column");
+    dw2_asm_output_data (1, return_reg, "CIE RA Column");
   else
-    dw2_asm_output_data_uleb128 (DWARF_FRAME_RETURN_COLUMN, "CIE RA Column");
+    dw2_asm_output_data_uleb128 (return_reg, "CIE RA Column");
 
   if (augmentation[0])
     {