This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[SH] gdb.dwarf2 tests: use .byte4 instead of .long


Hi!

Several of the gdb.dwarf2 tests currently fail to *build* for SH as
follows:

    gdb.dwarf2/dw2-double-set-die-type.S: Assembler messages:
    gdb.dwarf2/dw2-double-set-die-type.S:45: Error: misaligned data
    gdb.dwarf2/dw2-double-set-die-type.S:53: Error: misaligned data
    [...]

This is not surprising:

    [...]
    40          .section        .debug_info
    41  .Lcu1_begin:
    42          .4byte  .Lcu1_end - .Lcu1_start /* Length of Compilation Unit Info */
    43  .Lcu1_start:
    44          .2byte  0x3     /* DWARF version number */
    45          .long   .Labbrev1_begin /* Offset Into Abbrev. Section */
    46          .byte   0x4     /* Pointer Size (in bytes) */
    [...]

SH's gas port doesn't like the non-aligned .long: .ualong is to be used
in such cases.  But, there's something better than conditionalizing all
these for different architectures: .4byte is meant to be used for
describing DWARF data structures, and is in fact used in all the other
assembler files in gdb.dwarf2.

I tested the following patch.  There are no regressions for x86_64 (in
fact, as to be expected, all object files are identical).  For SH, most
of the now buildable tests PASS, and two other issues (that were hidden
until now) have been unvcovered, but these are separate from the .4byte
patch:

     Running /scratch/tschwing/FM_sh-elf/src/gdb-mainline/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.exp ...
    -gdb compile failed, /scratch/tschwing/FM_sh-elf/src/gdb-mainline/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.S: Assembler messages:
    -/scratch/tschwing/FM_sh-elf/src/gdb-mainline/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.S:21: Error: misaligned data
    +gdb compile failed, /scratch/tschwing/FM_sh-elf/obj/test-mainline-0-sh-elf/host-i686-pc-linux-gnu/default/gdb.d/gdb.dwarf2/implptr-optimized-out0.o: In function `d':
    +(.debug_info+0x37): undefined reference to `main'
    +/scratch/tschwing/FM_sh-elf/obj/test-mainline-0-sh-elf/host-i686-pc-linux-gnu/default/gdb.d/gdb.dwarf2/implptr-optimized-out0.o: In function `d':
    +(.debug_info+0x3b): undefined reference to `main'
    +collect2: error: ld returned 1 exit status
     UNTESTED: gdb.dwarf2/implptr-optimized-out.exp: implptr-optimized-out.exp

     Running /scratch/tschwing/FM_sh-elf/src/gdb-mainline/gdb/testsuite/gdb.dwarf2/pr11465.exp ...
    -gdb compile failed, /scratch/tschwing/FM_sh-elf/src/gdb-mainline/gdb/testsuite/gdb.dwarf2/pr11465.S: Assembler messages:
    -/scratch/tschwing/FM_sh-elf/src/gdb-mainline/gdb/testsuite/gdb.dwarf2/pr11465.S:50: Error: misaligned data
    -[...]
    +FAIL: gdb.dwarf2/pr11465.exp: p N::c.C

OK to commit?

gdb/testsuite/

	* gdb.dwarf2/dw2-ada-ffffffff.S: Use .4byte instead of .long for
	describing DWARF data structures.
	* gdb.dwarf2/dw2-bad-parameter-type.S: Likewise.
	* gdb.dwarf2/dw2-double-set-die-type.S: Likewise.
	* gdb.dwarf2/dw2-empty-pc-range.S: Likewise.
	* gdb.dwarf2/dw2-entry-value.S: Likewise.
	* gdb.dwarf2/dw2-modula2-self-type.S: Likewise.
	* gdb.dwarf2/dw2-param-error.S: Likewise.
	* gdb.dwarf2/dw2-skip-prologue.S: Likewise.
	* gdb.dwarf2/dw2-stack-boundary.S: Likewise.
	* gdb.dwarf2/dw4-sig-type-unused.S: Likewise.
	* gdb.dwarf2/implptr-optimized-out.S: Likewise.
	* gdb.dwarf2/member-ptr-forwardref.S: Likewise.
	* gdb.dwarf2/pr11465.S: Likewise.

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.S b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.S
index fa38819..d659a5b 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-ada-ffffffff.S
@@ -15,10 +15,10 @@
 
 	.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 */
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.S b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.S
index 932c433..d0f84ae 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-bad-parameter-type.S
@@ -15,10 +15,10 @@
 
 	.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 */
@@ -27,12 +27,12 @@ debug_start:
 	.uleb128 0x4	/* (DIE (0x3c) DW_TAG_subprogram) */
 	.ascii "f\0"	/* DW_AT_name */
 /* Value 0 would require has_section_at_zero != 0 (which is true, though).  */
