2005-12-09 Randolph Chung <tausq@debian.org>

	* gdb.asm/common.inc: Indent commands.
	* gdb.asm/asmsrc1.s: Likewise.
	* gdb.asm/asmsrc2.s: Likewise.

4 files changed, 47 insertions, 37 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 76217de3f59..cbf9c5b75e3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-09  Randolph Chung  <tausq@debian.org>
 
+	* gdb.asm/common.inc: Indent commands.
+	* gdb.asm/asmsrc1.s: Likewise.
+	* gdb.asm/asmsrc2.s: Likewise.
+
+2005-12-09  Randolph Chung  <tausq@debian.org>
+
 	* gdb.arch/pa-nullify.exp: Handle hppa64-*-* targets.
 	(get_addr_of_sym): Remove duplicate print.
 	(gen_core): xfail hppa*-*-hpux*, update expected output.
diff --git a/gdb/testsuite/gdb.asm/asmsrc1.s b/gdb/testsuite/gdb.asm/asmsrc1.s
index 48bfb86d419..6e06b840110 100644
--- a/gdb/testsuite/gdb.asm/asmsrc1.s
+++ b/gdb/testsuite/gdb.asm/asmsrc1.s
@@ -1,69 +1,69 @@
 	.include "common.inc"
 	.include "arch.inc"
 
-comment "WARNING: asm-source.exp checks for line numbers printed by gdb."
-comment "Be careful about changing this file without also changing"
-comment "asm-source.exp."
+	comment "WARNING: asm-source.exp checks for line numbers printed by gdb."
+	comment "Be careful about changing this file without also changing"
+	comment "asm-source.exp."
 
 	
-comment	"This file is not linked with crt0."
-comment	"Provide very simplistic equivalent."
+	comment	"This file is not linked with crt0."
+	comment	"Provide very simplistic equivalent."
 	
 	.global _start
-gdbasm_declare _start
+	gdbasm_declare _start
 	gdbasm_startup
 	gdbasm_call main
 	gdbasm_exit0
 	gdbasm_end _start
 
-comment "main routine for assembly source debugging test"
-comment "This particular testcase uses macros in <arch>.inc to achieve"
-comment "machine independence."
+	comment "main routine for assembly source debugging test"
+	comment "This particular testcase uses macros in <arch>.inc to achieve"
+	comment "machine independence."
 
 	.global main
-gdbasm_declare main
+	gdbasm_declare main
 	gdbasm_enter
 
-comment "Call a macro that consists of several lines of assembler code."
+	comment "Call a macro that consists of several lines of assembler code."
 
 	gdbasm_several_nops
 
-comment "Call a subroutine in another file."
+	comment "Call a subroutine in another file."
 
 	gdbasm_call foo2
 
-comment "All done."
+	comment "All done."
 
 	gdbasm_exit0
 	gdbasm_end main
 
-comment "A routine for foo2 to call."
+	comment "A routine for foo2 to call."
 
 	.global foo3
-gdbasm_declare foo3
+	gdbasm_declare foo3
 	gdbasm_enter
 	gdbasm_leave
 	gdbasm_end foo3
 
 	.global exit
-gdbasm_declare exit
+	gdbasm_declare exit
 	gdbasm_exit0
 	gdbasm_end exit
 
-comment "A static function"
+	comment "A static function"
 
-gdbasm_declare foostatic
+	gdbasm_declare foostatic
 	gdbasm_enter
 	gdbasm_leave
 	gdbasm_end foostatic
 
-comment "A global variable"
+	comment "A global variable"
 
 	.global globalvar
-gdbasm_datavar	globalvar	11
+	gdbasm_datavar	globalvar	11
 
-comment "A static variable"
+	comment "A static variable"
 
-gdbasm_datavar	staticvar	5
+	gdbasm_datavar	staticvar	5
 
 	.include "note.inc"
diff --git a/gdb/testsuite/gdb.asm/asmsrc2.s b/gdb/testsuite/gdb.asm/asmsrc2.s
index 4366536acbe..fbe7c696861 100644
--- a/gdb/testsuite/gdb.asm/asmsrc2.s
+++ b/gdb/testsuite/gdb.asm/asmsrc2.s
@@ -1,18 +1,18 @@
 	.include "common.inc"
 	.include "arch.inc"
 
-comment "Second file in assembly source debugging testcase."
+	comment "Second file in assembly source debugging testcase."
 
 	.global foo2
-gdbasm_declare foo2
+	gdbasm_declare foo2
 	gdbasm_enter
 
-comment "Call someplace else (several times)."
+	comment "Call someplace else (several times)."
 
 	gdbasm_call foo3
 	gdbasm_call foo3
 
-comment "All done, return."
+	comment "All done, return."
 
 	gdbasm_leave
 	gdbasm_end foo2
diff --git a/gdb/testsuite/gdb.asm/common.inc b/gdb/testsuite/gdb.asm/common.inc
index 04f08ff9cce..d91d0312dfa 100644
--- a/gdb/testsuite/gdb.asm/common.inc
+++ b/gdb/testsuite/gdb.asm/common.inc
@@ -3,6 +3,10 @@
 
 	comment "Can't rely on assembler comment character so do this."
 
+	comment "On some platforms (like HPUX), only labels are allowed"
+	comment "to start at the first column.  Beware of this when editing"
+	comment "the assembly files for this test."
+
 	.macro include arch file
 	.include "\arch\file"
 	.endm
@@ -23,14 +27,14 @@
 	.macro gdbasm_end name
 	.endm
 
-comment "arch.inc is responsible for defining the following macros:"
-comment "enter - subroutine prologue"
-comment "leave - subroutine epilogue"
-comment "call - call a named subroutine"
-comment "several_nops - execute several (typically 4) nops"
-comment "exit0 - exit (0)"
-
-comment "arch.inc may also override the default definitions of:"
-comment "datavar - define a data variable"
-comment "declare - declare the start of a subroutine"
-comment "end - end a subroutine"
+	comment "arch.inc is responsible for defining the following macros:"
+	comment "enter - subroutine prologue"
+	comment "leave - subroutine epilogue"
+	comment "call - call a named subroutine"
+	comment "several_nops - execute several (typically 4) nops"
+	comment "exit0 - exit (0)"
+
+	comment "arch.inc may also override the default definitions of:"
+	comment "datavar - define a data variable"
+	comment "declare - declare the start of a subroutine"
+	comment "end - end a subroutine"