Merge GDB 7.5.1

gdb/testsuite/gdb.dwarf2/pr11465.S

Index: gdb/testsuite/gdb.dwarf2/pr11465.S
diff --git a/gdb/testsuite/gdb.dwarf2/pr11465.S b/gdb/testsuite/gdb.dwarf2/pr11465.S
index 730ee9ea9d70687f1ad9d0fdffb2d98ae17726fe..0433df7abe33b8ee67ee51c168c9ee6328f1b9ab 100644
--- a/gdb/testsuite/gdb.dwarf2/pr11465.S
+++ b/gdb/testsuite/gdb.dwarf2/pr11465.S
@@ -44,19 +44,19 @@ text_end:
 
 	.section	.debug_info
 d:
-	.long	.Ldebug_info_end - 1f /* Length of CU info */
+	.4byte	.Ldebug_info_end - 1f /* Length of CU info */
 1:
 	.2byte	0x2		/* DWARF version number */
-	.long	.Ldebug_abbrev0	/* Abbrev offset */
+	.4byte	.Ldebug_abbrev0	/* Abbrev offset */
 	.byte	0x4		/* Pointer size */
 dieb:	.uleb128 0x1		/* DW_TAG_compile_unit */
-	.long	.LASF4		/* DW_AT_producer */
+	.4byte	.LASF4		/* DW_AT_producer */
 	.byte	0x4		/* DW_AT_language */
-	.long	.LASF5		/* DW_AT_name */
-	.long	.LASF6		/* DW_AT_comp_dir */
-	.long	text_start	/* DW_AT_low_pc */
-	.long	text_end	/* DW_AT_high_pc */
-	.long	text_start	/* DW_AT_entry_pc */
+	.4byte	.LASF5		/* DW_AT_name */
+	.4byte	.LASF6		/* DW_AT_comp_dir */
+	.4byte	text_start	/* DW_AT_low_pc */
+	.4byte	text_end	/* DW_AT_high_pc */
+	.4byte	text_start	/* DW_AT_entry_pc */
 die29:	.uleb128 0x2		/* DW_TAG_namespace */
 	.string	"N"		/* DW_AT_name */
 die32:	.uleb128 0x3		/* DW_TAG_class_type */
@@ -64,68 +64,68 @@ die32:	.uleb128 0x3		/* DW_TAG_class_type */
 	.byte	0x1		/* DW_AT_declaration */
 die36:	.uleb128 0x4		/* DW_TAG_typedef */
 	.string	"u"		/* DW_AT_name */
-	.long	die7e-d		/* DW_AT_type */
+	.4byte	die7e-d		/* DW_AT_type */
 die3f:	.uleb128 0x5		/* DW_TAG_variable */
 	.string	"f"		/* DW_AT_name */
-	.long	.LASF0		/* DW_AT_MIPS_linkage_name */
-	.long	die36-d		/* DW_AT_type */
+	.4byte	.LASF0		/* DW_AT_MIPS_linkage_name */
+	.4byte	die36-d		/* DW_AT_type */
 	.byte	0x1		/* DW_AT_external */
 	.byte	0x1		/* DW_AT_declaration */
 die4e:	.uleb128 0x5		/* DW_TAG_variable */
 	.string	"c"		/* DW_AT_name */
-	.long	.LASF1		/* DW_AT_MIPS_linkage_name */
-	.long	die5e-d		/* DW_AT_type */
+	.4byte	.LASF1		/* DW_AT_MIPS_linkage_name */
+	.4byte	die5e-d		/* DW_AT_type */
 	.byte	0x1		/* DW_AT_external */
 	.byte	0x1		/* DW_AT_declaration */
 	.byte	0x0
 die5e:	.uleb128 0x6		/* DW_TAG_class_type */
-	.long	die32-d		/* DW_AT_specification */
+	.4byte	die32-d		/* DW_AT_specification */
 	.byte	0x1		/* DW_AT_byte_size */
 die6a:	.uleb128 0x7		/* DW_TAG_subprogram */
 	.byte	0x1		/* DW_AT_external */
 	.string	"C"		/* DW_AT_name */
 	.byte	0x1		/* DW_AT_declaration */
 die71:	.uleb128 0x8		/* DW_TAG_formal_parameter */
-	.long	die8f-d		/* DW_AT_type */
+	.4byte	die8f-d		/* DW_AT_type */
 	.byte	0x1		/* DW_AT_artificial */
 die77:	.uleb128 0x9		/* DW_TAG_formal_parameter */