-	.long	1	/* DW_AT_low_pc */
-	.long	2	/* DW_AT_high_pc */
+	.4byte	1	/* DW_AT_low_pc */
+	.4byte	2	/* DW_AT_high_pc */
 	.byte	0x1	/* DW_AT_prototyped */
 	.uleb128 0x5	/* (DIE (0x42) DW_TAG_formal_parameter) */
 /* Invalid value.  */
-	.long	0x0	/* DW_AT_type */
+	.4byte	0x0	/* DW_AT_type */
 	.byte	0x0	/* end of children of DIE 0x3c */
 	.byte	0x0	/* end of children of DIE 0xb */
 debug_end:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.S b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.S
index 1c8164b..392fe54 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-double-set-die-type.S
@@ -42,7 +42,7 @@
 	.4byte	.Lcu1_end - .Lcu1_start	/* Length of Compilation Unit Info */
 .Lcu1_start:
 	.2byte	0x3	/* DWARF version number */
-	.long	.Labbrev1_begin	/* Offset Into Abbrev. Section */
+	.4byte	.Labbrev1_begin	/* Offset Into Abbrev. Section */
 	.byte	0x4	/* Pointer Size (in bytes) */
 
 .Ldie_b:
@@ -50,12 +50,12 @@
 	.ascii	"GNU C++ 4.4.3 20100127 (Red Hat 4.4.3-4)\0"	/* DW_AT_producer */
 	.byte	0x4	/* DW_AT_language */
 	.ascii	"duplicate-type.cc\0"	/* DW_AT_name */
-	.long	.Ldebug_line0	/* DW_AT_stmt_list */
+	.4byte	.Ldebug_line0	/* DW_AT_stmt_list */
 
 .Ldie_38:
 	.uleb128 0x3	/* (DIE (0x38) DW_TAG_typedef) */
 	.ascii	"size_t\0"	/* DW_AT_name */
-	.long	OFFSET (43)	/* DW_AT_type */
+	.4byte	OFFSET (43)	/* DW_AT_type */
 
 .Ldie_43:
 	.uleb128 0x2	/* (DIE (0x43) DW_TAG_base_type) */
@@ -66,7 +66,7 @@
 .Ldie_4a:
 	.uleb128 0x4	/* (DIE (0x4a) DW_TAG_namespace) */
 	.ascii "std\0"	/* DW_AT_name */
-	.long	OFFSET (143)	/* DW_AT_sibling */
+	.4byte	OFFSET (143)	/* DW_AT_sibling */
 
 .Ldie_70:
 	.uleb128 0x8	/* (DIE (0x70) DW_TAG_class_type) */
@@ -77,7 +77,7 @@
 	.uleb128 0x9	/* (DIE (0x76) DW_TAG_structure_type) */
 	.ascii	"_Vector_base<a::b, std::allocator<a::b> >\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_declaration */
-	.long	OFFSET (f7)	/* DW_AT_sibling */
+	.4byte	OFFSET (f7)	/* DW_AT_sibling */
 
 .Ldie_80:
 	.uleb128 0xa	/* (DIE (0x80) DW_TAG_structure_type) */
@@ -86,7 +86,7 @@
 
 .Ldie_88:
 	.uleb128 0xb	/* (DIE (0x88) DW_TAG_inheritance) */
-	.long	OFFSET (3e0)	/* DW_AT_type */
+	.4byte	OFFSET (3e0)	/* DW_AT_type */
 	.sleb128 0	/* DW_AT_data_member_location */
 	.byte	0x1	/* DW_AT_accessibility */
 	.byte	0x0	/* end of children of DIE 0x80 */
@@ -117,7 +117,7 @@
 .Ldie_1c6:
 	.uleb128 0x17	/* (DIE (0x1c6) DW_TAG_pointer_type) */
 	.byte	0x8	/* DW_AT_byte_size */
-	.long	OFFSET (1cc)	/* DW_AT_type */
+	.4byte	OFFSET (1cc)	/* DW_AT_type */
 
 .Ldie_1cc:
 	.uleb128 0x18	/* (DIE (0x1cc) DW_TAG_const_type) */
@@ -132,13 +132,13 @@
 	.uleb128 0x1b	/* (DIE (0x221) DW_TAG_class_type) */
 	.ascii "a\0"	/* DW_AT_name */
 	.byte	0x18	/* DW_AT_byte_size */
-	.long	OFFSET (277)	/* DW_AT_sibling */
+	.4byte	OFFSET (277)	/* DW_AT_sibling */
 
 .Ldie_22b:
 	.uleb128 0x1b	/* (DIE (0x22b) DW_TAG_class_type) */
 	.ascii "b\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_byte_size */
