* gdb.dwarf2/dup-psym.S: Use .2byte/.4byte instead of .short/.int

	in the dwarf sections.
	* gdb.dwarf2/mac-fileno.S: Likewise.

3 files changed, 33 insertions, 29 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e3b523a..811290e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-31  Andreas Schwab  <schwab@suse.de>
 
+	* gdb.dwarf2/dup-psym.S: Use .2byte/.4byte instead of .short/.int
+	in the dwarf sections.
+	* gdb.dwarf2/mac-fileno.S: Likewise.
+
 	* gdb.base/callfuncs.exp (do_get_all_registers): Filter out
 	bspstore register on ia64.
 
diff --git a/gdb/testsuite/gdb.dwarf2/dup-psym.S b/gdb/testsuite/gdb.dwarf2/dup-psym.S
index d2b87a2..4cefb90 100644
--- a/gdb/testsuite/gdb.dwarf2/dup-psym.S
+++ b/gdb/testsuite/gdb.dwarf2/dup-psym.S
@@ -35,17 +35,17 @@ func_cu1:
 	.section .debug_info
 .Lcu1_begin:
 	/* CU header */
-	.int	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
+	.4byte	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
 .Lcu1_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev1_begin			/* Offset into abbrev section */
+	.2byte	2				/* DWARF Version */
+	.4byte	.Labbrev1_begin			/* Offset into abbrev section */
 	.byte	4				/* Pointer size */
 
 	/* CU die */
 	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.int	.Lline1_begin			/* DW_AT_stmt_list */
-	.int	.Lend_text1			/* DW_AT_high_pc */
-	.int	.Lbegin_text1			/* DW_AT_low_pc */
+	.4byte	.Lline1_begin			/* DW_AT_stmt_list */
+	.4byte	.Lend_text1			/* DW_AT_high_pc */
+	.4byte	.Lbegin_text1			/* DW_AT_low_pc */
 	.ascii	"foo/file1.txt\0"		/* DW_AT_name */
         .ascii  "/tmp/dup\0"			/* DW_AT_comp_dir */
 	.ascii	"GNU C 3.3.3\0"			/* DW_AT_producer */
@@ -57,9 +57,9 @@ func_cu1:
 	.byte		1			/* DW_AT_decl_file */
 	.byte		2			/* DW_AT_decl_line */
 	.ascii		"func_cu1\0"		/* DW_AT_name */
-	.int		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
-	.int		.Lbegin_func_cu1	/* DW_AT_low_pc */
-	.int		.Lend_func_cu1		/* DW_AT_high_pc */
+	.4byte		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
+	.4byte		.Lbegin_func_cu1	/* DW_AT_low_pc */
+	.4byte		.Lend_func_cu1		/* DW_AT_high_pc */
 	.byte		1			/* DW_AT_frame_base: length */
 	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
 
@@ -136,10 +136,10 @@ func_cu1:
 /* Line table */
 	.section .debug_line
 .Lline1_begin:
-	.int		.Lline1_end - .Lline1_start	/* Initial length */
+	.4byte		.Lline1_end - .Lline1_start	/* Initial length */
 .Lline1_start:
-	.short		2			/* Version */
-	.int		.Lline1_lines - .Lline1_hdr	/* header_length */
+	.2byte		2			/* Version */
+	.4byte		.Lline1_lines - .Lline1_hdr	/* header_length */
 .Lline1_hdr:
 	.byte		1			/* Minimum insn length */
 	.byte		1			/* default_is_stmt */
@@ -180,7 +180,7 @@ func_cu1:
 	.byte		0	/* DW_LNE_set_address */
 	.uleb128	5
 	.byte		2
-	.int		.Lbegin_func_cu1
+	.4byte		.Lbegin_func_cu1
 
 	.byte		3	/* DW_LNS_advance_line */
 	.sleb128	3	/* ... to 4 */
@@ -192,7 +192,7 @@ func_cu1:
 	.byte		0	/* DW_LNE_set_address */
 	.uleb128	5
 	.byte		2
