Compact EH Support

The specification for the Compact EH format is available at:
https://github.com/MentorEmbedded/cxx-abi/blob/master/MIPSCompactEH.pdf

2015-05-28  Catherine Moore  <clm@codesourcery.com>
	    Bernd Schmidt <bernds@codesourcery.com>
	    Paul Brook <paul@codesourcery.com>

	bfd/
	* bfd-in2.h: Regenerated.
	* elf-bfd.h (DWARF2_EH_HDR, COMPACT_EH_HDR): Define.
	(COMPACT_EH_CANT_UNWIND_OPCODE): Define.
	(dwarf_eh_frame_hdr_info): Move dwarf-specific fields from
	eh_frame_hdr_info.
	(compact_eh_frame_hdr_info): Declare.
	(eh_frame_hdr_info):  Redeclare with union for dwarf-specific
	fields and compact-eh fields.
	(elf_backend_data): Add cant_unwind_opcode and compact_eh_encoding.
	(bfd_elf_section_data): Add eh_frame_entry_field.
	(elf_section_eh_frame_entry): Define.
	(bfd_elf_parse_eh_frame_entries): Declare.
	(_bfd_elf_parse_eh_frame_entry): Declare.
	(_bfd_elf_end_eh_frame_parsing): Declare.
	(_bfd_elf_write_section_eh_frame_entry): Declare.
	(_bfd_elf_eh_frame_entry_present): Declare.
	(_bfd_elf_section_for_symbol): Declare.
	* elf-eh-frame.c (bfd_elf_discard_eh_frame_entry): New function.
	(bfd_elf_record_eh_frame_entry): New function.
	(_bfd_elf_parse_eh_frame_entry): New function.
	(_bfd_elf_parse_eh_frame): Update hdr_info field references.
	(cmp_eh_frame_hdr): New function.
	(add_eh_frame_hdr_terminator): New function.
	(_bfd_elf_end_eh_frame_parsing): New function.
	(find_merged_cie): Update hdr_info field references.
	(_bfd_elf_discard_section_eh_frame): Likewise.
	(_bfd_elf_discard_section_eh_frame_hdr): Add Compact EH support.
	(_bfd_elf_eh_frame_entry_present): New function.
	(_bfd_elf_maybe_strip_eh_frame_hdr): Add Compact EH support.
	(_bfd_elf_write_section_eh_frame_entry): New function.
	(_bfd_elf_write_section_eh_frame): Update hdr_info field references.
	(_bfd_elf_fixup_eh_frame_hdr): New function.
	(write_compact_eh_frame_hdr): New function.
	(write_dwarf_eh_frame_hdr): New function.
	(_bfd_elf_write_section_eh_frame_hdr): Add Compact EH support.
	* elflink.c (_bfd_elf_section_for_symbol): New function.
	(elf_section_ignore_discarded_relocs): Add Compact EH support.
	(elf_link_input_bfd): Likewise.
	(bfd_elf_final_link): Likewise.
	(_bfd_elf_gc_mark): Likewise.
	(bfd_elf_parse_eh_frame_entries): New function.
	(bfd_elf_gc_sections): Add Compact EH support.
	(bfd_elf_discard_info): Likewise.
	* elfxx-mips.c: Include dwarf2.h.
	(_bfd_mips_elf_compact_eh_encoding): New function.
	(_bfd_mips_elf_cant_unwind_opcode): New function.
	* elfxx-mips.h (_bfd_mips_elf_compact_eh_encoding): Declare.
	(_bfd_mips_elf_cant_unwind_opcode): Declare.
	(elf_backend_compact_eh_encoding): Define.
	(elf_backend_cant_unwind_opcode): Define.
	* elfxx-target.h (elf_backend_compact_eh_encoding): Provide default.
	(elf_backend_cant_unwind_opcode): Provide default.
	(elf_backend_data elfNN_bed): Add elf_backend_compact_eh_encoding and
	elf_backend_cant_unwind_opcode.
	* section.c (SEC_INFO_TYPE_EH_FRAME_ENTRY): Add definition.

	gas/
	* config/tc-alpha.c (all_cfi_sections): Declare.
	(s_alpha_ent): Initialize all_cfi_sections.
	(alpha_elf_md_end): Invoke cfi_set_sections.
	* config/tc-mips.c (md_apply_fix):  Handle BFD_RELOC_NONE.
	(s_ehword): Use BFD_RELOC_32_PCREL.
	(mips_fix_adjustable): Handle BFD_RELOC_32_PCREL.
	(mips_cfi_reloc_for_encoding): New function.
	* tc-mips.h (DWARF2_FDE_RELOC_SIZE): Redefine.
	(DWARF2_FDE_RELOC_ENCODING): Define.
	(tc_cfi_reloc_for_encoding): Define.
	(mips_cfi_reloc_for_encoding): Define.
	(tc_compact_eh_opcode_stop): Define.
	(tc_compact_eh_opcode_pad): Define.
	* doc/as.texinfo: Document Compact EH extensions.
	* doc/internals.texi: Likewise.
	* dw2gencfi.c (EH_FRAME_LINKONCE): Redefine.
	(tc_cfi_reloc_for_encoding): Provide default.
	(compact_eh): Declare.
	(emit_expr_encoded): New function.
	(get_debugseg_name): Add Compact EH support.
	(alloc_debugseg_item): Likewise.
	(cfi_set_sections): New function.
	(dot_cfi_fde_data): New function.
	(dot_cfi_personality_id): New function.
	(dot_cfi_inline_lsda): New function.
	(cfi_pseudo_table): Add cfi_fde_data, cfi_personality_id,
	and cfi_inline_lsda.
	(dot_cfi_personality): Add Compact EH support.
	(dot_cfi_lsda): Likewise.
	(dot_cfi_sections): Likewise.
	(dot_cfi_startproc): Likewise.
	(get_cfi_seg): Likewise.
	(output_compact_unwind_data): New function.
	(output_cfi_insn): Add Compact EH support.
	(output_cie): Likewise.
	(output_fde): Likewise.
	(cfi_finish): Likewise.
	(cfi_emit_eh_header): New function.
	(output_eh_header): New function.
	* dw2gencfi.h (cfi_set_sections): Declare.
	(SUPPORT_COMPACT_EH): Define.
	(MULTIPLE_FRAME_SECTIONS): Define.
	New enumeration to describe the Compact EH header format.
	(fde_entry): Add new fields personality_id, eh_header_type, eh_data_size,
	eh_data, eh_loc and sections.
	(CFI_EMIT_eh_frame, CFI_EMIT_debug_frame, CFI_EMIT_target,
	CFI_EMIT_eh_frame_compact): Define.

2015-05-22  Catherine Moore  <clm@codesourcery.com>
	    Bernd Schmidt <bernds@codesourcery.com>

	gas/testsuite/
	* gas/mips/mips.exp: Run new tests.

	* gas/mips/compact-eh-1.s: New file.
	* gas/mips/compact-eh-2.s: New file.
	* gas/mips/compact-eh-3.s: New file.
	* gas/mips/compact-eh-4.s: New file.
	* gas/mips/compact-eh-5.s: New file.
	* gas/mips/compact-eh-6.s: New file.
	* gas/mips/compact-eh-7.s: New file.
	* gas/mips/compact-eh-eb-1.d: New file.
	* gas/mips/compact-eh-eb-2.d: New file.
	* gas/mips/compact-eh-eb-3.d: New file.
	* gas/mips/compact-eh-eb-4.d: New file.
	* gas/mips/compact-eh-eb-5.d: New file.
	* gas/mips/compact-eh-eb-6.d: New file.
	* gas/mips/compact-eh-eb-7.d: New file.
	* gas/mips/compact-eh-el-1.d: New file.
	* gas/mips/compact-eh-el-2.d: New file.
	* gas/mips/compact-eh-el-3.d: New file.
	* gas/mips/compact-eh-el-4.d: New file.
	* gas/mips/compact-eh-el-5.d: New file.
	* gas/mips/compact-eh-el-6.d: New file.
	* gas/mips/compact-eh-el-7.d: New file.
	* gas/mips/compact-eh-err1.l: New file.
	* gas/mips/compact-eh-err1.s: New file.
	* gas/mips/compact-eh-err2.l: New file.
	* gas/mips/compact-eh-err2.s: New file.

2015-05-22  Catherine Moore  <clm@codesourcery.com>

	include/
	* bfdlink.h: Rename eh_frame_hdr to eh_frame_hdr_type.

2015-05-22  Catherine Moore  <clm@codesourcery.com>
	    Paul Brook <paul@codesourcery.com>

	ld/
	* emultempl/elf32.em (gld${EMULATION_NAME}_after_open):
	Add Compact EH support.
	* scripttempl/elf.sc: Handle .eh_frame_entry and .gnu_extab
	sections.

2015-05-22  Catherine Moore  <clm@codesourcery.com>

	ld/testsuite/
	* ld-mips-elf/compact-eh.ld: New linker script.
	* ld-mips-elf/compact-eh1.d: New.
	* ld-mips-elf/compact-eh1.s: New.
	* ld-mips-elf/compact-eh1a.s: New.
	* ld-mips-elf/compact-eh1b.s: New.
	* ld-mips-elf/compact-eh2.d: New.
	* ld-mips-elf/compact-eh2.s: New.
	* ld-mips-elf/compact-eh3.d: New.
	* ld-mips-elf/compact-eh3.s: New.
	* ld-mips-elf/compact-eh3a.s: New.
	* ld-mips-elf/compact-eh4.d: New.
	* ld-mips-elf/compact-eh5.d: New.
	* ld-mips-elf/compact-eh6.d: New.
	* ld-mips-elf/mips-elf.exp: Run new tests.