-	.long	OFFSET (244)	/* DW_AT_sibling */
+	.4byte	OFFSET (244)	/* DW_AT_sibling */
 
 .Ldie_235:
 	.uleb128 0x1c	/* (DIE (0x235) DW_TAG_subprogram) */
@@ -148,7 +148,7 @@
 
 .Ldie_23c:
 	.uleb128 0xe	/* (DIE (0x23c) DW_TAG_formal_parameter) */
-	.long	OFFSET (277)	/* DW_AT_type */
+	.4byte	OFFSET (277)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 	.byte	0x0	/* end of children of DIE 0x235 */
 	.byte	0x0	/* end of children of DIE 0x22b */
@@ -156,7 +156,7 @@
 .Ldie_244:
 	.uleb128 0x1d	/* (DIE (0x244) DW_TAG_member) */
 	.ascii	"list\0"	/* DW_AT_name */
-	.long	OFFSET (59d)	/* DW_AT_type */
+	.4byte	OFFSET (59d)	/* DW_AT_type */
 	.sleb128 0	/* DW_AT_data_member_location */
 	.byte	0x3	/* DW_AT_accessibility */
 
@@ -166,11 +166,11 @@
 	.ascii "a\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_artificial */
 	.byte	0x1	/* DW_AT_declaration */
-	.long	OFFSET (262)	/* DW_AT_sibling */
+	.4byte	OFFSET (262)	/* DW_AT_sibling */
 
 .Ldie_25b:
 	.uleb128 0xe	/* (DIE (0x25b) DW_TAG_formal_parameter) */
-	.long	OFFSET (b61)	/* DW_AT_type */
+	.4byte	OFFSET (b61)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 	.byte	0x0	/* end of children of DIE 0x251 */
 
@@ -183,12 +183,12 @@
 
 .Ldie_269:
 	.uleb128 0xe	/* (DIE (0x269) DW_TAG_formal_parameter) */
-	.long	OFFSET (b61)	/* DW_AT_type */
+	.4byte	OFFSET (b61)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 
 .Ldie_26f:
 	.uleb128 0xe	/* (DIE (0x26f) DW_TAG_formal_parameter) */
-	.long	OFFSET (19f)	/* DW_AT_type */
+	.4byte	OFFSET (19f)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 	.byte	0x0	/* end of children of DIE 0x262 */
 	.byte	0x0	/* end of children of DIE 0x221 */
@@ -196,143 +196,143 @@
 .Ldie_277:
 	.uleb128 0x17	/* (DIE (0x277) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	OFFSET (22b)	/* DW_AT_type */
+	.4byte	OFFSET (22b)	/* DW_AT_type */
 
 .Ldie_27d:
 	.uleb128 0x20	/* (DIE (0x27d) DW_TAG_class_type) */
-	.long	OFFSET (162)	/* DW_AT_specification */
+	.4byte	OFFSET (162)	/* DW_AT_specification */
 	.byte	0x1	/* DW_AT_byte_size */
-	.long	OFFSET (3b2)	/* DW_AT_sibling */
+	.4byte	OFFSET (3b2)	/* DW_AT_sibling */
 
 .Ldie_2d0:
 	.uleb128 0x21	/* (DIE (0x2d0) DW_TAG_subprogram) */
 	.byte	0x1	/* DW_AT_external */
 	.ascii	"address\0"	/* DW_AT_name */
-	.long	OFFSET (277)	/* DW_AT_type */
+	.4byte	OFFSET (277)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_declaration */
-	.long	OFFSET (3b2)	/* DW_AT_sibling */
+	.4byte	OFFSET (3b2)	/* DW_AT_sibling */
 
 .Ldie_2e5:
 	.uleb128 0xe	/* (DIE (0x2e5) DW_TAG_formal_parameter) */
-	.long	OFFSET (3da)	/* DW_AT_type */
+	.4byte	OFFSET (3da)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 
 .Ldie_2eb:
 	.uleb128 0xf	/* (DIE (0x2eb) DW_TAG_formal_parameter) */
-	.long	OFFSET (3bd)	/* DW_AT_type */
+	.4byte	OFFSET (3bd)	/* DW_AT_type */
 	.byte	0x0	/* end of children of DIE 0x2d0 */
 	.byte	0x0	/* end of children of DIE 0x27d */
 
 .Ldie_3b2:
 	.uleb128 0x17	/* (DIE (0x3b2) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	OFFSET (3b8)	/* DW_AT_type */
+	.4byte	OFFSET (3b8)	/* DW_AT_type */
 
 .Ldie_3b8:
 	.uleb128 0x19	/* (DIE (0x3b8) DW_TAG_const_type) */