-	.int		.Lend_func_cu1
+	.4byte		.Lend_func_cu1
 
 	.byte		0	/* DW_LNE_end_of_sequence */
 	.uleb128	1
diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.S b/gdb/testsuite/gdb.dwarf2/mac-fileno.S
index ec15cb1..be3eddc 100644
--- a/gdb/testsuite/gdb.dwarf2/mac-fileno.S
+++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.S
@@ -40,18 +40,18 @@ func_cu1:
 	.section .debug_info
 .Lcu1_begin:
 	/* CU header */
-	.int	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
+	.4byte	.Lcu1_end - .Lcu1_start		/* Length of Compilation Unit */
 .Lcu1_start:
-	.short	2				/* DWARF Version */
-	.int	.Labbrev1_begin			/* Offset into abbrev section */
+	.2byte	2				/* DWARF Version */
+	.4byte	.Labbrev1_begin			/* Offset into abbrev section */
 	.byte	4				/* Pointer size */
 
 	/* CU die */
 	.uleb128 1				/* Abbrev: DW_TAG_compile_unit */
-	.int	.Lline1_begin			/* DW_AT_stmt_list */
-	.int    .Ldebug_macinfo0                /* DW_AT_macro_info */
-	.int	.Lend_text1			/* DW_AT_high_pc */
-	.int	.Lbegin_text1			/* DW_AT_low_pc */
+	.4byte	.Lline1_begin			/* DW_AT_stmt_list */
+	.4byte  .Ldebug_macinfo0                /* DW_AT_macro_info */
+	.4byte	.Lend_text1			/* DW_AT_high_pc */
+	.4byte	.Lbegin_text1			/* DW_AT_low_pc */
 	.ascii	"file1.txt\0"			/* DW_AT_name */
 	.ascii	"GNU C 4.0.1\0"			/* DW_AT_producer */
 	.byte	1				/* DW_AT_language (C) */
@@ -62,9 +62,9 @@ func_cu1:
 	.byte		1			/* DW_AT_decl_file */
 	.byte		2			/* DW_AT_decl_line */
 	.ascii		"func_cu1\0"		/* DW_AT_name */
-	.int		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
-	.int		.Lbegin_func_cu1	/* DW_AT_low_pc */
-	.int		.Lend_func_cu1		/* DW_AT_high_pc */
+	.4byte		.Ltype_int-.Lcu1_begin	/* DW_AT_type */
+	.4byte		.Lbegin_func_cu1	/* DW_AT_low_pc */
+	.4byte		.Lend_func_cu1		/* DW_AT_high_pc */
 	.byte		1			/* DW_AT_frame_base: length */
 	.byte		0x55			/* DW_AT_frame_base: DW_OP_reg5 */
 
@@ -141,10 +141,10 @@ func_cu1:
 /* Line table */
 	.section .debug_line
 .Lline1_begin:
-	.int		.Lline1_end - .Lline1_start	/* Initial length */
+	.4byte		.Lline1_end - .Lline1_start	/* Initial length */
 .Lline1_start:
-	.short		2			/* Version */
-	.int		.Lline1_lines - .Lline1_hdr	/* header_length */
+	.2byte		2			/* Version */
+	.4byte		.Lline1_lines - .Lline1_hdr	/* header_length */
 .Lline1_hdr:
 	.byte		1			/* Minimum insn length */
 	.byte		1			/* default_is_stmt */
@@ -184,7 +184,7 @@ func_cu1:
 	.byte		0	/* DW_LNE_set_address */
 	.uleb128	5
 	.byte		2
-	.int		.Lbegin_func_cu1
+	.4byte		.Lbegin_func_cu1
 
 	.byte		3	/* DW_LNS_advance_line */
 	.sleb128	3	/* ... to 4 */
@@ -196,7 +196,7 @@ func_cu1:
 	.byte		0	/* DW_LNE_set_address */
 	.uleb128	5
 	.byte		2
-	.int		.Lend_func_cu1
+	.4byte		.Lend_func_cu1
 
 	.byte		0	/* DW_LNE_end_of_sequence */
 	.uleb128	1