35 files changed, 1547 insertions, 151 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a0ab897..25638ab 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,56 @@
+2015-05-28  Catherine Moore  <clm@codesourcery.com>
+            Bernd Schmidt <bernds@codesourcery.com>
+            Paul Brook <paul@codesourcery.com>
+
+	gas/
+	* config/tc-alpha.c (all_cfi_sections): Declare.
+	(s_alpha_ent): Initialize all_cfi_sections.
+	(alpha_elf_md_end): Invoke cfi_set_sections.
+	* config/tc-mips.c (md_apply_fix):  Handle BFD_RELOC_NONE.
+	(s_ehword): Use BFD_RELOC_32_PCREL.
+	(mips_fix_adjustable): Handle BFD_RELOC_32_PCREL.
+	(mips_cfi_reloc_for_encoding): New function.
+	* tc-mips.h (DWARF2_FDE_RELOC_SIZE): Redefine.
+	(DWARF2_FDE_RELOC_ENCODING): Define.
+	(tc_cfi_reloc_for_encoding): Define.
+	(mips_cfi_reloc_for_encoding): Define.
+	(tc_compact_eh_opcode_stop): Define.
+	(tc_compact_eh_opcode_pad): Define.
+	* doc/as.texinfo: Document Compact EH extensions.
+	* doc/internals.texi: Likewise.
+	* dw2gencfi.c (EH_FRAME_LINKONCE): Redefine.
+	(tc_cfi_reloc_for_encoding): Provide default.
+	(compact_eh): Declare.
+	(emit_expr_encoded): New function.
+	(get_debugseg_name): Add Compact EH support.
+	(alloc_debugseg_item): Likewise.
+	(cfi_set_sections): New function.
+	(dot_cfi_fde_data): New function.
+	(dot_cfi_personality_id): New function.
+	(dot_cfi_inline_lsda): New function.
+	(cfi_pseudo_table): Add cfi_fde_data, cfi_personality_id,
+	and cfi_inline_lsda.
+	(dot_cfi_personality): Add Compact EH support.
+	(dot_cfi_lsda): Likewise.
+	(dot_cfi_sections): Likewise.
+	(dot_cfi_startproc): Likewise.
+	(get_cfi_seg): Likewise.
+	(output_compact_unwind_data): New function.
+	(output_cfi_insn): Add Compact EH support.
+	(output_cie): Likewise.
+	(output_fde): Likewise.
+	(cfi_finish): Likewise.
+	(cfi_emit_eh_header): New function.
+	(output_eh_header): New function.
+	* dw2gencfi.h (cfi_set_sections): Declare.
+	(SUPPORT_COMPACT_EH): Define.
+	(MULTIPLE_FRAME_SECTIONS): Define.
+	New enumeration to describe the Compact EH header format.
+	(fde_entry): Add new fields personality_id, eh_header_type, eh_data_size,
+	eh_data, eh_loc and sections.
+	(CFI_EMIT_eh_frame, CFI_EMIT_debug_frame, CFI_EMIT_target,
+	CFI_EMIT_eh_frame_compact): Define.
+
 2015-05-26  Max Filippov  <jcmvbkbc@gmail.com>
 
 	* config/tc-xtensa.c (xtensa_move_literals): Check that
diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index 30f180f..2a7466a 100644
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -3691,6 +3691,8 @@ static struct alpha_elf_frame_data *all_frame_data;
 static struct alpha_elf_frame_data **plast_frame_data = &all_frame_data;
 static struct alpha_elf_frame_data *cur_frame_data;
 
+extern int all_cfi_sections;
+
 /* Handle the .section pseudo-op.  This is like the usual one, but it
    clears alpha_insn_label and restores auto alignment.  */
 
@@ -3714,6 +3716,8 @@ s_alpha_ent (int dummy ATTRIBUTE_UNUSED)
       char *name, name_end;
       name = input_line_pointer;
       name_end = get_symbol_end ();
+      /* CFI_EMIT_eh_frame is the default.  */
+      all_cfi_sections = CFI_EMIT_eh_frame;
 
       if (! is_name_beginner (*name))
 	{
@@ -4061,6 +4065,7 @@ alpha_elf_md_end (void)
 				      S_GET_VALUE (p->func_sym),
 				      symbol_get_frag (p->func_sym)));
 
+	cfi_set_sections ();
 	cfi_set_return_column (p->ra_regno);
 	cfi_add_CFA_def_cfa_register (30);
 	if (p->fp_regno != 30 || p->mask || p->fmask || p->frame_size)
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 40e38f8..8f2ec65 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -14840,7 +14840,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 	      || fixP->fx_r_type == BFD_RELOC_MICROMIPS_SUB
 	      || fixP->fx_r_type == BFD_RELOC_VTABLE_INHERIT
 	      || fixP->fx_r_type == BFD_RELOC_VTABLE_ENTRY
-	      || fixP->fx_r_type == BFD_RELOC_MIPS_TLS_DTPREL64);
+	      || fixP->fx_r_type == BFD_RELOC_MIPS_TLS_DTPREL64
+	      || fixP->fx_r_type == BFD_RELOC_NONE);
 
   buf = fixP->fx_frag->fr_literal + fixP->fx_where;
 
@@ -15110,6 +15111,7 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
         S_SET_WEAK (fixP->fx_addsy);
       break;
 
+    case BFD_RELOC_NONE:
     case BFD_RELOC_VTABLE_ENTRY:
       fixP->fx_done = 0;
       break;
@@ -16304,7 +16306,7 @@ s_ehword (int ignore ATTRIBUTE_UNUSED)
   p = frag_more (4);
   md_number_to_chars (p, 0, 4);
   fix_new_exp (frag_now, p - frag_now->fr_literal, 4, &ex, FALSE,
-	       BFD_RELOC_MIPS_EH);
+	       BFD_RELOC_32_PCREL);
 
   demand_empty_rest_of_line ();
 }
@@ -17056,6 +17058,10 @@ mips_fix_adjustable (fixS *fixp)
   if (fixp->fx_addsy == NULL)
     return 1;
 
+  /* Allow relocs used for EH tables.  */
+  if (fixp->fx_r_type == BFD_RELOC_32_PCREL)
+    return 1;
+
   /* If symbol SYM is in a mergeable section, relocations of the form
      SYM + 0 can usually be made section-relative.  The mergeable data
      is then identified by the section offset rather than by the symbol.
@@ -19117,3 +19123,13 @@ md_mips_end (void)
 				Tag_GNU_MIPS_ABI_FP, fpabi);
     }
 }
+
+/*  Returns the relocation type required for a particular CFI encoding.  */
+
+bfd_reloc_code_real_type
+mips_cfi_reloc_for_encoding (int encoding)
+{
+  if (encoding == (DW_EH_PE_sdata4 | DW_EH_PE_pcrel))
+    return BFD_RELOC_32_PCREL;
+  else return BFD_RELOC_NONE;
+}
diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h
index dd8350c..6cb3868 100644
--- a/gas/config/tc-mips.h
+++ b/gas/config/tc-mips.h
@@ -176,7 +176,9 @@ extern enum dwarf2_format mips_dwarf2_format (asection *);
 
 extern int mips_dwarf2_addr_size (void);
 #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size ()
-#define DWARF2_FDE_RELOC_SIZE mips_dwarf2_addr_size ()
+#define DWARF2_FDE_RELOC_SIZE (compact_eh ? 4 : mips_dwarf2_addr_size ())
+#define DWARF2_FDE_RELOC_ENCODING(enc) \
+  (enc | (compact_eh ? DW_EH_PE_pcrel : 0))
 
 #define TARGET_USE_CFIPOP 1
 
@@ -189,6 +191,15 @@ extern int tc_mips_regname_to_dw2regnum (char *regname);
 #define DWARF2_DEFAULT_RETURN_COLUMN 31
 #define DWARF2_CIE_DATA_ALIGNMENT (-4)
 
+#if defined(OBJ_ELF)
+
+#define tc_cfi_reloc_for_encoding mips_cfi_reloc_for_encoding
+extern bfd_reloc_code_real_type mips_cfi_reloc_for_encoding (int encoding);
+
+#define tc_compact_eh_opcode_stop 0x5c
+#define tc_compact_eh_opcode_pad 0x5f
+
+#endif
 #define DIFF_EXPR_OK
 /* We define DIFF_EXPR_OK because of R_MIPS_PC32, but we have no
    64-bit form for n64 CFIs.  */
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index b5e405a..5710e1c 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -4624,6 +4624,9 @@ if @var{section_list} is @code{.debug_frame}, @code{.debug_frame} is emitted.
 To emit both use @code{.eh_frame, .debug_frame}.  The default if this
 directive is not used is @code{.cfi_sections .eh_frame}.
 
+On targets that support compact unwinding tables these can be generated
+by specifying @code{.eh_frame_entry} instead of @code{.eh_frame}.
+
 @subsection @code{.cfi_startproc [simple]}
 @cindex @code{cfi_startproc} directive
 @code{.cfi_startproc} is used at the beginning of each function that
@@ -4641,6 +4644,7 @@ unwind entry previously opened by
 @code{.cfi_startproc}, and emits it to @code{.eh_frame}.
 
 @subsection @code{.cfi_personality @var{encoding} [, @var{exp}]}
+@cindex @code{cfi_personality} directive
 @code{.cfi_personality} defines personality routine and its encoding.
 @var{encoding} must be a constant determining how the personality
 should be encoded.  If it is 255 (@code{DW_EH_PE_omit}), second
@@ -4651,13 +4655,47 @@ can be loaded from, not the personality routine itself.
 The default after @code{.cfi_startproc} is @code{.cfi_personality 0xff},
 no personality routine.
 