-	.long	OFFSET (22b)	/* DW_AT_type */
+	.4byte	OFFSET (22b)	/* DW_AT_type */
 
 .Ldie_3bd:
 	.uleb128 0x22	/* (DIE (0x3bd) DW_TAG_reference_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	OFFSET (22b)	/* DW_AT_type */
+	.4byte	OFFSET (22b)	/* DW_AT_type */
 
 .Ldie_3d5:
 	.uleb128 0x19	/* (DIE (0x3d5) DW_TAG_const_type) */
-	.long	OFFSET (27d)	/* DW_AT_type */
+	.4byte	OFFSET (27d)	/* DW_AT_type */
 
 .Ldie_3da:
 	.uleb128 0x17	/* (DIE (0x3da) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	OFFSET (3d5)	/* DW_AT_type */
+	.4byte	OFFSET (3d5)	/* DW_AT_type */
 
 .Ldie_3e0:
 	.Uleb128 0x20	/* (DIE (0x3e0) DW_TAG_class_type) */
-	.long	OFFSET (70)	/* DW_AT_specification */
+	.4byte	OFFSET (70)	/* DW_AT_specification */
 	.byte	0x1	/* DW_AT_byte_size */
-	.long	OFFSET (44e)	/* DW_AT_sibling */
+	.4byte	OFFSET (44e)	/* DW_AT_sibling */
 
 .Ldie_3ec:
 	.uleb128 0xb	/* (DIE (0x3ec) DW_TAG_inheritance) */
-	.long	OFFSET (27d)	/* DW_AT_type */
+	.4byte	OFFSET (27d)	/* DW_AT_type */
 	.sleb128 0	/* DW_AT_data_member_location */
 	.byte	0x1	/* DW_AT_accessibility */
 	.byte	0x0	/* end of children of DIE 0x3e0 */
 
 .Ldie_44e:
 	.uleb128 0x1a	/* (DIE (0x44e) DW_TAG_structure_type) */
-	.long	OFFSET (76)	/* DW_AT_specification */
+	.4byte	OFFSET (76)	/* DW_AT_specification */
 	.byte	0x18	/* DW_AT_byte_size */
-	.long	OFFSET (505)	/* DW_AT_sibling */
+	.4byte	OFFSET (505)	/* DW_AT_sibling */
 
 .Ldie_505:
 	.uleb128 0x11	/* (DIE (0x505) DW_TAG_subprogram) */
 	.ascii	"~_Vector_base\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_declaration */
-	.long	OFFSET (51f)	/* DW_AT_sibling */
+	.4byte	OFFSET (51f)	/* DW_AT_sibling */
 
 .Ldie_512:
 	.uleb128 0xe	/* (DIE (0x512) DW_TAG_formal_parameter) */
-	.long	OFFSET (58c)	/* DW_AT_type */
+	.4byte	OFFSET (58c)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 
 .Ldie_518:
 	.uleb128 0xf	/* (DIE (0x518) DW_TAG_formal_parameter) */
-	.long	OFFSET (19f)	/* DW_AT_type */
+	.4byte	OFFSET (19f)	/* DW_AT_type */
 	.byte	0x0	/* end of children of DIE 0x505 */
 
 .Ldie_51f:
 	.uleb128 0x23	/* (DIE (0x51f) DW_TAG_subprogram) */
 	.byte	0x1	/* DW_AT_external */
 	.ascii	"_M_allocate\0"	/* DW_AT_name */
-	.long	OFFSET (277)	/* DW_AT_type */
+	.4byte	OFFSET (277)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_declaration */
-	.long	OFFSET (540)	/* DW_AT_sibling */
+	.4byte	OFFSET (540)	/* DW_AT_sibling */
 
 .Ldie_540:
 	.uleb128 0x11	/* (DIE (0x540) DW_TAG_subprogram) */
 	.ascii	"_M_deallocate\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_declaration */
-	.long	OFFSET (562)	/* DW_AT_sibling */
+	.4byte	OFFSET (562)	/* DW_AT_sibling */
 
 .Ldie_551:
 	.uleb128 0xe	/* (DIE (0x551) DW_TAG_formal_parameter) */
-	.long	OFFSET (58c)	/* DW_AT_type */
+	.4byte	OFFSET (58c)	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 
 .Ldie_557:
 	.uleb128 0xf	/* (DIE (0x557) DW_TAG_formal_parameter) */
-	.long	OFFSET (277)	/* DW_AT_type */
+	.4byte	OFFSET (277)	/* DW_AT_type */
 
 .Ldie_55c:
 	.uleb128 0xf	/* (DIE (0x55c) DW_TAG_formal_parameter) */
