* gas/h8300/t03_add.exp: Remove stray semicolons.

	* gas/h8300/t04_sub.exp: Likewise.
	* gas/h8300/t05_cmp.exp: Likewise.
	* gas/h8300/t08_or.exp: Likewise.
	* gas/h8300/t09_xor.exp: Likewise.
	* gas/h8300/t10_and.exp: Likewise.
	* gas/hppa/reloc/reloc.exp: Likewise.
	* gas/hppa/unsorted/unsorted.exp: Likewise.
	* gas/i386/i386.exp: Likewise.
	* gas/m68hc11/m68hc11.exp: Likewise.
	* gas/mips/mips.exp: Likewise.
	* gas/sparc/sparc.exp: Likewise.
	* lib/gas-defs.exp: Likewise.

14 files changed, 36 insertions, 20 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b645312..ad77ce4 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,19 @@
+2004-05-12  Ben Elliston  <bje@au.ibm.com>
+
+	* gas/h8300/t03_add.exp: Remove stray semicolons.
+	* gas/h8300/t04_sub.exp: Likewise.
+	* gas/h8300/t05_cmp.exp: Likewise.
+	* gas/h8300/t08_or.exp: Likewise.
+	* gas/h8300/t09_xor.exp: Likewise.
+	* gas/h8300/t10_and.exp: Likewise.
+	* gas/hppa/reloc/reloc.exp: Likewise.
+	* gas/hppa/unsorted/unsorted.exp: Likewise.
+	* gas/i386/i386.exp: Likewise.
+	* gas/m68hc11/m68hc11.exp: Likewise.
+	* gas/mips/mips.exp: Likewise.
+	* gas/sparc/sparc.exp: Likewise.
+	* lib/gas-defs.exp: Likewise.
+
 2004-05-11  Nick Clifton  <nickc@redhat.com>
 
 	* gas/elf/section4.s: New test.  Checks label arithmetic when
diff --git a/gas/testsuite/gas/h8300/t03_add.exp b/gas/testsuite/gas/h8300/t03_add.exp
index 635daab..fea902f 100644
--- a/gas/testsuite/gas/h8300/t03_add.exp
+++ b/gas/testsuite/gas/h8300/t03_add.exp
@@ -2940,7 +2940,7 @@ proc do_t03_add_test {} {
         default	{ fail "$testname: add.l @0x1234:16, ... ($x)" }
     }
     # FIXME return early, expect bombs out on the next group.
