Merge GDB 7.5.1

gdb/testsuite/gdb.dwarf2/dw2-param-error.S

Index: gdb/testsuite/gdb.dwarf2/dw2-param-error.S
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-param-error.S b/gdb/testsuite/gdb.dwarf2/dw2-param-error.S
index 49415459d64a843fba70d0da38a53022e978146c..1efb469f5164214d1a32cf40146e8ece02c4a700 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-param-error.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-param-error.S
@@ -18,10 +18,10 @@ var:	.4byte	23
 
 	.section	.debug_info
 debug_start:
-	.long	debug_end - 1f	/* Length of Compilation Unit Info */
+	.4byte	debug_end - 1f	/* Length of Compilation Unit Info */
 1:
 	.2byte	0x3	/* DWARF version number */
-	.long	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
+	.4byte	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
 	.byte	0x4	/* Pointer Size (in bytes) */
 	.uleb128 0x1	/* (DIE (0xb) DW_TAG_compile_unit) */
 	.ascii "GNU C 4.4.3\0"	/* DW_AT_producer */
@@ -29,19 +29,19 @@ debug_start:
 	.ascii "1.c\0"	/* DW_AT_name */
 	.uleb128 0x4	/* (DIE (0x3c) DW_TAG_subprogram) */
 	.ascii "f\0"	/* DW_AT_name */
-	.long	f_start	/* DW_AT_low_pc */
-	.long	f_end	/* DW_AT_high_pc */
+	.4byte	f_start	/* DW_AT_low_pc */
+	.4byte	f_end	/* DW_AT_high_pc */
 	.byte	0x1	/* DW_AT_prototyped */
 
 	.uleb128 0x5	/* (DIE (0x42) DW_TAG_formal_parameter) */
 	.ascii	"bad\0"		/* DW_AT_name */
-	.long	type - debug_start	/* DW_AT_type */
+	.4byte	type - debug_start	/* DW_AT_type */
 	.byte	2f - 1f	/* DW_AT_location */
 1:	.byte	0x06	/* DW_OP_deref */
 2:
 	.uleb128 0x5	/* (DIE (0x??) DW_TAG_formal_parameter) */
 	.ascii	"good\0"		/* DW_AT_name */
-	.long	type - debug_start	/* DW_AT_type */
+	.4byte	type - debug_start	/* DW_AT_type */
 	.byte	2f - 1f	/* DW_AT_location */
 1:	.byte	0x03	/* DW_OP_addr */
 	.4byte	var