-	.long	OFFSET (43)	/* DW_AT_type */
+	.4byte	OFFSET (43)	/* DW_AT_type */
 	.byte	0x0	/* end of children of DIE 0x540 */
 
 .Ldie_562:
 	.uleb128 0x5	/* (DIE (0x562) DW_TAG_imported_declaration) */
-	.long	OFFSET (51f)	/* DW_AT_import */
+	.4byte	OFFSET (51f)	/* DW_AT_import */
 	.byte	0x0	/* end of children of DIE 0x44e */
 
 .Ldie_586:
 	.uleb128 0x22	/* (DIE (0x586) DW_TAG_reference_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	OFFSET (3e0)	/* DW_AT_type */
+	.4byte	OFFSET (3e0)	/* DW_AT_type */
 
 .Ldie_58c:
 	.uleb128 0x17	/* (DIE (0x58c) DW_TAG_pointer_type) */
 	.byte	0x8	/* DW_AT_byte_size */
-	.long	OFFSET (44e)	/* DW_AT_type */
+	.4byte	OFFSET (44e)	/* DW_AT_type */
 
 .Ldie_59d:
 	.uleb128 0x20	/* (DIE (0x59d) DW_TAG_class_type) */
-	.long	OFFSET (f7)	/* DW_AT_specification */
+	.4byte	OFFSET (f7)	/* DW_AT_specification */
 	.byte	0x18	/* DW_AT_byte_size */
-	.long	OFFSET (b44)	/* DW_AT_sibling */
+	.4byte	OFFSET (b44)	/* DW_AT_sibling */
 
 .Ldie_5a9:
 	.uleb128 0xb	/* (DIE (0x5a9) DW_TAG_inheritance) */
-	.long	OFFSET (44e)	/* DW_AT_type */
+	.4byte	OFFSET (44e)	/* DW_AT_type */
 	.sleb128 0	/* DW_AT_data_member_location */
 	.byte	0x2	/* DW_AT_accessibility */
 	.byte	0x0	/* end of children of DIE 0x59d */
@@ -340,12 +340,12 @@
 .Ldie_b44:
 	.uleb128 0x17	/* (DIE (0xb44) DW_TAG_pointer_type) */
 	.byte	0x8	/* DW_AT_byte_size */
-	.long	OFFSET (59d) /* DW_AT_type */
+	.4byte	OFFSET (59d) /* DW_AT_type */
 
 .Ldie_b61:
 	.uleb128 0x17	/* (DIE (0xb61) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	OFFSET (221) /* DW_AT_type */
+	.4byte	OFFSET (221) /* DW_AT_type */
 	.byte	0x0	/* end of children of DIE 0xb */
 .Lcu1_end:
 
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S b/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S
index 21bb249..0dc9164 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-empty-pc-range.S
@@ -20,10 +20,10 @@ pc_end:
 
 	.section	.debug_info
 d:
-	.long	.Ldebug_info_end - 1f	/* Length of Compilation Unit Info */
+	.4byte	.Ldebug_info_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) */
 dieb:
 	.uleb128 0x1	/* (DIE (0xb) DW_TAG_compile_unit) */
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.S b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.S
index 080491e..caf06cb 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-entry-value.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-entry-value.S
@@ -15,10 +15,10 @@
 
 	.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 */
@@ -26,13 +26,13 @@ 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	"param\0"		/* DW_AT_name */
-	.long	type - debug_start	/* DW_AT_type */
-	.long	loclist	/* DW_AT_location */
+	.4byte	type - debug_start	/* DW_AT_type */
+	.4byte	loclist	/* DW_AT_location */
 	.byte	0x0	/* end of children of DIE 0x3c */
 type:
 	.uleb128	3			/* Abbrev: DW_TAG_base_type */
@@ -45,13 +45,13 @@ debug_end:
 
 	.section	.debug_loc
 loclist:
-	.long	f_start, f_end
+	.4byte	f_start, f_end
 	.2byte	2f-1f
 1:	.byte	0xf3	/* DW_OP_GNU_entry_value */
 	.uleb128  2f-3f
 3:	.byte	0x50	/* DW_OP_reg0 */
 2:
-	.long	0, 0
+	.4byte	0, 0
 
 	.section	.debug_abbrev
 .Ldebug_abbrev0:
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.S b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.S
index baa6cd0..99a96b6 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-modula2-self-type.S
@@ -26,35 +26,35 @@ v:	.long	0
 
 	.section	.debug_info
 d:
-	.long	.Ldebug_info_end - 1f	/* Length of Compilation Unit Info */
+	.4byte	.Ldebug_info_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) */
 dieb:
 	.uleb128 0x1	/* (DIE (0xb) DW_TAG_compile_unit) */
