From 1cf67587a0980e5fee20cad75f2c1fe01af6e808 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 4 Jun 2020 16:00:46 +0930 Subject: [PATCH] tcl global directive outside proc body does nothing (gas) * testsuite/config/default.exp: Remove global directive outside proc body. * testsuite/gas/mep/complex-relocs.exp: Likewise. * testsuite/gas/microblaze/relax_size.exp: Likewise. * testsuite/gas/microblaze/reloc_sym.exp: Likewise. * testsuite/gas/mt/relocs.exp: Likewise. * testsuite/gas/rx/rx.exp: Likewise. --- gas/ChangeLog | 10 ++++++++++ gas/testsuite/config/default.exp | 2 -- gas/testsuite/gas/mep/complex-relocs.exp | 1 - gas/testsuite/gas/microblaze/relax_size.exp | 1 - gas/testsuite/gas/microblaze/reloc_sym.exp | 1 - gas/testsuite/gas/mt/relocs.exp | 1 - gas/testsuite/gas/rx/rx.exp | 1 - 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 210017b491d..6484c62d308 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,13 @@ +2020-06-04 Alan Modra + + * testsuite/config/default.exp: Remove global directive outside + proc body. + * testsuite/gas/mep/complex-relocs.exp: Likewise. + * testsuite/gas/microblaze/relax_size.exp: Likewise. + * testsuite/gas/microblaze/reloc_sym.exp: Likewise. + * testsuite/gas/mt/relocs.exp: Likewise. + * testsuite/gas/rx/rx.exp: Likewise. + 2020-06-03 Stephen Casner * doc/c-riscv.texi (RISC-V-Options): Fix non-ASCII apostrophe. diff --git a/gas/testsuite/config/default.exp b/gas/testsuite/config/default.exp index f8e49d89aac..4a2a5437531 100644 --- a/gas/testsuite/config/default.exp +++ b/gas/testsuite/config/default.exp @@ -16,12 +16,10 @@ load_lib gas-defs.exp -global AS if ![info exists AS] then { set AS [findfile $base_dir/../as-new "../as-new" [transform as]] } -global ASFLAGS if ![info exists ASFLAGS] then { set ASFLAGS "" } diff --git a/gas/testsuite/gas/mep/complex-relocs.exp b/gas/testsuite/gas/mep/complex-relocs.exp index 7eb9473599b..081231174d7 100644 --- a/gas/testsuite/gas/mep/complex-relocs.exp +++ b/gas/testsuite/gas/mep/complex-relocs.exp @@ -38,7 +38,6 @@ proc regexp_test { file1 file2 test } { } -global srcdir subdir if [istarget mep*-*-*] { # test that complex relocs between files work, generally diff --git a/gas/testsuite/gas/microblaze/relax_size.exp b/gas/testsuite/gas/microblaze/relax_size.exp index a733dc851ad..6aace537451 100644 --- a/gas/testsuite/gas/microblaze/relax_size.exp +++ b/gas/testsuite/gas/microblaze/relax_size.exp @@ -13,7 +13,6 @@ proc regexp_test { file1 file2 test } { if [regexp_diff $file1 $file2] then { fail $test } else { pass $test } } -global srcdir subdir if [istarget microblaze*-*-elf] { foreach file [lsort [glob -nocomplain -- $srcdir/$subdir/relax_size*.s]] { set file [file rootname [file tail $file]] diff --git a/gas/testsuite/gas/microblaze/reloc_sym.exp b/gas/testsuite/gas/microblaze/reloc_sym.exp index 4fe96ff7ef2..ee07f56259d 100644 --- a/gas/testsuite/gas/microblaze/reloc_sym.exp +++ b/gas/testsuite/gas/microblaze/reloc_sym.exp @@ -33,7 +33,6 @@ proc regexp_test { file1 file2 test } { } -global srcdir subdir if [istarget microblaze*-*-*] { gas_test "reloc_strongsym.s" {-o reloc_strongsym.o} {} {assembling reloc_strongsym} gas_test "reloc_weaksym.s" {-o reloc_weaksym.o} {} {assembling reloc_weaksym} diff --git a/gas/testsuite/gas/mt/relocs.exp b/gas/testsuite/gas/mt/relocs.exp index 2c650f43aac..0e200bea694 100644 --- a/gas/testsuite/gas/mt/relocs.exp +++ b/gas/testsuite/gas/mt/relocs.exp @@ -35,7 +35,6 @@ proc regexp_test { file1 file2 test } { } -global srcdir subdir if [istarget mt-*] { gas_test "relocs1.s" {-o relocs1.o} {} {assembling relocs1} diff --git a/gas/testsuite/gas/rx/rx.exp b/gas/testsuite/gas/rx/rx.exp index f9e4db4a66d..8f5d510dde1 100644 --- a/gas/testsuite/gas/rx/rx.exp +++ b/gas/testsuite/gas/rx/rx.exp @@ -21,7 +21,6 @@ if { ! [istarget rx-*-*] } { return } -global ASFLAGS set ASFLAGS "--mcpu=rxv3-dfpu" foreach test [lsort [glob $srcdir/$subdir/*.sm]] { -- 2.30.2