Rework the R_NEG support on both gas and ld for the PowerPC AIX targets, in order...

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

diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index 24dfee9e9c312e0bb2ce8fd7692da6b5b917defe..c06561460326fbe39cfcc3087dd90e17c33031ad 100644 (file)
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -1219,14 +1219,13 @@ dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
        saved_ilp = input_line_pointer;
        c = get_symbol_name (& name);
 
-       if (strncmp (name, ".eh_frame", sizeof ".eh_frame") == 0
+       if (startswith (name, ".eh_frame")
            && name[9] != '_')
          sections |= CFI_EMIT_eh_frame;
-       else if (strncmp (name, ".debug_frame", sizeof ".debug_frame") == 0)
+       else if (startswith (name, ".debug_frame"))
          sections |= CFI_EMIT_debug_frame;
 #if SUPPORT_COMPACT_EH
-       else if (strncmp (name, ".eh_frame_entry",
-                         sizeof ".eh_frame_entry") == 0)
+       else if (startswith (name, ".eh_frame_entry"))
          {
            compact_eh = true;
            sections |= CFI_EMIT_eh_frame_compact;
@@ -2044,6 +2043,63 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
   symbol_set_value_now (end_address);
 }
 
+/* Allow these insns to be put in the initial sequence of a CIE.
+   If J is non-NULL, then compare I and J insns for a match.  */
+
+static inline bool
+initial_cie_insn (const struct cfi_insn_data *i, const struct cfi_insn_data *j)
+{
+  if (j && i->insn != j->insn)
+    return false;
+  switch (i->insn)
+    {
+    case DW_CFA_offset:
+    case DW_CFA_def_cfa:
+    case DW_CFA_val_offset:
+      if (j)
+       {
+         if (i->u.ri.reg != j->u.ri.reg)
+           return false;
+         if (i->u.ri.offset != j->u.ri.offset)
+           return false;
+       }
+      break;
+
+    case DW_CFA_register:
+      if (j)
+       {
+         if (i->u.rr.reg1 != j->u.rr.reg1)
+           return false;
+         if (i->u.rr.reg2 != j->u.rr.reg2)
+           return false;
+       }
+      break;
+
+    case DW_CFA_def_cfa_register:
+    case DW_CFA_restore:
+    case DW_CFA_undefined:
+    case DW_CFA_same_value:
+      if (j)
+       {
+         if (i->u.r != j->u.r)
+           return false;
+       }
+      break;
+
+    case DW_CFA_def_cfa_offset:
+      if (j)
+       {
+         if (i->u.i != j->u.i)
+           return false;
+       }
+      break;
+
+    default:
+      return false;
+    }
+  return true;
+}
+
 static struct cie_entry *
 select_cie_for_fde (struct fde_entry *fde, bool eh_frame,
                    struct cfi_insn_data **pfirst, int align)
@@ -2089,71 +2145,15 @@ select_cie_for_fde (struct fde_entry *fde, bool eh_frame,
           i != cie->last && j != NULL;
           i = i->next, j = j->next)
        {
-         if (i->insn != j->insn)
-           goto fail;
-         switch (i->insn)
-           {
-           case DW_CFA_advance_loc:
-           case DW_CFA_remember_state:
-             /* We reached the first advance/remember in the FDE,
-                but did not reach the end of the CIE list.  */
-             goto fail;
-
-           case DW_CFA_offset:
-           case DW_CFA_def_cfa:
-             if (i->u.ri.reg != j->u.ri.reg)
-               goto fail;
-             if (i->u.ri.offset != j->u.ri.offset)
-               goto fail;
-             break;
-
-           case DW_CFA_register:
-             if (i->u.rr.reg1 != j->u.rr.reg1)
-               goto fail;
-             if (i->u.rr.reg2 != j->u.rr.reg2)
-               goto fail;
-             break;
-
-           case DW_CFA_def_cfa_register:
-           case DW_CFA_restore:
-           case DW_CFA_undefined:
-           case DW_CFA_same_value:
-             if (i->u.r != j->u.r)
-               goto fail;
-             break;
-
-           case DW_CFA_def_cfa_offset:
-             if (i->u.i != j->u.i)
-               goto fail;
-             break;
-
-           case CFI_escape:
-           case CFI_val_encoded_addr:
-           case CFI_label:
-             /* Don't bother matching these for now.  */
-             goto fail;
-
-           default:
-             abort ();
-           }
+         if (!initial_cie_insn (i, j))
+           break;
        }
 
-      /* Success if we reached the end of the CIE list, and we've either
-        run out of FDE entries or we've encountered an advance,
-        remember, or escape.  */
-      if (i == cie->last
-         && (!j
-             || j->insn == DW_CFA_advance_loc
-             || j->insn == DW_CFA_remember_state
-             || j->insn == CFI_escape
-             || j->insn == CFI_val_encoded_addr
-             || j->insn == CFI_label))
+      if (i == cie->last)
        {
          *pfirst = j;
          return cie;
        }
-
-    fail:;
     }
 
   cie = XNEW (struct cie_entry);
@@ -2171,11 +2171,7 @@ select_cie_for_fde (struct fde_entry *fde, bool eh_frame,
 #endif
 
   for (i = cie->first; i ; i = i->next)
-    if (i->insn == DW_CFA_advance_loc
-       || i->insn == DW_CFA_remember_state
-       || i->insn == CFI_escape
-       || i->insn == CFI_val_encoded_addr
-       || i->insn == CFI_label)
+    if (!initial_cie_insn (i, NULL))
       break;
 
   cie->last = i;