-	.long	.LASF0	/* DW_AT_producer */
+	.4byte	.LASF0	/* DW_AT_producer */
 	.byte	0xa	/* DW_AT_language = DW_LANG_Modula2 */
-	.long	.LASF1	/* DW_AT_name: "2.mod" */
-	.long	.LASF2	/* DW_AT_comp_dir: "" */
+	.4byte	.LASF1	/* DW_AT_name: "2.mod" */
+	.4byte	.LASF2	/* DW_AT_comp_dir: "" */
 
 die210:
 	.uleb128 0x5	/* (DIE (0x210) DW_TAG_subroutine_type) */
 die215:
 	.uleb128 0x6	/* (DIE (0x215) DW_TAG_formal_parameter) */
-	.long	die21b-d	/* DW_AT_type */
+	.4byte	die21b-d	/* DW_AT_type */
 	.byte	0x0	/* end of children of DIE 0x210 */
 die21b:
 	.uleb128 0x7	/* (DIE (0x21b) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	die210-d	/* DW_AT_type */
+	.4byte	die210-d	/* DW_AT_type */
 die221:
 	.uleb128 0x8	/* (DIE (0x221) DW_TAG_variable) */
 	.ascii "v\0"	/* DW_AT_name */
-	.long	die21b-d	/* DW_AT_type */
+	.4byte	die21b-d	/* DW_AT_type */
 	.byte	2f-1f	/* DW_AT_location */
 1:	.byte	0x3	/* DW_OP_addr */
-	.long	v
+	.4byte	v
 2:
 
 	.byte	0x0	/* end of children of DIE 0xb */
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-param-error.S b/gdb/testsuite/gdb.dwarf2/dw2-param-error.S
index 4941545..1efb469 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
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.S b/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.S
index de3ed5f..1d2c006 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-skip-prologue.S
@@ -46,8 +46,8 @@
 
 	.uleb128	0x7			/* (DIE (0x42) DW_TAG_formal_parameter) */
 	.ascii		"param\0"		/* DW_AT_name */
-	.long		.Ltype_int - .Lcu1_begin	/* DW_AT_type */
-	.long		loclist			/* DW_AT_location */
+	.4byte		.Ltype_int - .Lcu1_begin	/* DW_AT_type */
+	.4byte		loclist			/* DW_AT_location */
 
 	.uleb128	4			/* Abbrev: DW_TAG_inlined_subroutine */
 	.ascii		"inlined\0"		/* DW_AT_name */
@@ -115,14 +115,14 @@
 	.section	.debug_loc
 loclist:
 	/* Reset the location list base address first.  */
-	.long		-1, 0
+	.4byte		-1, 0
 
-	.long		func_start, func_end
+	.4byte		func_start, func_end
 	.2byte		2f-1f
 1:	.byte		0x50	/* DW_OP_reg0 */
 2:
 	/* Location list end.  */
-	.long	0, 0
+	.4byte	0, 0
 
 /* Abbrev table */
 	.section .debug_abbrev
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.S b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.S
index 4112dd1..ace2022 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.S
+++ b/gdb/testsuite/gdb.dwarf2/dw2-stack-boundary.S
@@ -15,10 +15,10 @@
 
 	.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 */
diff --git a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.S b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.S
index ff8c260..8cae690 100644
--- a/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.S
+++ b/gdb/testsuite/gdb.dwarf2/dw4-sig-type-unused.S
@@ -15,10 +15,10 @@
 
 	.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	0x4	/* DWARF version number */
-	.long	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
+	.4byte	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
 	.byte	0x4	/* Pointer Size (in bytes) */
 	.uleb128 0x3	/* (DIE (0xb) DW_TAG_compile_unit) */
 	.ascii "GNU C 4.4.3\0"	/* DW_AT_producer */
@@ -29,15 +29,15 @@ debug_end:
 	.section	.debug_types
 types_start:
 	.macro	unit sig1 sig2 name
-	.long	2f - 1f	/* Length of Compilation Unit Info */
+	.4byte	2f - 1f	/* Length of Compilation Unit Info */
 1:
 	.2byte	0x4	/* DWARF version number */
-	.long	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
+	.4byte	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
 	.byte	0x4	/* Pointer Size (in bytes) */
 	/* signature */
 	.4byte	\sig1
 	.4byte	\sig2
-	.long	3f-types_start	/* offset into type DIE */
+	.4byte	3f-types_start	/* offset into type DIE */
 	.uleb128 0x1	/* DW_TAG_type_unit) */
 	.byte	0x0c	/* DW_AT_language = DW_LANG_C99 */
 3:
