daily update

[deliverable/binutils-gdb.git] / gas / dw2gencfi.c

diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index 0e118e15d3969d107c7c4d158c7b8e090f92b52f..ff0aa35353d2b55d0c73c8e8f79ba2dba945d70c 100644 (file)
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -41,6 +41,14 @@
 # endif
 #endif
 
+#ifndef EH_FRAME_ALIGNMENT
+# ifdef BFD_ASSEMBLER
+#  define EH_FRAME_ALIGNMENT (bfd_get_arch_size (stdoutput) == 64 ? 3 : 2)
+# else
+#  define EH_FRAME_ALIGNMENT 2
+# endif
+#endif
+
 #ifndef tc_cfi_frame_initial_instructions
 # define tc_cfi_frame_initial_instructions() ((void)0)
 #endif
@@ -366,6 +374,7 @@ const pseudo_typeS cfi_pseudo_table[] =
     { "cfi_same_value", dot_cfi, DW_CFA_same_value },
     { "cfi_remember_state", dot_cfi, DW_CFA_remember_state },
     { "cfi_restore_state", dot_cfi, DW_CFA_restore_state },
+    { "cfi_window_save", dot_cfi, DW_CFA_GNU_window_save },
     { "cfi_escape", dot_cfi_escape, 0 },
     { NULL, NULL, 0 }
   };
@@ -521,6 +530,10 @@ dot_cfi (int arg)
       cfi_add_CFA_restore_state ();
       break;
 
+    case DW_CFA_GNU_window_save:
+      cfi_add_CFA_insn (DW_CFA_GNU_window_save);
+      break;
+
     default:
       abort ();
     }
@@ -790,6 +803,10 @@ output_cfi_insn (struct cfi_insn_data *insn)
       out_one (insn->insn);
       break;
 
+    case DW_CFA_GNU_window_save:
+      out_one (DW_CFA_GNU_window_save);
+      break;
+
     case CFI_escape:
       {
        struct cfi_escape_data *e;
@@ -830,7 +847,11 @@ output_cie (struct cie_entry *cie)
   out_sleb128 (DWARF2_CIE_DATA_ALIGNMENT);     /* Data alignment */
   out_one (cie->return_column);                        /* Return column */
   out_uleb128 (1);                             /* Augmentation size */
+#if defined DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
   out_one (DW_EH_PE_pcrel | DW_EH_PE_sdata4);
+#else
+  out_one (DW_EH_PE_sdata4);
+#endif
 
   if (cie->first)
     for (i = cie->first; i != cie->last; i = i->next)
@@ -842,7 +863,7 @@ output_cie (struct cie_entry *cie)
 
 static void
 output_fde (struct fde_entry *fde, struct cie_entry *cie,
-           struct cfi_insn_data *first)
+           struct cfi_insn_data *first, int align)
 {
   symbolS *after_size_address, *end_address;
   expressionS exp;
@@ -860,10 +881,22 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
   exp.X_add_symbol = after_size_address;
   exp.X_op_symbol = cie->start_address;
   emit_expr (&exp, 4);                         /* CIE offset */
-  
+
+#ifdef DIFF_EXPR_OK  
   exp.X_add_symbol = fde->start_address;
   exp.X_op_symbol = symbol_temp_new_now ();
   emit_expr (&exp, 4);                         /* Code offset */
+#else
+  exp.X_op = O_symbol;
+  exp.X_add_symbol = fde->start_address;
+  exp.X_op_symbol = NULL;
+#ifdef tc_cfi_emit_pcrel_expr
+  tc_cfi_emit_pcrel_expr (&exp, 4);            /* Code offset */
+#else
+  emit_expr (&exp, 4);                         /* Code offset */
+#endif
+  exp.X_op = O_subtract;
+#endif
 
   exp.X_add_symbol = fde->end_address;
   exp.X_op_symbol = fde->start_address;                /* Code length */
@@ -874,7 +907,7 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
   for (; first; first = first->next)
     output_cfi_insn (first);
 
-  frag_align (2, 0, 0);
+  frag_align (align, 0, 0);
   symbol_set_value_now (end_address);
 }
 
@@ -990,7 +1023,7 @@ cfi_finish (void)
                         SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_READONLY);
 #endif
   subseg_set (cfi_seg, 0);
-  record_alignment (cfi_seg, 2);
+  record_alignment (cfi_seg, EH_FRAME_ALIGNMENT);
 
   /* Make sure check_eh_frame doesn't do anything with our output.  */
   save_flag_traditional_format = flag_traditional_format;
@@ -1002,7 +1035,7 @@ cfi_finish (void)
       struct cie_entry *cie;
 
       cie = select_cie_for_fde (fde, &first);
-      output_fde (fde, cie, first);
+      output_fde (fde, cie, first, fde->next == NULL ? EH_FRAME_ALIGNMENT : 2);
     }
 
   flag_traditional_format = save_flag_traditional_format;