-	.long	die7e-d		/* DW_AT_type */
+	.4byte	die7e-d		/* DW_AT_type */
 	.byte	0x0
 	.byte	0x0
 die7e:	.uleb128 0xa		/* DW_TAG_pointer_type */
 	.byte	PTRBITS / 8	/* DW_AT_byte_size */
-	.long	die84-d		/* DW_AT_type */
+	.4byte	die84-d		/* DW_AT_type */
 die84:	.uleb128 0xb		/* DW_TAG_subroutine_type */
 die89:	.uleb128 0x9		/* DW_TAG_formal_parameter */
-	.long	die5e-d		/* DW_AT_type */
+	.4byte	die5e-d		/* DW_AT_type */
 	.byte	0x0
 die8f:	.uleb128 0xa		/* DW_TAG_pointer_type */
 	.byte	PTRBITS / 8	/* DW_AT_byte_size */
-	.long	die5e-d		/* DW_AT_type */
+	.4byte	die5e-d		/* DW_AT_type */
 die95:	.uleb128 0xc		/* DW_TAG_subprogram */
-	.long	die6a-d		/* DW_AT_specification */
+	.4byte	die6a-d		/* DW_AT_specification */
 	.byte	0x2		/* DW_AT_inline */
 die9f:	.uleb128 0xd		/* DW_TAG_formal_parameter */
-	.long	.LASF7		/* DW_AT_name */
-	.long	dieaf-d		/* DW_AT_type */
+	.4byte	.LASF7		/* DW_AT_name */
+	.4byte	dieaf-d		/* DW_AT_type */
 	.byte	0x1		/* DW_AT_artificial */
 diea9:	.uleb128 0x9		/* DW_TAG_formal_parameter */
-	.long	die7e-d		/* DW_AT_type */
+	.4byte	die7e-d		/* DW_AT_type */
 	.byte	0x0
 dieaf:	.uleb128 0xe		/* DW_TAG_const_type */
-	.long	die8f-d		/* DW_AT_type */
+	.4byte	die8f-d		/* DW_AT_type */
 dieb4:	.uleb128 0xf		/* DW_TAG_subprogram */
-	.long	die95-d		/* DW_AT_abstract_origin */
-	.long	_ZN1N1cE	/* DW_AT_low_pc */
-	.long	_ZN1N1cE + 1	/* DW_AT_high_pc */
+	.4byte	die95-d		/* DW_AT_abstract_origin */
+	.4byte	_ZN1N1cE	/* DW_AT_low_pc */
+	.4byte	_ZN1N1cE + 1	/* DW_AT_high_pc */
 diec9:	.uleb128 0x10		/* DW_TAG_subprogram */
-	.long	die9f-d		/* DW_AT_abstract_origin */
+	.4byte	die9f-d		/* DW_AT_abstract_origin */
 	.byte	2f-1f		/* DW_AT_location */
 1:
 	.byte	0x50		/* DW_OP_reg0 */
 2:
 died1:	.uleb128 0x10		/* DW_TAG_formal_parameter */
-	.long	diea9-d		/* DW_AT_abstract_origin */
+	.4byte	diea9-d		/* DW_AT_abstract_origin */
 	.byte	2f-1f		/* DW_AT_location */
 1:
 	.byte	0x51		/* DW_OP_reg1 */
@@ -133,19 +133,19 @@ died1:	.uleb128 0x10		/* DW_TAG_formal_parameter */
 	.byte	0x0
 dieda:	.uleb128 0x11		/* DW_TAG_subprogram */
 	.byte	0x1		/* DW_AT_external */
-	.long	.LASF8		/* DW_AT_name */
-	.long	dief2-d		/* DW_AT_type */
-	.long	_ZN1N1cE	/* DW_AT_low_pc */
-	.long	_ZN1N1cE + 1	/* DW_AT_high_pc */
+	.4byte	.LASF8		/* DW_AT_name */
+	.4byte	dief2-d		/* DW_AT_type */
+	.4byte	_ZN1N1cE	/* DW_AT_low_pc */
+	.4byte	_ZN1N1cE + 1	/* DW_AT_high_pc */
 dief2:	.uleb128 0x12		/* DW_TAG_base_type */
 	.byte	0x4		/* DW_AT_byte_size */
 	.byte	0x5		/* DW_AT_encoding */
 	.string	"int"		/* DW_AT_name */
 die149:	.uleb128 0x16		/* DW_TAG_variable */
-	.long	die4e-d		/* DW_AT_specification */
+	.4byte	die4e-d		/* DW_AT_specification */
 	.byte	0x5		/* DW_AT_location */
 	.byte	0x3
-	.long	_ZN1N1cE
+	.4byte	_ZN1N1cE
 	.byte	0x0
 .Ldebug_info_end:
 	.section	.debug_abbrev