diff --git a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.S b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.S
index 673e56e..2f268b1 100644
--- a/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.S
+++ b/gdb/testsuite/gdb.dwarf2/implptr-optimized-out.S
@@ -15,10 +15,10 @@
 
 	.section	.debug_info
 d:
-	.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 */
@@ -53,7 +53,7 @@ d:
 .Ltype_structptr:
 	.uleb128 0x5	/* DW_TAG_pointer_type */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	.Ltype_struct - d	/* DW_AT_type */
+	.4byte	.Ltype_struct - d	/* DW_AT_type */
 
 .Lvar_out:
 	.uleb128 0x4	/* (DW_TAG_variable) */
diff --git a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S
index db84f16..8650268 100644
--- a/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S
+++ b/gdb/testsuite/gdb.dwarf2/member-ptr-forwardref.S
@@ -56,46 +56,46 @@ c:
 .Letext0:
 	.file 1 "gdb.dwarf2/member-ptr-forwardref.cc"
 	.section	.debug_info
-	.long	0xa9	/* Length of Compilation Unit Info */
+	.4byte	0xa9	/* Length of Compilation Unit Info */
 	.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) */
-	.long	.LASF2	/* DW_AT_producer: "GNU C++ 4.4.2 20091222 (Red Hat 4.4.2-20)" */
+	.4byte	.LASF2	/* DW_AT_producer: "GNU C++ 4.4.2 20091222 (Red Hat 4.4.2-20)" */
 	.byte	0x4	/* DW_AT_language */
-	.long	.LASF3	/* DW_AT_name: "gdb.dwarf2/member-ptr-forwardref.cc" */
-	.long	.LASF4	/* DW_AT_comp_dir: "gdb/testsuite" */
-	.long	.Ltext0	/* DW_AT_low_pc */
-	.long	.Letext0	/* DW_AT_high_pc */
-	.long	.Ldebug_line0	/* DW_AT_stmt_list */
+	.4byte	.LASF3	/* DW_AT_name: "gdb.dwarf2/member-ptr-forwardref.cc" */
+	.4byte	.LASF4	/* DW_AT_comp_dir: "gdb/testsuite" */
+	.4byte	.Ltext0	/* DW_AT_low_pc */
+	.4byte	.Letext0	/* DW_AT_high_pc */
+	.4byte	.Ldebug_line0	/* DW_AT_stmt_list */
 	.uleb128 0x2	/* (DIE (0x25) DW_TAG_typedef) */
-	.long	.LASF5	/* DW_AT_name: "fp_t" */
+	.4byte	.LASF5	/* DW_AT_name: "fp_t" */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x13	/* DW_AT_decl_line */
-	.long	0x30	/* DW_AT_type */
+	.4byte	0x30	/* DW_AT_type */
 	.uleb128 0x3	/* (DIE (0x30) DW_TAG_structure_type) */
 	.byte	0x8	/* DW_AT_byte_size */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x13	/* DW_AT_decl_line */
-	.long	0x51	/* DW_AT_sibling */
+	.4byte	0x51	/* DW_AT_sibling */
 	.uleb128 0x4	/* (DIE (0x38) DW_TAG_member) */
-	.long	.LASF0	/* DW_AT_name: "__pfn" */
+	.4byte	.LASF0	/* DW_AT_name: "__pfn" */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x13	/* DW_AT_decl_line */
-	.long	0x85	/* DW_AT_type */
+	.4byte	0x85	/* DW_AT_type */
 	.sleb128 0	/* DW_AT_data_member_location */
 	.uleb128 0x4	/* (DIE (0x44) DW_TAG_member) */
-	.long	.LASF1	/* DW_AT_name: "__delta" */
+	.4byte	.LASF1	/* DW_AT_name: "__delta" */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x13	/* DW_AT_decl_line */
-	.long	0x61	/* DW_AT_type */
+	.4byte	0x61	/* DW_AT_type */
 	.sleb128 4	/* DW_AT_data_member_location */
 	.byte	0x0	/* end of children of DIE 0x30 */
 	.uleb128 0x5	/* (DIE (0x51) DW_TAG_subroutine_type) */
-	.long	0x61	/* DW_AT_type */
-	.long	0x61	/* DW_AT_sibling */
+	.4byte	0x61	/* DW_AT_type */
+	.4byte	0x61	/* DW_AT_sibling */
 	.uleb128 0x6	/* (DIE (0x5a) DW_TAG_formal_parameter) */
-	.long	0x68	/* DW_AT_type */
+	.4byte	0x68	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_artificial */
 	.byte	0x0	/* end of children of DIE 0x51 */
 	.uleb128 0x7	/* (DIE (0x61) DW_TAG_base_type) */