-    return;
+    return
     set x 0
     expect {
 	-re ".* 960 1f44 01046B2C" { set x [expr $x+1]; exp_continue; }
diff --git a/gas/testsuite/gas/h8300/t04_sub.exp b/gas/testsuite/gas/h8300/t04_sub.exp
index a5d134c..4ec2608 100644
--- a/gas/testsuite/gas/h8300/t04_sub.exp
+++ b/gas/testsuite/gas/h8300/t04_sub.exp
@@ -2939,7 +2939,7 @@ proc do_t04_sub_test {} {
         default	{ fail "$testname: sub.l @0x1234:16, ... ($x)" }
     }
     # FIXME return early, expect bombs out on the next group.
-    return;
+    return
     set x 0
     expect {
 	-re ".* 959 1f42 01046B2C" { set x [expr $x+1]; exp_continue; }
diff --git a/gas/testsuite/gas/h8300/t05_cmp.exp b/gas/testsuite/gas/h8300/t05_cmp.exp
index 502cc30..26343b7 100644
--- a/gas/testsuite/gas/h8300/t05_cmp.exp
+++ b/gas/testsuite/gas/h8300/t05_cmp.exp
@@ -2800,7 +2800,7 @@ proc do_t05_cmp_test {} {
         default	{ fail "$testname: cmp.l @0x1234:16, ... ($x)" }
     }
     # FIXME return early, expect bombs out on the next group.
-    return;
+    return
     set x 0
     expect {
 	-re ".* 903 1e00 01046B2C" { set x [expr $x+1]; exp_continue; }
diff --git a/gas/testsuite/gas/h8300/t08_or.exp b/gas/testsuite/gas/h8300/t08_or.exp
index 617b026..ff50cdc 100644
--- a/gas/testsuite/gas/h8300/t08_or.exp
+++ b/gas/testsuite/gas/h8300/t08_or.exp
@@ -2921,7 +2921,7 @@ proc do_t08_or_test {} {
         default	{ fail "$testname: or.l @0x1234:16, ... ($x)" }
     }
     # FIXME return early, expect bombs out on the next group.
-    return;
+    return
     set x 0
     expect {
 	-re ".* 954 1f30 01046B2C" { set x [expr $x+1]; exp_continue; }
diff --git a/gas/testsuite/gas/h8300/t09_xor.exp b/gas/testsuite/gas/h8300/t09_xor.exp
index 21d38a6..dd579b5 100644
--- a/gas/testsuite/gas/h8300/t09_xor.exp
+++ b/gas/testsuite/gas/h8300/t09_xor.exp
@@ -2921,7 +2921,7 @@ proc do_t09_xor_test {} {
         default	{ fail "$testname: xor.l @0x1234:16, ... ($x)" }
     }
     # FIXME return early, expect bombs out on the next group.
-    return;
+    return
     set x 0
     expect {
 	-re ".* 954 1f30 01046B2C" { set x [expr $x+1]; exp_continue; }
diff --git a/gas/testsuite/gas/h8300/t10_and.exp b/gas/testsuite/gas/h8300/t10_and.exp
index d4bf5db..8062502 100644
--- a/gas/testsuite/gas/h8300/t10_and.exp
+++ b/gas/testsuite/gas/h8300/t10_and.exp
@@ -2921,7 +2921,7 @@ proc do_t10_and_test {} {
         default	{ fail "$testname: and.l @0x1234:16, ... ($x)" }
     }
     # FIXME return early, expect bombs out on the next group.
-    return;
+    return
     set x 0
     expect {
 	-re ".* 954 1f30 01046B2C" { set x [expr $x+1]; exp_continue; }
diff --git a/gas/testsuite/gas/hppa/reloc/reloc.exp b/gas/testsuite/gas/hppa/reloc/reloc.exp
index bbcb435..e4010e7 100644
--- a/gas/testsuite/gas/hppa/reloc/reloc.exp
+++ b/gas/testsuite/gas/hppa/reloc/reloc.exp
@@ -68,7 +68,7 @@ proc do_relocation_reduction_tests {} {
 
     if {[istarget hppa*64*-*-*]
         || [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
-      return;
+      return
     }
 
     if [gas_test_old "reduce.s" "" "Relocation reductions (part1)"] then {
@@ -245,7 +245,7 @@ proc do_selector_scope_test {} {
     set x 0
 
     if [istarget hppa*64*-*-*] then {
-      return;
+      return
     }
 
     if [gas_test_old "selectorbug.s" "" "Test scope of field selector (part 1)"] {
@@ -348,7 +348,7 @@ proc do_exit_relocation_test {} {
     if {[istarget hppa*64*-*-*]
 	|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
 	gas_test_old "exitbug.s" "" "Test for bogus R_EXIT relocation (part 1)"
-	return;
+	return
     }
 
     if [gas_test_old "exitbug.s" "" "Test for bogus R_EXIT relocation (part 1)"] {
@@ -381,7 +381,7 @@ proc do_cross_space_fixup_test_1 {} {
     # ELF doesn't really handle extra sections too well...
     if {[istarget hppa*64*-*-*]
 	|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
-	return;
+	return
     }
 
     if [gas_test_old "fixupbug.s" "" "Test cross space jump/call fixup bug (part 1)"] {
@@ -415,7 +415,7 @@ proc do_cross_space_fixup_test_2 {} {
     # ELF doesn't really handle extra sections too well...
     if {[istarget hppa*64*-*-*]
 	|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
-	return;
+	return
     }
 
     gas_start "fixupbug.s" "-al"
@@ -600,7 +600,7 @@ proc do_pic_relocation_test {} {
     # ELF doesn't really handle extra sections too well...
     if {[istarget hppa*64*-*-*]
 	|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
-	return;
+	return
     }
 
     gas_start "picreloc.s" "-al"
@@ -629,7 +629,7 @@ proc do_apply_test {} {
     # ELF doesn't really handle extra sections too well...
     if {[istarget hppa*64*-*-*]
 	|| [istarget hppa*-*-*elf*] || [istarget hppa*-*-linux*]} then {
-	return;
+	return
     }
 
     gas_start "applybug.s" "-al"
diff --git a/gas/testsuite/gas/hppa/unsorted/unsorted.exp b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
index a63ebe7..3dc734a 100644
--- a/gas/testsuite/gas/hppa/unsorted/unsorted.exp
+++ b/gas/testsuite/gas/hppa/unsorted/unsorted.exp
@@ -197,7 +197,7 @@ proc do_import_test {} {
 proc do_common_test {} {
     # linux has a different .comm syntax
     if [istarget hppa*-*-linux*] then {
-	return;
+	return
     }
 
     set testname "common.s: Test for bug in .comm handling (part2)"
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 946cf9e..1b8c401 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -20,7 +20,7 @@ proc gas_64_check { } {
     global srcdir
 
     catch "exec $srcdir/lib/run $NM $NMFLAGS --help" nm_help
-    return [regexp "targets:.*x86-64" $nm_help];
+    return [regexp "targets:.*x86-64" $nm_help]
 }
 
 proc gas_32_check { } {
@@ -29,7 +29,7 @@ proc gas_32_check { } {
     global srcdir
 
     catch "exec $srcdir/lib/run $NM $NMFLAGS --help" nm_help
-    return [regexp "targets:.*i386" $nm_help];
+    return [regexp "targets:.*i386" $nm_help]
 }
 
 
diff --git a/gas/testsuite/gas/m68hc11/m68hc11.exp b/gas/testsuite/gas/m68hc11/m68hc11.exp
index 868241a..a142f2e 100644
--- a/gas/testsuite/gas/m68hc11/m68hc11.exp
+++ b/gas/testsuite/gas/m68hc11/m68hc11.exp
@@ -43,7 +43,7 @@ proc gas_m68hc11_message { kind options line expect } {
     regsub -all "\n" "$line: $expect" " " title
 
     # Make a file containing the instructions to assemble.
-    set fd [open "$srcdir/$subdir/tst-m68hc1x.s" "w"];
+    set fd [open "$srcdir/$subdir/tst-m68hc1x.s" "w"]
     puts -nonewline $fd "$line"
     close $fd
 
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index a4a0191..ef26fe1 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -254,7 +254,7 @@ proc mips_arch_list_matching {args} {
 	# properties actually are.
 	if { [string compare $arch default] == 0
 	     && [string length [mips_arch_properties default]] == 0} {
-	    continue;
+	    continue
 	}
 	if { [mips_arch_matches $arch $args] } {
 	    lappend l $arch
diff --git a/gas/testsuite/gas/sparc/sparc.exp b/gas/testsuite/gas/sparc/sparc.exp
index 4b16f39..47ee99e 100644
--- a/gas/testsuite/gas/sparc/sparc.exp
+++ b/gas/testsuite/gas/sparc/sparc.exp
@@ -13,7 +13,7 @@ proc gas_64_check { } {
     global srcdir
 
     catch "exec $srcdir/lib/run $NM $NMFLAGS --help" nm_help
-    return [regexp "elf64\[_-\]sparc" $nm_help];
+    return [regexp "elf64\[_-\]sparc" $nm_help]
 }
 
 proc sparc_elf_setup { } {
diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index f0c6b8c..ff8db47 100644
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -45,7 +45,7 @@ proc gas_run { prog as_opts redir } {
     catch "exec $srcdir/lib/run $AS $ASFLAGS $as_opts $srcdir/$subdir/$prog $redir" comp_output
     set comp_output [prune_warnings $comp_output]
     verbose "output was $comp_output"
-    return [list $comp_output ""];
+    return [list $comp_output ""]
 }
 
 proc all_ones { args } {