+@subsection @code{.cfi_personality_id @var{id}}
+@cindex @code{cfi_personality_id} directive
+@code{cfi_personality_id} defines a personality routine by its index as
+defined in a compact unwinding format.
+Only valid when generating compact EH frames (i.e.
+with @code{.cfi_sections eh_frame_entry}.
+
+@subsection @code{.cfi_fde_data [@var{opcode1} [, @dots{}]]}
+@cindex @code{cfi_fde_data} directive
+@code{cfi_fde_data} is used to describe the compact unwind opcodes to be
+used for the current function.  These are emitted inline in the
+@code{.eh_frame_entry} section if small enough and there is no LSDA, or
+in the @code{.gnu.extab} section otherwise.
+Only valid when generating compact EH frames (i.e.
+with @code{.cfi_sections eh_frame_entry}.
+
 @subsection @code{.cfi_lsda @var{encoding} [, @var{exp}]}
+@section @code{.cfi_lsda @var{encoding} [, @var{exp}]}
 @code{.cfi_lsda} defines LSDA and its encoding.
 @var{encoding} must be a constant determining how the LSDA
-should be encoded.  If it is 255 (@code{DW_EH_PE_omit}), second
-argument is not present, otherwise second argument should be a constant
+should be encoded.  If it is 255 (@code{DW_EH_PE_omit}), the second
+argument is not present, otherwise the second argument should be a constant
 or a symbol name.  The default after @code{.cfi_startproc} is @code{.cfi_lsda 0xff},
-no LSDA.
+meaning that no LSDA is present.
+
+@subsection @code{.cfi_inline_lsda} [@var{align}]
+@code{.cfi_inline_lsda} marks the start of a LSDA data section and
+switches to the corresponding @code{.gnu.extab} section.
+Must be preceded by a CFI block containing a @code{.cfi_lsda} directive.
+Only valid when generating compact EH frames (i.e.
+with @code{.cfi_sections eh_frame_entry}.
+
+The table header and unwinding opcodes will be generated at this point,
+so that they are immediately followed by the LSDA data.  The symbol
+referenced by the @code{.cfi_lsda} directive should still be defined
+in case a fallback FDE based encoding is used.  The LSDA data is terminated
+by a section directive.
+
+The optional @var{align} argument specifies the alignment required.
+The alignment is specified as a power of two, as with the
+@code{.p2align} directive.
 
 @subsection @code{.cfi_def_cfa @var{register}, @var{offset}}
 @code{.cfi_def_cfa} defines a rule for computing CFA as: @i{take
diff --git a/gas/doc/internals.texi b/gas/doc/internals.texi
index 3dc3148..7649ce5 100644
--- a/gas/doc/internals.texi
+++ b/gas/doc/internals.texi
@@ -1473,6 +1473,12 @@ completed, but before the relocations have been generated.
 If you define this macro, GAS will call it after the relocs have been
 generated.
 
+@item tc_cfi_reloc_for_encoding
+@cindex tc_cfi_reloc_for_encoding
+This macro is used to indicate whether a cfi encoding requires a relocation.
+It should return the required relocation type.  Defining this macro implies
+that Compact EH is supported.
+
 @item md_post_relax_hook
 If you define this macro, GAS will call it after relaxing and sizing the
 segments.
diff --git a/gas/dw2gencfi.c b/gas/dw2gencfi.c
index ef97e18..87f135b 100644
--- a/gas/dw2gencfi.c
+++ b/gas/dw2gencfi.c
@@ -75,6 +75,8 @@
 # define tc_cfi_endproc(fde) ((void) (fde))
 #endif
 
+#define EH_FRAME_LINKONCE (SUPPORT_FRAME_LINKONCE || compact_eh)
+
 #ifndef DWARF2_FORMAT
 #define DWARF2_FORMAT(SEC) dwarf2_format_32bit
 #endif
@@ -83,7 +85,7 @@
 #define DWARF2_ADDR_SIZE(bfd) (bfd_arch_bits_per_address (bfd) / 8)
 #endif
 
-#if SUPPORT_FRAME_LINKONCE
+#if MULTIPLE_FRAME_SECTIONS
 #define CUR_SEG(structp) structp->cur_seg
 #define SET_CUR_SEG(structp, seg) structp->cur_seg = seg
 #define HANDLED(structp) structp->handled
@@ -95,6 +97,10 @@
 #define SET_HANDLED(structp, val) (void) (0 && val)
 #endif
 
+#ifndef tc_cfi_reloc_for_encoding
+#define tc_cfi_reloc_for_encoding(e) BFD_RELOC_NONE
+#endif
+
 /* Private segment collection list.  */
 struct dwcfi_seg_list
 {
@@ -103,10 +109,115 @@ struct dwcfi_seg_list
   char * seg_name;
 };
 
-#define FRAME_NAME ".eh_frame"
+#ifdef SUPPORT_COMPACT_EH
+static bfd_boolean compact_eh;
+#else
+#define compact_eh 0
+#endif
 
 static struct hash_control *dwcfi_hash;
+
+/* Emit a single byte into the current segment.  */
+
+static inline void
+out_one (int byte)
+{
+  FRAG_APPEND_1_CHAR (byte);
+}
+
+/* Emit a two-byte word into the current segment.  */
+
+static inline void
+out_two (int data)
+{
+  md_number_to_chars (frag_more (2), data, 2);
+}
+
+/* Emit a four byte word into the current segment.  */
+
+static inline void
+out_four (int data)
+{
+  md_number_to_chars (frag_more (4), data, 4);
+}
+
+/* Emit an unsigned "little-endian base 128" number.  */
+
+static void
+out_uleb128 (addressT value)
+{
+  output_leb128 (frag_more (sizeof_leb128 (value, 0)), value, 0);
+}
+
+/* Emit an unsigned "little-endian base 128" number.  */
+
+static void
+out_sleb128 (offsetT value)
+{
+  output_leb128 (frag_more (sizeof_leb128 (value, 1)), value, 1);
+}
+
+static offsetT
+encoding_size (unsigned char encoding)
+{
+  if (encoding == DW_EH_PE_omit)
+    return 0;
+  switch (encoding & 0x7)
+    {
+    case 0:
+      return bfd_get_arch_size (stdoutput) == 64 ? 8 : 4;
+    case DW_EH_PE_udata2:
+      return 2;
+    case DW_EH_PE_udata4:
+      return 4;
+    case DW_EH_PE_udata8:
+      return 8;
+    default:
+      abort ();
+    }
+}
+
+/* Emit expression EXP in ENCODING.  If EMIT_ENCODING is true, first
+   emit a byte containing ENCODING.  */
+
+static void
+emit_expr_encoded (expressionS *exp, int encoding, bfd_boolean emit_encoding)
+{
+  offsetT size = encoding_size (encoding);
+  bfd_reloc_code_real_type code;
+
+  if (encoding == DW_EH_PE_omit)
+    return;
 
+  if (emit_encoding)
+    out_one (encoding);
+
+  code = tc_cfi_reloc_for_encoding (encoding);
+  if (code != BFD_RELOC_NONE)
+    {
+      reloc_howto_type *howto = bfd_reloc_type_lookup (stdoutput, code);
+      char *p = frag_more (size);
+      md_number_to_chars (p, 0, size);
+      fix_new (frag_now, p - frag_now->fr_literal, size, exp->X_add_symbol,
+	       exp->X_add_number, howto->pc_relative, code);
+    }
+  else if ((encoding & 0x70) == DW_EH_PE_pcrel)
+    {
+#if CFI_DIFF_EXPR_OK
+      expressionS tmp = *exp;
+      tmp.X_op = O_subtract;
+      tmp.X_op_symbol = symbol_temp_new_now ();
+      emit_expr (&tmp, size);
+#elif defined (tc_cfi_emit_pcrel_expr)
+      tc_cfi_emit_pcrel_expr (exp, size);
+#else
+      abort ();
+#endif
+    }
+  else
+    emit_expr (exp, size);
+}
+
 /* Build based on segment the derived .debug_...
    segment name containing origin segment's postfix name part.  */
 
@@ -128,7 +239,13 @@ get_debugseg_name (segT seg, const char *base_name)
       dot = strchr (name + 1, '.');
 
       if (!dollar && !dot)
-	name = "";
+	{
+	  if (!strcmp (base_name, ".eh_frame_entry")
+	      && strcmp (name, ".text") != 0)
+	    return concat (base_name, ".", name, NULL);
+
+	  name = "";
+	}
       else if (!dollar)
 	name = dot;
       else if (!dot)
@@ -160,6 +277,9 @@ alloc_debugseg_item (segT seg, int subseg, char *name)
 static segT
 is_now_linkonce_segment (void)
 {
+  if (compact_eh)
+    return now_seg;
+
   if ((bfd_get_section_flags (stdoutput, now_seg)
        & (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD
 	  | SEC_LINK_DUPLICATES_ONE_ONLY | SEC_LINK_DUPLICATES_SAME_SIZE
@@ -272,12 +392,13 @@ struct cfi_escape_data
 struct cie_entry
 {
   struct cie_entry *next;
-#if SUPPORT_FRAME_LINKONCE
+#if MULTIPLE_FRAME_SECTIONS
   segT cur_seg;
 #endif
   symbolS *start_address;
   unsigned int return_column;
   unsigned int signal_frame;
+  unsigned char fde_encoding;
   unsigned char per_encoding;
   unsigned char lsda_encoding;
   expressionS personality;
@@ -327,6 +448,7 @@ alloc_fde_entry (void)
   fde->return_column = DWARF2_DEFAULT_RETURN_COLUMN;
   fde->per_encoding = DW_EH_PE_omit;
   fde->lsda_encoding = DW_EH_PE_omit;
+  fde->eh_header_type = EH_COMPACT_UNKNOWN;
 
   return fde;
 }
@@ -337,6 +459,11 @@ alloc_fde_entry (void)
 /* Construct a new INSN structure and add it to the end of the insn list
    for the currently active FDE.  */
 
+static bfd_boolean cfi_sections_set = FALSE;
+static int cfi_sections = CFI_EMIT_eh_frame;
+int all_cfi_sections = 0;
+static struct fde_entry *last_fde;
+
 static struct cfi_insn_data *
 alloc_cfi_insn_data (void)
 {
@@ -378,6 +505,12 @@ cfi_set_return_column (unsigned regno)
   frchain_now->frch_cfi_data->cur_fde_data->return_column = regno;
 }
 
+void
+cfi_set_sections (void)
+{
+  frchain_now->frch_cfi_data->cur_fde_data->sections = all_cfi_sections;
+}
+
 /* Universal functions to store new instructions.  */
 
 static void
@@ -560,9 +693,12 @@ static void dot_cfi_escape (int);
 static void dot_cfi_sections (int);
 static void dot_cfi_startproc (int);
 static void dot_cfi_endproc (int);
+static void dot_cfi_fde_data (int);
 static void dot_cfi_personality (int);
+static void dot_cfi_personality_id (int);
 static void dot_cfi_lsda (int);
 static void dot_cfi_val_encoded_addr (int);
+static void dot_cfi_inline_lsda (int);
 static void dot_cfi_label (int);
 
 const pseudo_typeS cfi_pseudo_table[] =
@@ -570,6 +706,7 @@ const pseudo_typeS cfi_pseudo_table[] =
     { "cfi_sections", dot_cfi_sections, 0 },
     { "cfi_startproc", dot_cfi_startproc, 0 },
     { "cfi_endproc", dot_cfi_endproc, 0 },
+    { "cfi_fde_data", dot_cfi_fde_data, 0 },
     { "cfi_def_cfa", dot_cfi, DW_CFA_def_cfa },
     { "cfi_def_cfa_register", dot_cfi, DW_CFA_def_cfa_register },
     { "cfi_def_cfa_offset", dot_cfi, DW_CFA_def_cfa_offset },
@@ -587,8 +724,10 @@ const pseudo_typeS cfi_pseudo_table[] =
     { "cfi_escape", dot_cfi_escape, 0 },
     { "cfi_signal_frame", dot_cfi, CFI_signal_frame },
     { "cfi_personality", dot_cfi_personality, 0 },
+    { "cfi_personality_id", dot_cfi_personality_id, 0 },
     { "cfi_lsda", dot_cfi_lsda, 0 },
     { "cfi_val_encoded_addr", dot_cfi_val_encoded_addr, 0 },
+    { "cfi_inline_lsda", dot_cfi_inline_lsda, 0 },
     { "cfi_label", dot_cfi_label, 0 },
     { NULL, NULL, 0 }
   };
@@ -847,14 +986,15 @@ dot_cfi_personality (int ignored ATTRIBUTE_UNUSED)
     }
 
   if ((encoding & 0xff) != encoding
-      || ((encoding & 0x70) != 0
+      || ((((encoding & 0x70) != 0
 #if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
-	  && (encoding & 0x70) != DW_EH_PE_pcrel
+	   && (encoding & 0x70) != DW_EH_PE_pcrel
 #endif
 	  )
 	 /* leb128 can be handled, but does something actually need it?  */
-      || (encoding & 7) == DW_EH_PE_uleb128
-      || (encoding & 7) > DW_EH_PE_udata8)
+	   || (encoding & 7) == DW_EH_PE_uleb128
+	   || (encoding & 7) > DW_EH_PE_udata8)
+	&& tc_cfi_reloc_for_encoding (encoding) == BFD_RELOC_NONE))
     {
       as_bad (_("invalid or unsupported encoding in .cfi_personality"));
       ignore_rest_of_line ();
@@ -917,14 +1057,15 @@ dot_cfi_lsda (int ignored ATTRIBUTE_UNUSED)
     }
 
   if ((encoding & 0xff) != encoding
-      || ((encoding & 0x70) != 0
+      || ((((encoding & 0x70) != 0
 #if CFI_DIFF_LSDA_OK || defined tc_cfi_emit_pcrel_expr
-	  && (encoding & 0x70) != DW_EH_PE_pcrel
+	    && (encoding & 0x70) != DW_EH_PE_pcrel
 #endif
-	  )
+	   )
 	 /* leb128 can be handled, but does something actually need it?  */
-      || (encoding & 7) == DW_EH_PE_uleb128
-      || (encoding & 7) > DW_EH_PE_udata8)
+	   || (encoding & 7) == DW_EH_PE_uleb128
+	   || (encoding & 7) > DW_EH_PE_udata8)
+	  && tc_cfi_reloc_for_encoding (encoding) == BFD_RELOC_NONE))
     {
       as_bad (_("invalid or unsupported encoding in .cfi_lsda"));
       ignore_rest_of_line ();
@@ -1050,12 +1191,6 @@ dot_cfi_label (int ignored ATTRIBUTE_UNUSED)
   demand_empty_rest_of_line ();
 }
 
-/* By default emit .eh_frame only, not .debug_frame.  */
-#define CFI_EMIT_eh_frame	(1 << 0)
-#define CFI_EMIT_debug_frame	(1 << 1)
-#define CFI_EMIT_target		(1 << 2)
-static int cfi_sections = CFI_EMIT_eh_frame;
-
 static void
 dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
 {
@@ -1075,6 +1210,13 @@ dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
 	  sections |= CFI_EMIT_eh_frame;
 	else if (strncmp (name, ".debug_frame", sizeof ".debug_frame") == 0)
 	  sections |= CFI_EMIT_debug_frame;
+#if SUPPORT_COMPACT_EH
+	else if (strncmp (name, ".eh_frame_entry", sizeof ".eh_frame_entry") == 0)
+	  {
+	    compact_eh = TRUE;
+	    sections |= CFI_EMIT_eh_frame_compact;
+	  }
+#endif
 #ifdef tc_cfi_section_name
 	else if (strcmp (name, tc_cfi_section_name) == 0)
 	  sections |= CFI_EMIT_target;
@@ -1103,6 +1245,9 @@ dot_cfi_sections (int ignored ATTRIBUTE_UNUSED)
       }
 
   demand_empty_rest_of_line ();
+  if (cfi_sections_set && cfi_sections != sections)
+    as_bad (_("inconsistent uses of .cfi_sections"));
+  cfi_sections_set = TRUE;
   cfi_sections = sections;
 }
 
@@ -1138,6 +1283,8 @@ dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED)
     }
   demand_empty_rest_of_line ();
 
+  all_cfi_sections |= cfi_sections;
+  cfi_set_sections ();
   frchain_now->frch_cfi_data->cur_cfa_offset = 0;
   if (!simple)
     tc_cfi_frame_initial_instructions ();
@@ -1149,8 +1296,6 @@ dot_cfi_startproc (int ignored ATTRIBUTE_UNUSED)
 static void
 dot_cfi_endproc (int ignored ATTRIBUTE_UNUSED)
 {
-  struct fde_entry *fde;
-
   if (frchain_now->frch_cfi_data == NULL)
     {
       as_bad (_(".cfi_endproc without corresponding .cfi_startproc"));
@@ -1158,58 +1303,253 @@ dot_cfi_endproc (int ignored ATTRIBUTE_UNUSED)
       return;
     }
 
-  fde = frchain_now->frch_cfi_data->cur_fde_data;
+  last_fde = frchain_now->frch_cfi_data->cur_fde_data;
 
   cfi_end_fde (symbol_temp_new_now ());
 
   demand_empty_rest_of_line ();
 
   if ((cfi_sections & CFI_EMIT_target) != 0)
-    tc_cfi_endproc (fde);
+    tc_cfi_endproc (last_fde);
 }
 
-
-/* Emit a single byte into the current segment.  */
-
-static inline void
-out_one (int byte)
+static segT
+get_cfi_seg (segT cseg, const char *base, flagword flags, int align)
 {
-  FRAG_APPEND_1_CHAR (byte);
+  /* Exclude .debug_frame sections for Compact EH.  */
+  if (SUPPORT_FRAME_LINKONCE || ((flags & SEC_DEBUGGING) == 0 && compact_eh))
+    {
+      struct dwcfi_seg_list *l;
+
+      l = dwcfi_hash_find_or_make (cseg, base, flags);
+
+      cseg = l->seg;
+      subseg_set (cseg, l->subseg);
+    }
+  else
+    {
+      cseg = subseg_new (base, 0);
+      bfd_set_section_flags (stdoutput, cseg, flags);
+    }
+  record_alignment (cseg, align);
+  return cseg;
 }
 
-/* Emit a two-byte word into the current segment.  */
+#if SUPPORT_COMPACT_EH
+static void
+dot_cfi_personality_id (int ignored ATTRIBUTE_UNUSED)
+{
+  struct fde_entry *fde;
 
-static inline void
-out_two (int data)
+  if (frchain_now->frch_cfi_data == NULL)
+    {
+      as_bad (_("CFI instruction used without previous .cfi_startproc"));
+      ignore_rest_of_line ();
+      return;
+    }
+
+  fde = frchain_now->frch_cfi_data->cur_fde_data;
+  fde->personality_id = cfi_parse_const ();
+  demand_empty_rest_of_line ();
+
+  if (fde->personality_id == 0 || fde->personality_id > 3)
+    {
+      as_bad (_("wrong argument to .cfi_personality_id"));
+      return;
+    }
+}
+
+static void
+dot_cfi_fde_data (int ignored ATTRIBUTE_UNUSED)
 {
-  md_number_to_chars (frag_more (2), data, 2);
+  if (frchain_now->frch_cfi_data == NULL)
+    {
+      as_bad (_(".cfi_fde_data without corresponding .cfi_startproc"));
+      ignore_rest_of_line ();
+      return;
+    }
+
+  last_fde = frchain_now->frch_cfi_data->cur_fde_data;
+
+  if ((cfi_sections & CFI_EMIT_target) != 0
+      || (cfi_sections & CFI_EMIT_eh_frame_compact) != 0)
+    {
+      struct cfi_escape_data *head, **tail, *e;
+      int num_ops = 0;
+
+      tail = &head;
+      if (!is_it_end_of_statement ())
+	{
+	  num_ops = 0;
+	  do
+	    {
+	      e = (struct cfi_escape_data *) xmalloc (sizeof (*e));
+	      do_parse_cons_expression (&e->exp, 1);
+	      *tail = e;
+	      tail = &e->next;
+	      num_ops++;
+	    }
+	  while (*input_line_pointer++ == ',');
+	  --input_line_pointer;
+	}
+      *tail = NULL;
+
+      if (last_fde->lsda_encoding != DW_EH_PE_omit)
+	last_fde->eh_header_type = EH_COMPACT_HAS_LSDA;
+      else if (num_ops <= 3 && last_fde->per_encoding == DW_EH_PE_omit)
+	last_fde->eh_header_type = EH_COMPACT_INLINE;
+      else
+	last_fde->eh_header_type = EH_COMPACT_OUTLINE;
+
+      if (last_fde->eh_header_type == EH_COMPACT_INLINE)
+	num_ops = 3;
+
+      last_fde->eh_data_size = num_ops;
+      last_fde->eh_data = (bfd_byte *) xmalloc (num_ops);
+      num_ops = 0;
+      while (head)
+	{
+	  e = head;
+	  head = e->next;
+	  last_fde->eh_data[num_ops++] = e->exp.X_add_number;
+	  free (e);
+	}
+      if (last_fde->eh_header_type == EH_COMPACT_INLINE)
+	while (num_ops < 3)
+	  last_fde->eh_data[num_ops++] = tc_compact_eh_opcode_stop;
+    }
+
+  demand_empty_rest_of_line ();
 }
 
-/* Emit a four byte word into the current segment.  */
+/* Function to emit the compact unwinding opcodes stored in the
+   fde's eh_data field.  The end of the opcode data will be
+   padded to the value in align.  */
 
-static inline void
-out_four (int data)
+static void
+output_compact_unwind_data (struct fde_entry *fde, int align)
 {
-  md_number_to_chars (frag_more (4), data, 4);
+  int data_size = fde->eh_data_size + 2;
+  int align_padding;
+  int amask;
+  char *p;
+
+  fde->eh_loc = symbol_temp_new_now ();
+
+  p = frag_more (1);
+  if (fde->personality_id != 0)
+    *p = fde->personality_id;
+  else if (fde->per_encoding != DW_EH_PE_omit)
+    {
+      *p = 0;
+      emit_expr_encoded (&fde->personality, fde->per_encoding, FALSE);
+      data_size += encoding_size (fde->per_encoding);
+    }
+  else
+    *p = 1;
+
+  amask = (1 << align) - 1;
+  align_padding = ((data_size + amask) & ~amask) - data_size;
+
+  p = frag_more (fde->eh_data_size + 1 + align_padding);
+  memcpy (p, fde->eh_data, fde->eh_data_size);
+  p += fde->eh_data_size;
+
+  while (align_padding-- > 0)
+    *(p++) = tc_compact_eh_opcode_pad;
+
+  *(p++) = tc_compact_eh_opcode_stop;
+  fde->eh_header_type = EH_COMPACT_OUTLINE_DONE;
 }
 
-/* Emit an unsigned "little-endian base 128" number.  */
+/* Handle the .cfi_inline_lsda directive.  */
+static void
+dot_cfi_inline_lsda (int ignored ATTRIBUTE_UNUSED)
+{
+  segT ccseg;
+  int align;
+  long max_alignment = 28;
+
+  if (!last_fde)
+    {
+      as_bad (_("unexpected .cfi_inline_lsda"));
+      ignore_rest_of_line ();
+      return;
+    }
+
+  if ((last_fde->sections & CFI_EMIT_eh_frame_compact) == 0)
+    {
+      as_bad (_(".cfi_inline_lsda not valid for this frame"));
+      ignore_rest_of_line ();
+      return;
+    }
+
+  if (last_fde->eh_header_type != EH_COMPACT_UNKNOWN
+      && last_fde->eh_header_type != EH_COMPACT_HAS_LSDA)
+    {
+      as_bad (_(".cfi_inline_lsda seen for frame without .cfi_lsda"));
+      ignore_rest_of_line ();
+      return;
+    }
+
+#ifdef md_flush_pending_output
+  md_flush_pending_output ();
+#endif
+
+  align = get_absolute_expression ();
+  if (align > max_alignment)
+    {
+      align = max_alignment;
+      as_bad (_("Alignment too large: %d. assumed."), align);
+    }
+  else if (align < 0)
+    {
+      as_warn (_("Alignment negative: 0 assumed."));
+      align = 0;
+    }
+
+  demand_empty_rest_of_line ();
+  ccseg = CUR_SEG (last_fde);
 
+  /* Open .gnu_extab section.  */
+  get_cfi_seg (ccseg, ".gnu_extab",
+	       (SEC_ALLOC | SEC_LOAD | SEC_DATA
+		| DWARF2_EH_FRAME_READ_ONLY),
+	       1);
+
+  frag_align (align, 0, 0);
+  record_alignment (now_seg, align);
+  if (last_fde->eh_header_type == EH_COMPACT_HAS_LSDA)
+    output_compact_unwind_data (last_fde, align);
+
+  last_fde = NULL;
+
+  return;
+}
+#else /* !SUPPORT_COMPACT_EH */
 static void
-out_uleb128 (addressT value)
+dot_cfi_inline_lsda (int ignored ATTRIBUTE_UNUSED)
 {
-  output_leb128 (frag_more (sizeof_leb128 (value, 0)), value, 0);
+  as_bad (_(".cfi_inline_lsda is not supported for this target"));
+  ignore_rest_of_line ();
 }
 
-/* Emit an unsigned "little-endian base 128" number.  */
-
 static void
-out_sleb128 (offsetT value)
+dot_cfi_fde_data (int ignored ATTRIBUTE_UNUSED)
 {
-  output_leb128 (frag_more (sizeof_leb128 (value, 1)), value, 1);
+  as_bad (_(".cfi_fde_data is not supported for this target"));
+  ignore_rest_of_line ();
 }
 
 static void
+dot_cfi_personality_id (int ignored ATTRIBUTE_UNUSED)
+{
+  as_bad (_(".cfi_personality_id is not supported for this target"));
+  ignore_rest_of_line ();
+}
+#endif
+
+static void
 output_cfi_insn (struct cfi_insn_data *insn)
 {
   offsetT offset;
@@ -1365,7 +1705,7 @@ output_cfi_insn (struct cfi_insn_data *insn)
     case CFI_val_encoded_addr:
       {
 	unsigned encoding = insn->u.ea.encoding;
-	offsetT encoding_size;
+	offsetT enc_size;
 
 	if (encoding == DW_EH_PE_omit)
 	  break;
@@ -1375,16 +1715,16 @@ output_cfi_insn (struct cfi_insn_data *insn)
 	switch (encoding & 0x7)
 	  {
 	  case DW_EH_PE_absptr:
-	    encoding_size = DWARF2_ADDR_SIZE (stdoutput);
+	    enc_size = DWARF2_ADDR_SIZE (stdoutput);
 	    break;
 	  case DW_EH_PE_udata2:
-	    encoding_size = 2;
+	    enc_size = 2;
 	    break;
 	  case DW_EH_PE_udata4:
-	    encoding_size = 4;
+	    enc_size = 4;
 	    break;
 	  case DW_EH_PE_udata8:
-	    encoding_size = 8;
+	    enc_size = 8;
 	    break;
 	  default:
 	    abort ();
@@ -1394,12 +1734,12 @@ output_cfi_insn (struct cfi_insn_data *insn)
 	   then use the smaller DW_OP_addr encoding.  */
 	if (insn->u.ea.encoding == DW_EH_PE_absptr)
 	  {
-	    out_uleb128 (1 + encoding_size);
+	    out_uleb128 (1 + enc_size);
 	    out_one (DW_OP_addr);
 	  }
 	else
 	  {
-	    out_uleb128 (1 + 1 + encoding_size);
+	    out_uleb128 (1 + 1 + enc_size);
 	    out_one (DW_OP_GNU_encoded_addr);
 	    out_one (encoding);
 
@@ -1409,14 +1749,14 @@ output_cfi_insn (struct cfi_insn_data *insn)
 		insn->u.ea.exp.X_op = O_subtract;
 		insn->u.ea.exp.X_op_symbol = symbol_temp_new_now ();
 #elif defined (tc_cfi_emit_pcrel_expr)
-		tc_cfi_emit_pcrel_expr (&insn->u.ea.exp, encoding_size);
+		tc_cfi_emit_pcrel_expr (&insn->u.ea.exp, enc_size);
 		break;
 #else
 		abort ();
 #endif
 	      }
 	  }
-	emit_expr (&insn->u.ea.exp, encoding_size);
+	emit_expr (&insn->u.ea.exp, enc_size);
       }
       break;
 
@@ -1429,26 +1769,6 @@ output_cfi_insn (struct cfi_insn_data *insn)
     }
 }
 
-static offsetT
-encoding_size (unsigned char encoding)
-{
-  if (encoding == DW_EH_PE_omit)
-    return 0;
-  switch (encoding & 0x7)
-    {
-    case 0:
-      return bfd_get_arch_size (stdoutput) == 64 ? 8 : 4;
-    case DW_EH_PE_udata2:
-      return 2;
-    case DW_EH_PE_udata4:
-      return 4;
-    case DW_EH_PE_udata8:
-      return 8;
-    default:
-      abort ();
-    }
-}
-
 static void
 output_cie (struct cie_entry *cie, bfd_boolean eh_frame, int align)
 {
@@ -1511,26 +1831,7 @@ output_cie (struct cie_entry *cie, bfd_boolean eh_frame, int align)
 	augmentation_size += 1 + encoding_size (cie->per_encoding);
       out_uleb128 (augmentation_size);		/* Augmentation size.  */
 
-      if (cie->per_encoding != DW_EH_PE_omit)
-	{
-	  offsetT size = encoding_size (cie->per_encoding);
-	  out_one (cie->per_encoding);
-	  exp = cie->personality;
-	  if ((cie->per_encoding & 0x70) == DW_EH_PE_pcrel)
-	    {
-#if CFI_DIFF_EXPR_OK
-	      exp.X_op = O_subtract;
-	      exp.X_op_symbol = symbol_temp_new_now ();
-	      emit_expr (&exp, size);
-#elif defined (tc_cfi_emit_pcrel_expr)
-	      tc_cfi_emit_pcrel_expr (&exp, size);
-#else
-	      abort ();
-#endif
-	    }
-	  else
-	    emit_expr (&exp, size);
-	}
+      emit_expr_encoded (&cie->personality, cie->per_encoding, TRUE);
 
       if (cie->lsda_encoding != DW_EH_PE_omit)
 	out_one (cie->lsda_encoding);
@@ -1553,6 +1854,11 @@ output_cie (struct cie_entry *cie, bfd_boolean eh_frame, int align)
 #if CFI_DIFF_EXPR_OK || defined tc_cfi_emit_pcrel_expr
   enc |= DW_EH_PE_pcrel;
 #endif
+#ifdef DWARF2_FDE_RELOC_ENCODING
+  /* Allow target to override encoding.  */
+  enc = DWARF2_FDE_RELOC_ENCODING (enc);
+#endif
+  cie->fde_encoding = enc;
   if (eh_frame)
     out_one (enc);
 
@@ -1613,30 +1919,44 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
       TC_DWARF2_EMIT_OFFSET (cie->start_address, offset_size);
     }
 
+  exp.X_op = O_symbol;
   if (eh_frame)
     {
-      exp.X_op = O_subtract;
-      exp.X_add_number = 0;
+      bfd_reloc_code_real_type code
+	= tc_cfi_reloc_for_encoding (cie->fde_encoding);
+      if (code != BFD_RELOC_NONE)
+	{
+	  reloc_howto_type *howto = bfd_reloc_type_lookup (stdoutput, code);
+	  char *p = frag_more (4);
+	  md_number_to_chars (p, 0, 4);
+	  fix_new (frag_now, p - frag_now->fr_literal, 4, fde->start_address,
+		   0, howto->pc_relative, code);
+	}
+      else
+	{
+	  exp.X_op = O_subtract;
+	  exp.X_add_number = 0;
 #if CFI_DIFF_EXPR_OK
-      exp.X_add_symbol = fde->start_address;
-      exp.X_op_symbol = symbol_temp_new_now ();
-      emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
+	  exp.X_add_symbol = fde->start_address;
+	  exp.X_op_symbol = symbol_temp_new_now ();
+	  emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
 #else
-      exp.X_op = O_symbol;
-      exp.X_add_symbol = fde->start_address;
-#ifdef tc_cfi_emit_pcrel_expr
-      tc_cfi_emit_pcrel_expr (&exp, DWARF2_FDE_RELOC_SIZE);	 /* Code offset.  */
+	  exp.X_op = O_symbol;
+	  exp.X_add_symbol = fde->start_address;
+
+#if defined(tc_cfi_emit_pcrel_expr)
+	  tc_cfi_emit_pcrel_expr (&exp, DWARF2_FDE_RELOC_SIZE);	 /* Code offset.  */
 #else
-      emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
+	  emit_expr (&exp, DWARF2_FDE_RELOC_SIZE);	/* Code offset.  */
 #endif
 #endif
+	}
       addr_size = DWARF2_FDE_RELOC_SIZE;
     }
   else
     {
-      exp.X_op = O_symbol;
-      exp.X_add_symbol = fde->start_address;
       exp.X_add_number = 0;
+      exp.X_add_symbol = fde->start_address;
       addr_size = DWARF2_ADDR_SIZE (stdoutput);
       emit_expr (&exp, addr_size);
     }
@@ -1651,24 +1971,7 @@ output_fde (struct fde_entry *fde, struct cie_entry *cie,
   if (eh_frame)
     out_uleb128 (augmentation_size);		/* Augmentation size.  */
 
-  if (fde->lsda_encoding != DW_EH_PE_omit)
-    {
-      exp = fde->lsda;
-      if ((fde->lsda_encoding & 0x70) == DW_EH_PE_pcrel)
-	{
-#if CFI_DIFF_LSDA_OK
-	  exp.X_op = O_subtract;
-	  exp.X_op_symbol = symbol_temp_new_now ();
-	  emit_expr (&exp, augmentation_size);
-#elif defined (tc_cfi_emit_pcrel_expr)
-	  tc_cfi_emit_pcrel_expr (&exp, augmentation_size);
-#else
-	  abort ();
-#endif
-	}
-      else
-	emit_expr (&exp, augmentation_size);
-    }
+  emit_expr_encoded (&fde->lsda, cie->lsda_encoding, FALSE);
 
   for (; first; first = first->next)
     if (CUR_SEG (first) == CUR_SEG (fde))
@@ -1862,26 +2165,50 @@ cfi_change_reg_numbers (struct cfi_insn_data *insn, segT ccseg)
 #define cfi_change_reg_numbers(insn, cseg) do { } while (0)
 #endif
 
-static segT
-get_cfi_seg (segT cseg, const char *base, flagword flags, int align)
+#if SUPPORT_COMPACT_EH
+static void
+cfi_emit_eh_header (symbolS *sym, bfd_vma addend)
 {
-  if (SUPPORT_FRAME_LINKONCE)
-    {
-      struct dwcfi_seg_list *l;
+  expressionS exp;
 
-      l = dwcfi_hash_find_or_make (cseg, base, flags);
+  exp.X_add_number = addend;
+  exp.X_add_symbol = sym;
+  emit_expr_encoded (&exp, DW_EH_PE_sdata4 | DW_EH_PE_pcrel, FALSE);
+}
 
-      cseg = l->seg;
-      subseg_set (cseg, l->subseg);
+static void
+output_eh_header (struct fde_entry *fde)
+{
+  char *p;
+  bfd_vma addend;
+
+  if (fde->eh_header_type == EH_COMPACT_INLINE)
+    addend = 0;
+  else
+    addend = 1;
+
+  cfi_emit_eh_header (fde->start_address, addend);
+
+  if (fde->eh_header_type == EH_COMPACT_INLINE)
+    {
+      p = frag_more (4);
+      /* Inline entries always use PR1.  */
+      *(p++) = 1;
+      memcpy(p, fde->eh_data, 3);
     }
   else
     {
-      cseg = subseg_new (base, 0);
-      bfd_set_section_flags (stdoutput, cseg, flags);
+      if (fde->eh_header_type == EH_COMPACT_LEGACY)
+	addend = 1;
+      else if (fde->eh_header_type == EH_COMPACT_OUTLINE
+	       || fde->eh_header_type == EH_COMPACT_OUTLINE_DONE)
+	addend = 0;
+      else
+	abort ();
+      cfi_emit_eh_header (fde->eh_loc, addend);
     }
-  record_alignment (cseg, align);
-  return cseg;
 }
+#endif
 
 void
 cfi_finish (void)
@@ -1895,13 +2222,14 @@ cfi_finish (void)
   if (all_fde_data == 0)
     return;
 
-  if ((cfi_sections & CFI_EMIT_eh_frame) != 0)
+  if ((all_cfi_sections & CFI_EMIT_eh_frame) != 0
+      || (all_cfi_sections & CFI_EMIT_eh_frame_compact) != 0)
     {
       /* Make sure check_eh_frame doesn't do anything with our output.  */
       save_flag_traditional_format = flag_traditional_format;
       flag_traditional_format = 1;
 
-      if (!SUPPORT_FRAME_LINKONCE)
+      if (!EH_FRAME_LINKONCE)
 	{
 	  /* Open .eh_frame section.  */
 	  cfi_seg = get_cfi_seg (NULL, ".eh_frame",
@@ -1929,7 +2257,22 @@ cfi_finish (void)
 
 	  for (fde = all_fde_data; fde ; fde = fde->next)
 	    {
-	      if (SUPPORT_FRAME_LINKONCE)
+	      if ((fde->sections & CFI_EMIT_eh_frame) == 0
+		  && (fde->sections & CFI_EMIT_eh_frame_compact) == 0)
+		continue;
+
+#if SUPPORT_COMPACT_EH
+	      /* Emit a LEGACY format header if we have processed all
+	         of the .cfi directives without encountering either inline or
+		 out-of-line compact unwinding opcodes.  */
+	      if (fde->eh_header_type == EH_COMPACT_HAS_LSDA
+		  || fde->eh_header_type == EH_COMPACT_UNKNOWN)
+		fde->eh_header_type = EH_COMPACT_LEGACY;
+
+	      if (fde->eh_header_type != EH_COMPACT_LEGACY)
+		continue;
+#endif
+	      if (EH_FRAME_LINKONCE)
 		{
 		  if (HANDLED (fde))
 		    continue;
@@ -1963,20 +2306,108 @@ cfi_finish (void)
 		}
 
 	      cie = select_cie_for_fde (fde, TRUE, &first, 2);
+	      fde->eh_loc = symbol_temp_new_now ();
 	      output_fde (fde, cie, TRUE, first,
 			  fde->next == NULL ? EH_FRAME_ALIGNMENT : 2);
 	    }
 	}
-      while (SUPPORT_FRAME_LINKONCE && seek_next_seg == 2);
+      while (EH_FRAME_LINKONCE && seek_next_seg == 2);
 
-      if (SUPPORT_FRAME_LINKONCE)
+      if (EH_FRAME_LINKONCE)
 	for (fde = all_fde_data; fde ; fde = fde->next)
 	  SET_HANDLED (fde, 0);
 
+#if SUPPORT_COMPACT_EH
+      if (compact_eh)
+	{
+	  /* Create remaining out of line table entries.  */
+	  do
+	    {
+	      ccseg = NULL;
+	      seek_next_seg = 0;
+
+	      for (fde = all_fde_data; fde ; fde = fde->next)
+		{
+		  if ((fde->sections & CFI_EMIT_eh_frame) == 0
+		      && (fde->sections & CFI_EMIT_eh_frame_compact) == 0)
+		    continue;
+
+		  if (fde->eh_header_type != EH_COMPACT_OUTLINE)
+		    continue;
+		  if (HANDLED (fde))
+		    continue;
+		  if (seek_next_seg && CUR_SEG (fde) != ccseg)
+		    {
+		      seek_next_seg = 2;
+		      continue;
+		    }
+		  if (!seek_next_seg)
+		    {
+		      ccseg = CUR_SEG (fde);
+		      /* Open .gnu_extab section.  */
+		      get_cfi_seg (ccseg, ".gnu_extab",
+				   (SEC_ALLOC | SEC_LOAD | SEC_DATA
+				    | DWARF2_EH_FRAME_READ_ONLY),
+				   1);
+		      seek_next_seg = 1;
+		    }
+		  SET_HANDLED (fde, 1);
+
+		  frag_align (1, 0, 0);
+		  record_alignment (now_seg, 1);
+		  output_compact_unwind_data (fde, 1);
+		}
+	    }
+	  while (EH_FRAME_LINKONCE && seek_next_seg == 2);
+
+	  for (fde = all_fde_data; fde ; fde = fde->next)
+	    SET_HANDLED (fde, 0);
+
+	  /* Create index table fragments.  */
+	  do
+	    {
+	      ccseg = NULL;
+	      seek_next_seg = 0;
+
+	      for (fde = all_fde_data; fde ; fde = fde->next)
+		{
+		  if ((fde->sections & CFI_EMIT_eh_frame) == 0
+		      && (fde->sections & CFI_EMIT_eh_frame_compact) == 0)
+		    continue;
+
+		  if (HANDLED (fde))
+		    continue;
+		  if (seek_next_seg && CUR_SEG (fde) != ccseg)
+		    {
+		      seek_next_seg = 2;
+		      continue;
+		    }
+		  if (!seek_next_seg)
+		    {
+		      ccseg = CUR_SEG (fde);
+		      /* Open .eh_frame_entry section.  */
+		      cfi_seg = get_cfi_seg (ccseg, ".eh_frame_entry",
+					     (SEC_ALLOC | SEC_LOAD | SEC_DATA
+					      | DWARF2_EH_FRAME_READ_ONLY),
+					     2);
+		      seek_next_seg = 1;
+		    }
+		  SET_HANDLED (fde, 1);
+
+		  output_eh_header (fde);
+		}
+	    }
+	  while (seek_next_seg == 2);
+
+	  for (fde = all_fde_data; fde ; fde = fde->next)
+	    SET_HANDLED (fde, 0);
+	}
+#endif /* SUPPORT_COMPACT_EH */
+
       flag_traditional_format = save_flag_traditional_format;
     }
 
-  if ((cfi_sections & CFI_EMIT_debug_frame) != 0)
+  if ((all_cfi_sections & CFI_EMIT_debug_frame) != 0)
     {
       int alignment = ffs (DWARF2_ADDR_SIZE (stdoutput)) - 1;
 
@@ -1999,6 +2430,9 @@ cfi_finish (void)
 
 	  for (fde = all_fde_data; fde ; fde = fde->next)
 	    {
+	      if ((fde->sections & CFI_EMIT_debug_frame) == 0)
+		continue;
+
 	      if (SUPPORT_FRAME_LINKONCE)
 		{
 		  if (HANDLED (fde))
@@ -2056,6 +2490,7 @@ const pseudo_typeS cfi_pseudo_table[] =
     { "cfi_sections", dot_cfi_dummy, 0 },
     { "cfi_startproc", dot_cfi_dummy, 0 },
     { "cfi_endproc", dot_cfi_dummy, 0 },
+    { "cfi_fde_data", dot_cfi_dummy, 0 },
     { "cfi_def_cfa", dot_cfi_dummy, 0 },
     { "cfi_def_cfa_register", dot_cfi_dummy, 0 },
     { "cfi_def_cfa_offset", dot_cfi_dummy, 0 },
@@ -2073,9 +2508,11 @@ const pseudo_typeS cfi_pseudo_table[] =
     { "cfi_escape", dot_cfi_dummy, 0 },
     { "cfi_signal_frame", dot_cfi_dummy, 0 },
     { "cfi_personality", dot_cfi_dummy, 0 },
+    { "cfi_personality_id", dot_cfi_dummy, 0 },
     { "cfi_lsda", dot_cfi_dummy, 0 },
     { "cfi_val_encoded_addr", dot_cfi_dummy, 0 },
     { "cfi_label", dot_cfi_dummy, 0 },
+    { "cfi_inline_lsda", dot_cfi_dummy, 0 },
     { NULL, NULL, 0 }
   };
 
diff --git a/gas/dw2gencfi.h b/gas/dw2gencfi.h
index 6e2c50e..6acd484c 100644
--- a/gas/dw2gencfi.h
+++ b/gas/dw2gencfi.h
@@ -36,6 +36,7 @@ extern void cfi_finish (void);
 extern void cfi_new_fde (struct symbol *);
 extern void cfi_end_fde (struct symbol *);
 extern void cfi_set_return_column (unsigned);
+extern void cfi_set_sections (void);
 extern void cfi_add_advance_loc (struct symbol *);
 extern void cfi_add_label (const char *);
 
@@ -58,10 +59,18 @@ extern void cfi_add_CFA_restore_state (void);
 #define SUPPORT_FRAME_LINKONCE 0
 #endif
 
+#ifdef tc_cfi_reloc_for_encoding
+#define SUPPORT_COMPACT_EH 1
+#else
+#define SUPPORT_COMPACT_EH 0
+#endif
+
+#define MULTIPLE_FRAME_SECTIONS (SUPPORT_FRAME_LINKONCE || SUPPORT_COMPACT_EH)
+
 struct cfi_insn_data
 {
   struct cfi_insn_data *next;
-#if SUPPORT_FRAME_LINKONCE
+#if MULTIPLE_FRAME_SECTIONS
   segT cur_seg;
 #endif
   int insn;
@@ -100,10 +109,35 @@ struct cfi_insn_data
   } u;
 };
 
+/* An enumeration describing the Compact EH header format.  The least
+   significant bit is used to distinguish the entries.
+
+   Inline Compact:			Function offset [0]
+					Four chars of unwind data.
+   Out-of-line Compact:			Function offset [1]
+					Compact unwind data offset [0]
+   Legacy:				Function offset [1]
+					Unwind data offset [1]
+
+   The header type is initialized to EH_COMPACT_UNKNOWN until the
+   format is discovered by encountering a .fde_data entry.
+   Failure to find a .fde_data entry will cause an EH_COMPACT_LEGACY
+   header to be generated.  */
+
+enum {
+  EH_COMPACT_UNKNOWN,
+  EH_COMPACT_LEGACY,
+  EH_COMPACT_INLINE,
+  EH_COMPACT_OUTLINE,
+  EH_COMPACT_OUTLINE_DONE,
+  /* Outline if .cfi_inline_lsda used, otherwise legacy FDE.  */
+  EH_COMPACT_HAS_LSDA
+};
+
 struct fde_entry
 {
   struct fde_entry *next;
-#if SUPPORT_FRAME_LINKONCE
+#if MULTIPLE_FRAME_SECTIONS
   segT cur_seg;
 #endif
   symbolS *start_address;
@@ -112,13 +146,21 @@ struct fde_entry
   struct cfi_insn_data **last;
   unsigned char per_encoding;
   unsigned char lsda_encoding;
+  int personality_id;
   expressionS personality;
   expressionS lsda;
   unsigned int return_column;
   unsigned int signal_frame;
-#if SUPPORT_FRAME_LINKONCE
+#if MULTIPLE_FRAME_SECTIONS
   int handled;
 #endif
+  int eh_header_type;
+  /* Compact unwinding opcodes, not including the PR byte or LSDA.  */
+  int eh_data_size;
+  bfd_byte *eh_data;
+  /* For out of line tables and FDEs.  */
+  symbolS *eh_loc;
+  int sections;
 };
 
 /* The list of all FDEs that have been collected.  */
@@ -133,4 +175,10 @@ extern struct fde_entry *all_fde_data;
 #define CFI_val_encoded_addr	0x105
 #define CFI_label		0x106
 
+/* By default emit .eh_frame only, not .debug_frame.  */
+#define CFI_EMIT_eh_frame               (1 << 0)
+#define CFI_EMIT_debug_frame            (1 << 1)
+#define CFI_EMIT_target                 (1 << 2)
+#define CFI_EMIT_eh_frame_compact       (1 << 3)
+
 #endif /* DW2GENCFI_H */
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7f4b81b..4ee899a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,35 @@
+2015-05-28  Catherine Moore  <clm@codesourcery.com>
+	    Bernd Schmidt <bernds@codesourcery.com>
+
+	gas/testsuite/
+	* gas/mips/mips.exp: Run new tests.
+
+	* gas/mips/compact-eh-1.s: New file.
+	* gas/mips/compact-eh-2.s: New file.
+	* gas/mips/compact-eh-3.s: New file.
+	* gas/mips/compact-eh-4.s: New file.
+	* gas/mips/compact-eh-5.s: New file.
+	* gas/mips/compact-eh-6.s: New file.
+	* gas/mips/compact-eh-7.s: New file.
+	* gas/mips/compact-eh-eb-1.d: New file.
+	* gas/mips/compact-eh-eb-2.d: New file.
+	* gas/mips/compact-eh-eb-3.d: New file.
+	* gas/mips/compact-eh-eb-4.d: New file.
+	* gas/mips/compact-eh-eb-5.d: New file.
+	* gas/mips/compact-eh-eb-6.d: New file.
+	* gas/mips/compact-eh-eb-7.d: New file.
+	* gas/mips/compact-eh-el-1.d: New file.
+	* gas/mips/compact-eh-el-2.d: New file.
+	* gas/mips/compact-eh-el-3.d: New file.
+	* gas/mips/compact-eh-el-4.d: New file.
+	* gas/mips/compact-eh-el-5.d: New file.
+	* gas/mips/compact-eh-el-6.d: New file.
+	* gas/mips/compact-eh-el-7.d: New file.
+	* gas/mips/compact-eh-err1.l: New file.
+	* gas/mips/compact-eh-err1.s: New file.
+	* gas/mips/compact-eh-err2.l: New file.
+	* gas/mips/compact-eh-err2.s: New file.
+
 2015-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutis/18386
diff --git a/gas/testsuite/gas/mips/compact-eh-1.s b/gas/testsuite/gas/mips/compact-eh-1.s
new file mode 100644
index 0000000..9c4f8d2
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-1.s
@@ -0,0 +1,19 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality_id 0x2
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+	nop
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40
+	.cfi_endproc
diff --git a/gas/testsuite/gas/mips/compact-eh-2.s b/gas/testsuite/gas/mips/compact-eh-2.s
new file mode 100644
index 0000000..beeebda
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-2.s
@@ -0,0 +1,28 @@
+	.gnu_attribute 4, 1
+	.abicalls
+        .hidden DW.ref.__gnu_compact_pr2
+        .weak   DW.ref.__gnu_compact_pr2
+        .section        .data.DW.ref.__gnu_compact_pr2,"awG",@progbits,DW.ref.__gnu_compact_pr2,comdat
+        .align  2
+        .type   DW.ref.__gnu_compact_pr2, @object
+        .size   DW.ref.__gnu_compact_pr2, 4
+DW.ref.__gnu_compact_pr2:
+        .word   __gnu_compact_pr2
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality 0x1b, DW.ref.__gnu_compact_pr2
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+	nop
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40
+	.cfi_endproc
+	.globl	__gnu_compact_pr2
diff --git a/gas/testsuite/gas/mips/compact-eh-3.s b/gas/testsuite/gas/mips/compact-eh-3.s
new file mode 100644
index 0000000..fd9def1
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-3.s
@@ -0,0 +1,19 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality_id 0x2
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+	nop
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40,0x3,0x5
+	.cfi_endproc
diff --git a/gas/testsuite/gas/mips/compact-eh-4.s b/gas/testsuite/gas/mips/compact-eh-4.s
new file mode 100644
index 0000000..d0be1c7
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-4.s
@@ -0,0 +1,47 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality_id 0x2
+	.cfi_lsda 0x1b,$LLSDA0
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+$LEHB0 = .
+	nop
+$LEHE0 = .
+	nop
+$LEHB1 = .
+	nop
+$LEHE1 = .
+	nop
+$LEHB2 = .
+$L3:
+	nop
+$LEHE2 = .
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40
+	.cfi_endproc
+	.cfi_inline_lsda 2
+$LLSDA0:
+	.byte	0x2
+	.uleb128 $LLSDACSE0-$LLSDACSB0
+$LLSDACSB0:
+	.uleb128 ($LEHB0-$LFB0)|1
+	.uleb128 ($LEHE0-$LEHB0)
+	.sleb128 -1
+	.uleb128 ($LEHB1-$LEHE0)|1
+	.uleb128 ($LEHE1-$LEHB1)
+	.sleb128 ($L3-($LEHE1))
+	.sleb128 (0<<2)|0
+	.uleb128 ($LEHB2-$LEHE1)|1
+	.uleb128 ($LEHE2-$LEHB2)
+	.sleb128 -1
+$LLSDACSE0:
diff --git a/gas/testsuite/gas/mips/compact-eh-5.s b/gas/testsuite/gas/mips/compact-eh-5.s
new file mode 100644
index 0000000..aa9bdda
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-5.s
@@ -0,0 +1,56 @@
+	.gnu_attribute 4, 1
+	.abicalls
+        .hidden DW.ref.__gnu_compact_pr2
+        .weak   DW.ref.__gnu_compact_pr2
+        .section        .data.DW.ref.__gnu_compact_pr2,"awG",@progbits,DW.ref.__gnu_compact_pr2,comdat
+        .align  2
+        .type   DW.ref.__gnu_compact_pr2, @object
+        .size   DW.ref.__gnu_compact_pr2, 4
+DW.ref.__gnu_compact_pr2:
+        .word   __gnu_compact_pr2
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality 0x1b, DW.ref.__gnu_compact_pr2
+	.cfi_lsda 0x1b,$LLSDA0
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+$LEHB0 = .
+	nop
+$LEHE0 = .
+	nop
+$LEHB1 = .
+	nop
+$LEHE1 = .
+	nop
+$LEHB2 = .
+$L3:
+	nop
+$LEHE2 = .
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40
+	.cfi_endproc
+	.globl	__gnu_compact_pr2
+	.cfi_inline_lsda 2
+$LLSDA0:
+	.byte	0x2
+	.uleb128 $LLSDACSE0-$LLSDACSB0
+$LLSDACSB0:
+	.uleb128 ($LEHB0-$LFB0)|1
+	.uleb128 ($LEHE0-$LEHB0)
+	.sleb128 -1
+	.uleb128 ($LEHB1-$LEHE0)|1
+	.uleb128 ($LEHE1-$LEHB1)
+	.sleb128 ($L3-($LEHE1))
+	.sleb128 (0<<2)|0
+	.uleb128 ($LEHB2-$LEHE1)|1
+	.uleb128 ($LEHE2-$LEHB2)
+	.sleb128 -1
+$LLSDACSE0:
diff --git a/gas/testsuite/gas/mips/compact-eh-6.s b/gas/testsuite/gas/mips/compact-eh-6.s
new file mode 100644
index 0000000..2e49054
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-6.s
@@ -0,0 +1,47 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality_id 0x2
+	.cfi_lsda 0x1b,$LLSDA0
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+$LEHB0 = .
+	nop
+$LEHE0 = .
+	nop
+$LEHB1 = .
+	nop
+$LEHE1 = .
+	nop
+$LEHB2 = .
+$L3:
+	nop
+$LEHE2 = .
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40,0x3,0x5
+	.cfi_endproc
+	.cfi_inline_lsda 2
+$LLSDA0:
+	.byte	0x2
+	.uleb128 $LLSDACSE0-$LLSDACSB0
+$LLSDACSB0:
+	.uleb128 ($LEHB0-$LFB0)|1
+	.uleb128 ($LEHE0-$LEHB0)
+	.sleb128 -1
+	.uleb128 ($LEHB1-$LEHE0)|1
+	.uleb128 ($LEHE1-$LEHB1)
+	.sleb128 ($L3-($LEHE1))
+	.sleb128 (0<<2)|0
+	.uleb128 ($LEHB2-$LEHE1)|1
+	.uleb128 ($LEHE2-$LEHB2)
+	.sleb128 -1
+$LLSDACSE0:
diff --git a/gas/testsuite/gas/mips/compact-eh-7.s b/gas/testsuite/gas/mips/compact-eh-7.s
new file mode 100644
index 0000000..e7554d2
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-7.s
@@ -0,0 +1,22 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality_id 0x2
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+	nop
+	.cfi_def_cfa_offset -32
+	nop
+	.cfi_def_cfa_offset 0
+	
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_endproc
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-1.d b/gas/testsuite/gas/mips/compact-eh-eb-1.d
new file mode 100644
index 0000000..2a233d6
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-1.d
@@ -0,0 +1,25 @@
+#objdump: -sr
+#name: Compact EH EB #1 with personality ID and FDE data
+#source: compact-eh-1.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+
+
+Contents of section .text:
+ 0000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .eh_frame_entry:
+ 0000 00000000 0104405c                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-2.d b/gas/testsuite/gas/mips/compact-eh-eb-2.d
new file mode 100644
index 0000000..226a5ff
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-2.d
@@ -0,0 +1,42 @@
+#objdump: -sr
+#name: Compact EH EB #2 with personality routine and FDE data
+#source: compact-eh-2.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_32         __gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.gnu_extab\]:
+OFFSET   TYPE              VALUE 
+00000001 R_MIPS_PC32       DW.ref.__gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .group:
+ 0000 00000001 00000007                   .*
+Contents of section .text:
+ 0000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .data.DW.ref.__gnu_compact_pr2:
+ 0000 00000000                             .*
+Contents of section .gnu_extab:
+ 0000 00000000 0004405c                    .*
+Contents of section .eh_frame_entry:
+ 0000 00000001 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-3.d b/gas/testsuite/gas/mips/compact-eh-eb-3.d
new file mode 100644
index 0000000..6782d2b
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-3.d
@@ -0,0 +1,28 @@
+#objdump: -sr
+#name: Compact EH EB #3 with personality id and large FDE data
+#source: compact-eh-3.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .text:
+ 0000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .gnu_extab:
+ 0000 02044003 055c                        .*
+Contents of section .eh_frame_entry:
+ 0000 00000001 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-4.d b/gas/testsuite/gas/mips/compact-eh-eb-4.d
new file mode 100644
index 0000000..b9fe3c0
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-4.d
@@ -0,0 +1,29 @@
+#objdump: -sr
+#name: Compact EH EB #4 with personality id, FDE data and LSDA
+#source: compact-eh-4.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .text:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .gnu_extab:
+ 0000 0204405c 020a0104 7f050404 0005047f  .*
+Contents of section .eh_frame_entry:
+ 0000 00000001 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-5.d b/gas/testsuite/gas/mips/compact-eh-eb-5.d
new file mode 100644
index 0000000..fd278a1
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-5.d
@@ -0,0 +1,44 @@
+#objdump: -sr
+#name: Compact EH EB #5 with personality routine, FDE data and LSDA
+#source: compact-eh-5.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_32         __gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.gnu_extab\]:
+OFFSET   TYPE              VALUE 
+00000001 R_MIPS_PC32       DW.ref.__gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .group:
+ 0000 00000001 00000007                    .*
+Contents of section .text:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .data.DW.ref.__gnu_compact_pr2:
+ 0000 00000000                             .*
+Contents of section .gnu_extab:
+ 0000 00000000 0004405c 020a0104 7f050404  .*
+ 0010 0005047f                             .*
+Contents of section .eh_frame_entry:
+ 0000 00000001 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-6.d b/gas/testsuite/gas/mips/compact-eh-eb-6.d
new file mode 100644
index 0000000..496be17
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-6.d
@@ -0,0 +1,30 @@
+#objdump: -sr
+#name: Compact EH EB #6 with personality id, LSDA and large FDE data
+#source: compact-eh-6.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .text:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .gnu_extab:
+ 0000 02044003 055f5f5c 020a0104 7f050404  .*
+ 0010 0005047f                             .*
+Contents of section .eh_frame_entry:
+ 0000 00000001 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-eb-7.d b/gas/testsuite/gas/mips/compact-eh-eb-7.d
new file mode 100644
index 0000000..2daae3f
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-eb-7.d
@@ -0,0 +1,35 @@
+#objdump: -sr
+#name: Compact EH EB #7 with personality id and fallback FDE
+#source: compact-eh-7.s
+#as: -EB -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame\]:
+OFFSET   TYPE              VALUE 
+0000001c R_MIPS_PC32       .text.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .eh_frame.*
+
+
+Contents of section .text:
+ 0000 00000000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .eh_frame:
+ 0000 00000010 00000000 017a5200 017c1f01  .*
+ 0010 1b0d1d00 00000014 00000018 00000000  .*
+ 0020 00000008 00441308 440e0000           .*
+Contents of section .eh_frame_entry:
+ 0000 00000001 00000015                    .*
+Contents of section .gnu.attributes:
+ 0000 41000000 0f676e75 00010000 00070401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-1.d b/gas/testsuite/gas/mips/compact-eh-el-1.d
new file mode 100644
index 0000000..64abfba
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-1.d
@@ -0,0 +1,25 @@
+#objdump: -sr
+#name: Compact EH EL #1 with personality ID and FDE data
+#source: compact-eh-1.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+
+
+Contents of section .text:
+ 0000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .eh_frame_entry:
+ 0000 00000000 0104405c                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-2.d b/gas/testsuite/gas/mips/compact-eh-el-2.d
new file mode 100644
index 0000000..80627eb
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-2.d
@@ -0,0 +1,42 @@
+#objdump: -sr
+#name: Compact EH EL #2 with personality routine and FDE data
+#source: compact-eh-2.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_32         __gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.gnu_extab\]:
+OFFSET   TYPE              VALUE 
+00000001 R_MIPS_PC32       DW.ref.__gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .group:
+ 0000 01000000 07000000                    .*
+Contents of section .text:
+ 0000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .data.DW.ref.__gnu_compact_pr2:
+ 0000 00000000                             .*
+Contents of section .gnu_extab:
+ 0000 00000000 0004405c                    .*
+Contents of section .eh_frame_entry:
+ 0000 01000000 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-3.d b/gas/testsuite/gas/mips/compact-eh-el-3.d
new file mode 100644
index 0000000..aacfac2
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-3.d
@@ -0,0 +1,28 @@
+#objdump: -sr
+#name: Compact EH EL #3 with personality id and large FDE data
+#source: compact-eh-3.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .text:
+ 0000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .gnu_extab:
+ 0000 02044003 055c                        .*
+Contents of section .eh_frame_entry:
+ 0000 01000000 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-4.d b/gas/testsuite/gas/mips/compact-eh-el-4.d
new file mode 100644
index 0000000..d3d85e1
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-4.d
@@ -0,0 +1,29 @@
+#objdump: -sr
+#name: Compact EH EL #4 with personality id, FDE data and LSDA
+#source: compact-eh-4.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .text:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .gnu_extab:
+ 0000 0204405c 020a0104 7f050404 0005047f  .*
+Contents of section .eh_frame_entry:
+ 0000 01000000 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-5.d b/gas/testsuite/gas/mips/compact-eh-el-5.d
new file mode 100644
index 0000000..7f07622
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-5.d
@@ -0,0 +1,43 @@
+#objdump: -sr
+#name: Compact EH EL #5 with personality routine, FDE data and LSDA
+#source: compact-eh-5.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+RELOCATION RECORDS FOR \[.data.DW.ref.__gnu_compact_pr2\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_32         __gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.gnu_extab\]:
+OFFSET   TYPE              VALUE 
+00000001 R_MIPS_PC32       DW.ref.__gnu_compact_pr2
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .group:
+ 0000 01000000 07000000                    .*
+Contents of section .text:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .data.DW.ref.__gnu_compact_pr2:
+ 0000 00000000                             .*
+Contents of section .gnu_extab:
+ 0000 00000000 0004405c 020a0104 7f050404  .*
+ 0010 0005047f                             .*
+Contents of section .eh_frame_entry:
+ 0000 01000000 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-6.d b/gas/testsuite/gas/mips/compact-eh-el-6.d
new file mode 100644
index 0000000..802a946
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-6.d
@@ -0,0 +1,30 @@
+#objdump: -sr
+#name: Compact EH EL #6 with personality id, LSDA and large FDE data
+#source: compact-eh-6.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .gnu_extab
+
+
+Contents of section .text:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .gnu_extab:
+ 0000 02044003 055f5f5c 020a0104 7f050404  .*
+ 0010 0005047f                             .*
+Contents of section .eh_frame_entry:
+ 0000 01000000 00000000                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-el-7.d b/gas/testsuite/gas/mips/compact-eh-el-7.d
new file mode 100644
index 0000000..c3c585e
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-el-7.d
@@ -0,0 +1,35 @@
+#objdump: -sr
+#name: Compact EH EL #7 with personality id and fallback FDE
+#source: compact-eh-7.s
+#as: -EL -mno-pdr
+
+.*:     file format.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame\]:
+OFFSET   TYPE              VALUE 
+0000001c R_MIPS_PC32       .text.*
+
+
+RELOCATION RECORDS FOR \[.eh_frame_entry\]:
+OFFSET   TYPE              VALUE 
+00000000 R_MIPS_PC32       .text.*
+00000004 R_MIPS_PC32       .eh_frame.*
+
+
+Contents of section .text:
+ 0000 00000000 00000000.*
+Contents of section .reginfo:
+ 0000 00000000 00000000 00000000 00000000  .*
+ 0010 00000000 00000000                    .*
+Contents of section .MIPS.abiflags:
+ .*
+ .*
+Contents of section .eh_frame:
+ 0000 10000000 00000000 017a5200 017c1f01  .*
+ 0010 1b0d1d00 14000000 18000000 00000000  .*
+ 0020 08000000 00441308 440e0000           .*
+Contents of section .eh_frame_entry:
+ 0000 01000000 15000000                    .*
+Contents of section .gnu.attributes:
+ 0000 410f0000 00676e75 00010700 00000401  .*
diff --git a/gas/testsuite/gas/mips/compact-eh-err1.l b/gas/testsuite/gas/mips/compact-eh-err1.l
new file mode 100644
index 0000000..3ee03de
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-err1.l
@@ -0,0 +1,2 @@
+.*: Assembler messages:
+.*:20: Error: .cfi_inline_lsda seen for frame without .cfi_lsda
diff --git a/gas/testsuite/gas/mips/compact-eh-err1.s b/gas/testsuite/gas/mips/compact-eh-err1.s
new file mode 100644
index 0000000..967313f
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-err1.s
@@ -0,0 +1,20 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+$LFB0 = .
+	.cfi_startproc
+	.cfi_personality_id 0x2
+	.set	nomips16
+	.set	nomicromips
+	.ent	_Z3fooi
+	.type	_Z3fooi, @function
+_Z3fooi:
+	nop
+	.end	_Z3fooi
+	.size	_Z3fooi, .-_Z3fooi
+	.cfi_fde_data 0x4,0x40
+	.cfi_endproc
+	.cfi_inline_lsda 1
diff --git a/gas/testsuite/gas/mips/compact-eh-err2.l b/gas/testsuite/gas/mips/compact-eh-err2.l
new file mode 100644
index 0000000..c52976a
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-err2.l
@@ -0,0 +1,2 @@
+.*: Assembler messages:
+.*:7: Error: inconsistent uses of .cfi_sections
diff --git a/gas/testsuite/gas/mips/compact-eh-err2.s b/gas/testsuite/gas/mips/compact-eh-err2.s
new file mode 100644
index 0000000..acf83d1
--- /dev/null
+++ b/gas/testsuite/gas/mips/compact-eh-err2.s
@@ -0,0 +1,7 @@
+	.gnu_attribute 4, 1
+	.abicalls
+	.text
+	.align	2
+	.globl	_Z3fooi
+	.cfi_sections .eh_frame_entry
+	.cfi_sections .eh_frame
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index c3c3364..4568f24 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -570,6 +570,23 @@ if { [istarget mips*-*-vxworks*] } {
 	    "MIPS branch swapping ($count)"
     }
 
+    run_dump_test "compact-eh-eb-1"
+    run_dump_test "compact-eh-eb-2"
+    run_dump_test "compact-eh-eb-3"
+    run_dump_test "compact-eh-eb-4"
+    run_dump_test "compact-eh-eb-5"
+    run_dump_test "compact-eh-eb-6"
+    run_dump_test "compact-eh-eb-7"
+    run_dump_test "compact-eh-el-1"
+    run_dump_test "compact-eh-el-2"
+    run_dump_test "compact-eh-el-3"
+    run_dump_test "compact-eh-el-4"
+    run_dump_test "compact-eh-el-5"
+    run_dump_test "compact-eh-el-6"
+    run_dump_test "compact-eh-el-7"
+    run_list_test "compact-eh-err1"
+    run_list_test "compact-eh-err2"
+
     run_dump_test "div"
 
     if { !$addr32 } {
@@ -1139,7 +1156,6 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "align2-el"
     run_dump_test "align3"
     run_dump_test "odd-float"
-    run_dump_test "ehword"
     run_dump_test "insn-opts"
 
     run_list_test_arches "mips-macro-ill-sfp" "-32 -msingle-float" \