@@ -104,42 +104,42 @@ c:
 	.ascii "int\0"	/* DW_AT_name */
 	.uleb128 0x8	/* (DIE (0x68) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	0x6e	/* DW_AT_type */
+	.4byte	0x6e	/* DW_AT_type */
 	.uleb128 0x9	/* (DIE (0x6e) DW_TAG_structure_type) */
 	.ascii "C\0"	/* DW_AT_name */
 	.byte	0x8	/* DW_AT_byte_size */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x16	/* DW_AT_decl_line */
-	.long	0x85	/* DW_AT_sibling */
+	.4byte	0x85	/* DW_AT_sibling */
 	.uleb128 0xa	/* (DIE (0x78) DW_TAG_member) */
 	.ascii "fp\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x17	/* DW_AT_decl_line */
-	.long	0x30	/* DW_AT_type */
+	.4byte	0x30	/* DW_AT_type */
 	.sleb128 0	/* DW_AT_data_member_location */
 	.byte	0x3	/* DW_AT_accessibility */
 	.byte	0x0	/* end of children of DIE 0x6e */
 	.uleb128 0x8	/* (DIE (0x85) DW_TAG_pointer_type) */
 	.byte	0x4	/* DW_AT_byte_size */
-	.long	0x51	/* DW_AT_type */
+	.4byte	0x51	/* DW_AT_type */
 	.uleb128 0xb	/* (DIE (0x8b) DW_TAG_variable) */
 	.ascii "fp\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x14	/* DW_AT_decl_line */
-	.long	0x25	/* DW_AT_type */
+	.4byte	0x25	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_external */
 	.byte	0x5	/* DW_AT_location */
 	.byte	0x3	/* DW_OP_addr */
-	.long	fp
+	.4byte	fp
 	.uleb128 0xb	/* (DIE (0x9c) DW_TAG_variable) */
 	.ascii "c\0"	/* DW_AT_name */
 	.byte	0x1	/* DW_AT_decl_file (gdb.dwarf2/member-ptr-forwardref.cc) */
 	.byte	0x18	/* DW_AT_decl_line */
-	.long	0x6e	/* DW_AT_type */
+	.4byte	0x6e	/* DW_AT_type */
 	.byte	0x1	/* DW_AT_external */
 	.byte	0x5	/* DW_AT_location */
 	.byte	0x3	/* DW_OP_addr */
-	.long	c
+	.4byte	c
 	.byte	0x0	/* end of children of DIE 0xb */
 	.section	.debug_abbrev
 	.uleb128 0x1	/* (abbrev code) */
@@ -291,25 +291,25 @@ c:
 	.byte	0x0
 	.byte	0x0
 	.section	.debug_pubnames,"",@progbits
-	.long	0x1b	/* Length of Public Names Info */
+	.4byte	0x1b	/* Length of Public Names Info */
 	.2byte	0x2	/* DWARF Version */
-	.long	.Ldebug_info0	/* Offset of Compilation Unit Info */
-	.long	0xad	/* Compilation Unit Length */
-	.long	0x8b	/* DIE offset */
+	.4byte	.Ldebug_info0	/* Offset of Compilation Unit Info */
+	.4byte	0xad	/* Compilation Unit Length */
+	.4byte	0x8b	/* DIE offset */
 	.ascii "fp\0"	/* external name */
-	.long	0x9c	/* DIE offset */
+	.4byte	0x9c	/* DIE offset */
 	.ascii "c\0"	/* external name */
-	.long	0x0
+	.4byte	0x0
 	.section	.debug_pubtypes,"",@progbits
-	.long	0x1d	/* Length of Public Type Names Info */
+	.4byte	0x1d	/* Length of Public Type Names Info */
 	.2byte	0x2	/* DWARF Version */
-	.long	.Ldebug_info0	/* Offset of Compilation Unit Info */
-	.long	0xad	/* Compilation Unit Length */
-	.long	0x25	/* DIE offset */
+	.4byte	.Ldebug_info0	/* Offset of Compilation Unit Info */
+	.4byte	0xad	/* Compilation Unit Length */
+	.4byte	0x25	/* DIE offset */
 	.ascii "fp_t\0"	/* external name */
-	.long	0x6e	/* DIE offset */
+	.4byte	0x6e	/* DIE offset */
 	.ascii "C\0"	/* external name */
-	.long	0x0
+	.4byte	0x0
 	.section	.debug_str,"MS",@progbits,1
 .LASF5:
 	.string	"fp_t"
diff --git a/gdb/testsuite/gdb.dwarf2/pr11465.S b/gdb/testsuite/gdb.dwarf2/pr11465.S
index 730ee9e..0433df7 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


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]