From e2c8dab6ae8654a928ab9364d5090781a4a6f62f Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 4 Jun 2020 14:57:12 +0930 Subject: tcl global directive outside proc body does nothing (ld) * testsuite/config/default.exp: Remove global directive outside proc body. * testsuite/ld-bootstrap/bootstrap.exp: Likewise. * testsuite/ld-elf/compress.exp: Likewise. * testsuite/ld-elf/elf.exp: Likewise. * testsuite/ld-elf/exclude.exp: Likewise. * testsuite/ld-elf/frame.exp: Likewise. * testsuite/ld-elf/indirect.exp: Likewise. * testsuite/ld-elf/linux-x86.exp: Likewise. * testsuite/ld-elf/shared.exp: Likewise. * testsuite/ld-elf/tls.exp: Likewise. * testsuite/ld-elf/tls_common.exp: Likewise. * testsuite/ld-elfcomm/elfcomm.exp: Likewise. * testsuite/ld-elfweak/elfweak.exp: Likewise. * testsuite/ld-frv/fdpic.exp: Likewise. * testsuite/ld-frv/tls.exp: Likewise. * testsuite/ld-gc/gc.exp: Likewise. * testsuite/ld-i386/i386.exp: Likewise. * testsuite/ld-i386/no-plt.exp: Likewise. * testsuite/ld-ifunc/ifunc.exp: Likewise. * testsuite/ld-mips-elf/mips-elf-flags.exp: Likewise. * testsuite/ld-nios2/nios2.exp: Likewise. * testsuite/ld-plugin/lto.exp: Likewise. * testsuite/ld-plugin/plugin.exp: Likewise. * testsuite/ld-powerpc/export-class.exp: Likewise. * testsuite/ld-scripts/align.exp: Likewise. * testsuite/ld-scripts/crossref.exp: Likewise. * testsuite/ld-scripts/defined.exp: Likewise. * testsuite/ld-scripts/overlay-size.exp: Likewise. * testsuite/ld-scripts/provide.exp: Likewise. * testsuite/ld-scripts/weak.exp: Likewise. * testsuite/ld-selective/selective.exp: Likewise. * testsuite/ld-sh/rd-sh.exp: Likewise. * testsuite/ld-size/size.exp: Likewise. * testsuite/ld-srec/srec.exp: Likewise. * testsuite/ld-x86-64/mpx.exp: Likewise. * testsuite/ld-x86-64/no-plt.exp: Likewise. * testsuite/ld-x86-64/x86-64.exp: Likewise. --- ld/ChangeLog | 41 +++++++++++++++++++++++++++++ ld/testsuite/config/default.exp | 1 - ld/testsuite/ld-bootstrap/bootstrap.exp | 2 -- ld/testsuite/ld-elf/compress.exp | 3 --- ld/testsuite/ld-elf/elf.exp | 1 - ld/testsuite/ld-elf/exclude.exp | 6 ----- ld/testsuite/ld-elf/frame.exp | 3 --- ld/testsuite/ld-elf/indirect.exp | 4 --- ld/testsuite/ld-elf/linux-x86.exp | 6 ----- ld/testsuite/ld-elf/shared.exp | 4 --- ld/testsuite/ld-elf/tls.exp | 2 -- ld/testsuite/ld-elf/tls_common.exp | 7 ----- ld/testsuite/ld-elfcomm/elfcomm.exp | 3 --- ld/testsuite/ld-elfweak/elfweak.exp | 2 -- ld/testsuite/ld-frv/fdpic.exp | 2 -- ld/testsuite/ld-frv/tls.exp | 2 -- ld/testsuite/ld-gc/gc.exp | 5 ---- ld/testsuite/ld-i386/i386.exp | 6 ----- ld/testsuite/ld-i386/no-plt.exp | 3 --- ld/testsuite/ld-ifunc/ifunc.exp | 1 - ld/testsuite/ld-mips-elf/mips-elf-flags.exp | 1 - ld/testsuite/ld-nios2/nios2.exp | 3 --- ld/testsuite/ld-plugin/lto.exp | 6 ----- ld/testsuite/ld-plugin/plugin.exp | 3 --- ld/testsuite/ld-powerpc/export-class.exp | 1 - ld/testsuite/ld-scripts/align.exp | 1 - ld/testsuite/ld-scripts/crossref.exp | 2 -- ld/testsuite/ld-scripts/defined.exp | 2 -- ld/testsuite/ld-scripts/overlay-size.exp | 1 - ld/testsuite/ld-scripts/provide.exp | 1 - ld/testsuite/ld-scripts/weak.exp | 1 - ld/testsuite/ld-selective/selective.exp | 1 - ld/testsuite/ld-sh/rd-sh.exp | 2 -- ld/testsuite/ld-size/size.exp | 3 --- ld/testsuite/ld-srec/srec.exp | 1 - ld/testsuite/ld-x86-64/mpx.exp | 3 --- ld/testsuite/ld-x86-64/no-plt.exp | 3 --- ld/testsuite/ld-x86-64/x86-64.exp | 13 --------- 38 files changed, 41 insertions(+), 111 deletions(-) (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 518d40c..d8e7e00 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,46 @@ 2020-06-04 Alan Modra + * testsuite/config/default.exp: Remove global directive outside + proc body. + * testsuite/ld-bootstrap/bootstrap.exp: Likewise. + * testsuite/ld-elf/compress.exp: Likewise. + * testsuite/ld-elf/elf.exp: Likewise. + * testsuite/ld-elf/exclude.exp: Likewise. + * testsuite/ld-elf/frame.exp: Likewise. + * testsuite/ld-elf/indirect.exp: Likewise. + * testsuite/ld-elf/linux-x86.exp: Likewise. + * testsuite/ld-elf/shared.exp: Likewise. + * testsuite/ld-elf/tls.exp: Likewise. + * testsuite/ld-elf/tls_common.exp: Likewise. + * testsuite/ld-elfcomm/elfcomm.exp: Likewise. + * testsuite/ld-elfweak/elfweak.exp: Likewise. + * testsuite/ld-frv/fdpic.exp: Likewise. + * testsuite/ld-frv/tls.exp: Likewise. + * testsuite/ld-gc/gc.exp: Likewise. + * testsuite/ld-i386/i386.exp: Likewise. + * testsuite/ld-i386/no-plt.exp: Likewise. + * testsuite/ld-ifunc/ifunc.exp: Likewise. + * testsuite/ld-mips-elf/mips-elf-flags.exp: Likewise. + * testsuite/ld-nios2/nios2.exp: Likewise. + * testsuite/ld-plugin/lto.exp: Likewise. + * testsuite/ld-plugin/plugin.exp: Likewise. + * testsuite/ld-powerpc/export-class.exp: Likewise. + * testsuite/ld-scripts/align.exp: Likewise. + * testsuite/ld-scripts/crossref.exp: Likewise. + * testsuite/ld-scripts/defined.exp: Likewise. + * testsuite/ld-scripts/overlay-size.exp: Likewise. + * testsuite/ld-scripts/provide.exp: Likewise. + * testsuite/ld-scripts/weak.exp: Likewise. + * testsuite/ld-selective/selective.exp: Likewise. + * testsuite/ld-sh/rd-sh.exp: Likewise. + * testsuite/ld-size/size.exp: Likewise. + * testsuite/ld-srec/srec.exp: Likewise. + * testsuite/ld-x86-64/mpx.exp: Likewise. + * testsuite/ld-x86-64/no-plt.exp: Likewise. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + +2020-06-04 Alan Modra + * testsuite/ld-dynamic/export-dynamic-symbol-2.d: Match output for mips-sgi-irix6. * testsuite/ld-dynamic/export-dynamic-symbol-glob.d: Likewise. diff --git a/ld/testsuite/config/default.exp b/ld/testsuite/config/default.exp index 4f0b76d..b2097ce 100644 --- a/ld/testsuite/config/default.exp +++ b/ld/testsuite/config/default.exp @@ -121,7 +121,6 @@ if {![info exists CXXFLAGS]} { # \param Edit - The override command to perform. # \param SavedStrings - Set to use for storing string representations. -global env # Only set up the environment variable if the user has not already provided one. if {! [info exists env(CCC_OVERRIDE_OPTIONS)]} { set env(CCC_OVERRIDE_OPTIONS) "#\ diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp index ba51e50..43928fb 100644 --- a/ld/testsuite/ld-bootstrap/bootstrap.exp +++ b/ld/testsuite/ld-bootstrap/bootstrap.exp @@ -29,8 +29,6 @@ if ![isnative] { return } -global STATIC_LDFLAGS - # Determine if plugin support is present. remote_exec host "$nm --help" "" "/dev/null" "plugin-support" set tmp [file_contents "plugin-support"] diff --git a/ld/testsuite/ld-elf/compress.exp b/ld/testsuite/ld-elf/compress.exp index db1993c..8b55f86 100644 --- a/ld/testsuite/ld-elf/compress.exp +++ b/ld/testsuite/ld-elf/compress.exp @@ -36,7 +36,6 @@ if { ![check_compiler_available] } { return } -global as if { ![ld_assemble $as "--compress-debug-sections $srcdir/$subdir/empty.s" tmpdir/empty.o ] } { fail "linker compressed debug sections" } @@ -124,8 +123,6 @@ if { [catch {exec cmp tmpdir/libfoo.so tmpdir/libfoozlib.so}] } then { pass "$test_name" } -global READELF - set test_name "Link -r with zlib compressed debug output" set test zlibbegin send_log "$READELF -S -W tmpdir/$test.o > tmpdir/$test.out\n" diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index 096b8af..3ae769e 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -121,7 +121,6 @@ if [is_underscore_target] { set ASFLAGS "$ASFLAGS --defsym UNDERSCORE=1" } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } { set ASFLAGS "$ASFLAGS -mx86-used-note=no" diff --git a/ld/testsuite/ld-elf/exclude.exp b/ld/testsuite/ld-elf/exclude.exp index 8ea1edf..b9d24c2 100644 --- a/ld/testsuite/ld-elf/exclude.exp +++ b/ld/testsuite/ld-elf/exclude.exp @@ -39,12 +39,6 @@ if { [istarget "tic6x-*-*"] } { set as_opt "-mpic -mpid=near" } -global ar -global as -global ld -global nm -global nm_output - set test1 "ld link shared library" set test2 "ld export symbols from archive" set test3 "ld link shared library with --exclude-libs" diff --git a/ld/testsuite/ld-elf/frame.exp b/ld/testsuite/ld-elf/frame.exp index 2acc8ba..0bd0fb2 100644 --- a/ld/testsuite/ld-elf/frame.exp +++ b/ld/testsuite/ld-elf/frame.exp @@ -55,9 +55,6 @@ if { [istarget "tic6x-*-*"] } { set test1 "read-only .eh_frame section" set test2 "read-only .gcc_except_table section" -global as -global ld - if { ![ld_assemble_flags $as $as_opt $srcdir/$subdir/tbss.s tmpdir/tbss.o ] || ![ld_assemble_flags $as $as_opt $srcdir/$subdir/frame.s tmpdir/frame.o] } { unresolved "$test1" diff --git a/ld/testsuite/ld-elf/indirect.exp b/ld/testsuite/ld-elf/indirect.exp index 7d5b494..acda39e 100644 --- a/ld/testsuite/ld-elf/indirect.exp +++ b/ld/testsuite/ld-elf/indirect.exp @@ -110,8 +110,6 @@ set build_tests { run_cc_link_tests $build_tests -global ld - set string ": final link failed: bad value" set string1 ": local symbol \`foo\' in tmpdir/indirect1b.o is referenced by DSO" @@ -128,8 +126,6 @@ set testname "Indirect symbol 2" set cmd "$ld -shared -o tmpdir/indirect2.so tmpdir/indirect2.o" check_link_message "$cmd" [list $string2] "$testname" -global NOPIE_CFLAGS NOPIE_LDFLAGS - set run_tests { {"Run with libindirect3c.so 1" "-Wl,--no-as-needed tmpdir/indirect3a.o tmpdir/indirect3b.o tmpdir/libindirect3c.so" "" diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp index 39322df..eeaf459 100644 --- a/ld/testsuite/ld-elf/linux-x86.exp +++ b/ld/testsuite/ld-elf/linux-x86.exp @@ -52,12 +52,6 @@ if { ![isnative] || ![check_compiler_available] } { return } -# Add $PLT_CFLAGS if PLT is expected. -global PLT_CFLAGS -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS -global NOSANTIZE_CFLAGS - run_ld_link_exec_tests [list \ [list \ "Run PR ld/23428 test" \ diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp index fe7a56d..da750b2 100644 --- a/ld/testsuite/ld-elf/shared.exp +++ b/ld/testsuite/ld-elf/shared.exp @@ -31,10 +31,6 @@ if ![check_shared_lib_support] { return } -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS -global NOSANTIZE_CFLAGS - set old_ASFLAGS $ASFLAGS # This target requires extra GAS options when building code for shared diff --git a/ld/testsuite/ld-elf/tls.exp b/ld/testsuite/ld-elf/tls.exp index 352d7ec..15c382f 100644 --- a/ld/testsuite/ld-elf/tls.exp +++ b/ld/testsuite/ld-elf/tls.exp @@ -39,8 +39,6 @@ if [istarget "sparc*-*-*"] { append AFLAGS_PIC " -K PIC" } -global NOSANTIZE_CFLAGS - run_ld_link_tests [list \ [list \ "Build pr22263-1" \ diff --git a/ld/testsuite/ld-elf/tls_common.exp b/ld/testsuite/ld-elf/tls_common.exp index f71e8ce..3e14ccf 100644 --- a/ld/testsuite/ld-elf/tls_common.exp +++ b/ld/testsuite/ld-elf/tls_common.exp @@ -30,13 +30,6 @@ if { ![istarget *-*-linux*] return } -global as -global ld -global READELF -global srcdir -global subdir -global link_output - if { ![ld_assemble $as "--elf-stt-common=no $srcdir/$subdir/tls_common.s" tmpdir/tls_commona.o] || ![ld_assemble $as "--elf-stt-common=yes $srcdir/$subdir/tls_common.s" tmpdir/tls_commonb.o] } { unresolved "tls_common" diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index 883cf6f..d23929e 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -177,9 +177,6 @@ if { ![ld_compile "$CC $CFLAGS -fcommon" $srcdir/$subdir/common1a.c tmpdir/com return } -global ld -global link_output - set options "-r tmpdir/common1a.o tmpdir/common1b.o" if { [ld_link $ld tmpdir/common1.o $options] } { diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp index f9e2b3e..dbc0c03 100644 --- a/ld/testsuite/ld-elfweak/elfweak.exp +++ b/ld/testsuite/ld-elfweak/elfweak.exp @@ -65,8 +65,6 @@ set DOBJDUMP_FLAGS --dynamic-syms set SOBJDUMP_FLAGS --syms set shared "--shared -Wl,--no-as-needed" -global NOSANTIZE_CFLAGS - # # objdump_symstuff # Dump non-dynamic symbol stuff and make sure that it is sane. diff --git a/ld/testsuite/ld-frv/fdpic.exp b/ld/testsuite/ld-frv/fdpic.exp index 268f56b..8d7e917 100644 --- a/ld/testsuite/ld-frv/fdpic.exp +++ b/ld/testsuite/ld-frv/fdpic.exp @@ -23,11 +23,9 @@ if {![istarget frv*-*-*] || ![is_elf_format]} { return } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS -mfdpic" -global LDFLAGS set saved_LDFLAGS "$LDFLAGS" set LDFLAGS "$LDFLAGS -melf32frvfd" diff --git a/ld/testsuite/ld-frv/tls.exp b/ld/testsuite/ld-frv/tls.exp index 5a14a27..85eb370 100644 --- a/ld/testsuite/ld-frv/tls.exp +++ b/ld/testsuite/ld-frv/tls.exp @@ -23,11 +23,9 @@ if {![istarget frv*-*-*] || ![is_elf_format]} { return } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS -mfdpic" -global LDFLAGS set saved_LDFLAGS "$LDFLAGS" set LDFLAGS "$LDFLAGS -melf32frvfd" diff --git a/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp index 16ded5d..97ccf6a 100644 --- a/ld/testsuite/ld-gc/gc.exp +++ b/ld/testsuite/ld-gc/gc.exp @@ -23,14 +23,9 @@ if ![check_gc_sections_available] { return } -global NOSANTIZE_CFLAGS - set cflags "-ffunction-sections -fdata-sections $NOSANTIZE_CFLAGS" set objfile "tmpdir/gc.o" -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS - if [istarget powerpc64*-*-*] { # otherwise with -mcmodel=medium gcc we get XPASSes. set cflags "$cflags -mminimal-toc" diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 2956c44..e1bbcdd 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -19,7 +19,6 @@ # MA 02110-1301, USA. # -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" if { [is_elf_format] \ && ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) } { @@ -581,9 +580,6 @@ proc undefined_weak {cflags ldflags} { } } -# Add $PLT_CFLAGS if PLT is expected. -global PLT_CFLAGS - # Must be Linux native with the C compiler if { [isnative] && [istarget "i?86-*-linux*"] @@ -1193,8 +1189,6 @@ if { [isnative] undefined_weak "-fPIE" "-pie -z nodynamic-undefined-weak" } -global NOPIE_CFLAGS NOPIE_LDFLAGS - # Must be native with the C compiler and working IFUNC support, if { [isnative] && [check_ifunc_available] diff --git a/ld/testsuite/ld-i386/no-plt.exp b/ld/testsuite/ld-i386/no-plt.exp index 54e41a2..44d1a39 100644 --- a/ld/testsuite/ld-i386/no-plt.exp +++ b/ld/testsuite/ld-i386/no-plt.exp @@ -39,9 +39,6 @@ if { ![check_compiler_available] } { return } -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS - run_cc_link_tests [list \ [list \ "Build no-plt-func1.o no-plt-main1.o" \ diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 384ded0..ce3434b 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -54,7 +54,6 @@ if ![check_shared_lib_support] { return } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } { set ASFLAGS "$ASFLAGS -mx86-used-note=no" diff --git a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp index afbf84c..5160d67 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf-flags.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf-flags.exp @@ -21,7 +21,6 @@ if {![istarget mips*-*-*] || ![is_elf_format]} { return } -global ldemul if {[istarget mips*-*-irix6*]} { set ldemul "-melf32bsmip" } elseif {[istarget mips*el-*-linux*]} { diff --git a/ld/testsuite/ld-nios2/nios2.exp b/ld/testsuite/ld-nios2/nios2.exp index b712e9e..1af0c92 100644 --- a/ld/testsuite/ld-nios2/nios2.exp +++ b/ld/testsuite/ld-nios2/nios2.exp @@ -6,9 +6,6 @@ foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.d]] { run_dump_test [file rootname $test] } -global link_output -global ld - set test_name "NIOS2 Mixed R1 and R2 objects" set test mixed1 diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index 5bd4c5f..383b195 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -29,17 +29,11 @@ if { ![check_plugin_api_available] return } -global INT128_CFLAGS - -global CFLAGS -global CXXFLAGS set saved_CFLAGS "$CFLAGS" set saved_CXXFLAGS "$CXXFLAGS" regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CFLAGS "" CFLAGS regsub -all "(\\-Wp,)?-D_FORTIFY_SOURCE=\[0-9\]+" $CXXFLAGS "" CXXFLAGS -global NOSANTIZE_CFLAGS - proc restore_notify { } { global saved_CFLAGS global saved_CXXFLAGS diff --git a/ld/testsuite/ld-plugin/plugin.exp b/ld/testsuite/ld-plugin/plugin.exp index 381fc79..dc8f007 100644 --- a/ld/testsuite/ld-plugin/plugin.exp +++ b/ld/testsuite/ld-plugin/plugin.exp @@ -34,8 +34,6 @@ if { ![check_compiler_available] } { pass "plugin API enabled" -global base_dir - # Look for the name we can dlopen in the test plugin's libtool control script. set plugin_name [file_contents "$base_dir/libldtestplug.la"] set plugin_name [regsub "'.*" [regsub ".*dlname='" "$plugin_name" ""] ""] @@ -95,7 +93,6 @@ if { [istarget m681*-*-*] || [istarget m68hc1*-*-*] || [istarget m9s12x*-*-*] } set failed_compile 0 set _ "" set plugin_nm_output "" -global NOSANTIZE_CFLAGS set old_CFLAGS "$CFLAGS" append CFLAGS " $NOSANTIZE_CFLAGS" if { $can_compile && \ diff --git a/ld/testsuite/ld-powerpc/export-class.exp b/ld/testsuite/ld-powerpc/export-class.exp index e244be3..884c4eb 100644 --- a/ld/testsuite/ld-powerpc/export-class.exp +++ b/ld/testsuite/ld-powerpc/export-class.exp @@ -87,7 +87,6 @@ proc powerpc_export_class_test { abi endian emul } { set abis { 32 be elf32ppclinux 32 le elf32lppclinux 64 be elf64ppc 64 le elf64lppc } -global ld catch "exec $ld --help | grep emulations" ldemul foreach { abi endian emul } $abis { diff --git a/ld/testsuite/ld-scripts/align.exp b/ld/testsuite/ld-scripts/align.exp index 7d79bad..1520fa3 100644 --- a/ld/testsuite/ld-scripts/align.exp +++ b/ld/testsuite/ld-scripts/align.exp @@ -32,7 +32,6 @@ if ![ld_assemble $as $srcdir/$subdir/align.s tmpdir/align.o] { } # mingw on x86_64 targets need to set the image base to 0 to avoid auto image-basing. -global LDFLAGS set saved_LDFLAGS "$LDFLAGS" if [istarget "x86_64-*-mingw*"] then { set LDFLAGS "$LDFLAGS --image-base 0" diff --git a/ld/testsuite/ld-scripts/crossref.exp b/ld/testsuite/ld-scripts/crossref.exp index 75544ba..b2f7231 100644 --- a/ld/testsuite/ld-scripts/crossref.exp +++ b/ld/testsuite/ld-scripts/crossref.exp @@ -38,12 +38,10 @@ if { ![check_compiler_available] } { return } -global CFLAGS set old_CFLAGS "$CFLAGS" # Pass -fplt to CC since -fno-plt doesn't work with NOCROSSREFS tests. # Also add $NOPIE_CFLAGS since PIE doesn't work NOCROSSREFS tests. -global PLT_CFLAGS NOPIE_CFLAGS set old_CC "$CC" set CC "$CC $PLT_CFLAGS $NOPIE_CFLAGS" diff --git a/ld/testsuite/ld-scripts/defined.exp b/ld/testsuite/ld-scripts/defined.exp index bd046e2..404333f 100644 --- a/ld/testsuite/ld-scripts/defined.exp +++ b/ld/testsuite/ld-scripts/defined.exp @@ -27,7 +27,6 @@ if ![ld_assemble $as $srcdir/$subdir/defined.s tmpdir/def.o] { return } -global LDFLAGS set saved_LDFLAGS "$LDFLAGS" if [istarget "x86_64-*-mingw*"] then { set LDFLAGS "$LDFLAGS --image-base 0" @@ -62,7 +61,6 @@ if ![ld_link $ld tmpdir/def "$LDFLAGS -T $srcdir/$subdir/defined.t tmpdir/def.o" } } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" if { [is_elf_format] \ && ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) } { diff --git a/ld/testsuite/ld-scripts/overlay-size.exp b/ld/testsuite/ld-scripts/overlay-size.exp index 6aa233a..ad7e0e4 100644 --- a/ld/testsuite/ld-scripts/overlay-size.exp +++ b/ld/testsuite/ld-scripts/overlay-size.exp @@ -22,7 +22,6 @@ if ![is_elf_format] { return } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" if { [is_elf_format] \ && ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) } { diff --git a/ld/testsuite/ld-scripts/provide.exp b/ld/testsuite/ld-scripts/provide.exp index 396ba02..a4aee52 100644 --- a/ld/testsuite/ld-scripts/provide.exp +++ b/ld/testsuite/ld-scripts/provide.exp @@ -30,7 +30,6 @@ if {[istarget "powerpc*-*-aix*"] || [istarget "rs6000-*-aix*"] || [is_aout_forma return } -global LDFLAGS set saved_LDFLAGS "$LDFLAGS" if [istarget "x86_64-*-mingw*"] then { set LDFLAGS "$LDFLAGS --image-base 0" diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp index 1bb2242..b0ca4ab 100644 --- a/ld/testsuite/ld-scripts/weak.exp +++ b/ld/testsuite/ld-scripts/weak.exp @@ -43,7 +43,6 @@ if {! [ld_assemble $as $srcdir/$subdir/weak1.s tmpdir/weak1.o] return } -global LDFLAGS set saved_LDFLAGS "$LDFLAGS" if [istarget "x86_64-*-mingw*"] then { set LDFLAGS "$LDFLAGS --image-base 0" diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp index f25b0e2..bb16140 100644 --- a/ld/testsuite/ld-selective/selective.exp +++ b/ld/testsuite/ld-selective/selective.exp @@ -46,7 +46,6 @@ set seltests { {A::foo() B::foo() dropme1() dropme2()} {*-*-*}} } -global NOSANTIZE_CFLAGS set cflags "-w -O -ffunction-sections -fdata-sections $NOSANTIZE_CFLAGS" set cxxflags "-fno-exceptions -fno-rtti $NOSANTIZE_CFLAGS" set ldflags "--gc-sections -Bstatic" diff --git a/ld/testsuite/ld-sh/rd-sh.exp b/ld/testsuite/ld-sh/rd-sh.exp index b6c9adf..c01d50d 100644 --- a/ld/testsuite/ld-sh/rd-sh.exp +++ b/ld/testsuite/ld-sh/rd-sh.exp @@ -31,8 +31,6 @@ if ![istarget sh*-*-*] { return } -global ASFLAGS -global LDFLAGS set asflags_save "$ASFLAGS" set ldflags_save "$LDFLAGS" diff --git a/ld/testsuite/ld-size/size.exp b/ld/testsuite/ld-size/size.exp index 20ebc01..8a94599 100644 --- a/ld/testsuite/ld-size/size.exp +++ b/ld/testsuite/ld-size/size.exp @@ -53,9 +53,6 @@ if { ![check_compiler_available] } { return } -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS - run_cc_link_tests [list \ [list \ "Build libsize-1.so" \ diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp index 0d607f5..69570a8 100644 --- a/ld/testsuite/ld-srec/srec.exp +++ b/ld/testsuite/ld-srec/srec.exp @@ -352,7 +352,6 @@ if { ![check_compiler_available] } { # tests. Also add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if PIE doesn't work # with S-records. Also add $NOCF_PROTECTION_CFLAGS for S-records. # Also add $NOSANTIZE_CFLAGS for S-records. -global PLT_CFLAGS NOPIE_CFLAGS NOPIE_LDFLAGS NOCF_PROTECTION_CFLAGS NOSANTIZE_CFLAGS set old_CC "$CC" set CC "$CC $PLT_CFLAGS $NOPIE_CFLAGS $NOPIE_LDFLAGS $NOCF_PROTECTION_CFLAGS $NOSANTIZE_CFLAGS" set old_CXX "$CXX" diff --git a/ld/testsuite/ld-x86-64/mpx.exp b/ld/testsuite/ld-x86-64/mpx.exp index 4cc5ed4..3a0f4b1 100644 --- a/ld/testsuite/ld-x86-64/mpx.exp +++ b/ld/testsuite/ld-x86-64/mpx.exp @@ -36,9 +36,6 @@ if { ![check_compiler_available] } { return } -# Add $PLT_CFLAGS if PLT is expected. -global PLT_CFLAGS - run_cc_link_tests [list \ [list \ "Build libmpx1a.a" \ diff --git a/ld/testsuite/ld-x86-64/no-plt.exp b/ld/testsuite/ld-x86-64/no-plt.exp index 4f8371c..8a1667b 100644 --- a/ld/testsuite/ld-x86-64/no-plt.exp +++ b/ld/testsuite/ld-x86-64/no-plt.exp @@ -39,9 +39,6 @@ if { ![check_compiler_available] } { return } -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS - run_cc_link_tests [list \ [list \ "Build no-plt-func1.o no-plt-main1.o" \ diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index cc2c6cc..fd8fd34 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -34,7 +34,6 @@ if [istarget "*-*-nacl*"] { set emul "elf_x86_64" } -global ASFLAGS set saved_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS -mx86-used-note=no" @@ -265,9 +264,6 @@ if [istarget "*-*-nacl*"] { run_ld_link_tests $x86_64tests -global link_output -global ld - set test_name "Mixed x86_64 and i386 input test 1" set test mixed1 if { ![ld_link $ld tmpdir/$test "-m$emul tmpdir/${test}a.o tmpdir/${test}b.o"] } { @@ -742,14 +738,6 @@ proc undefined_weak {cflags ldflags} { } } -# Add $PLT_CFLAGS if PLT is expected. -global PLT_CFLAGS -# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -global NOPIE_CFLAGS NOPIE_LDFLAGS -# Add $NOCF_PROTECTION_CFLAGS if -fcf-protection=none is required. -global NOCF_PROTECTION_CFLAGS -global NOSANTIZE_CFLAGS - # Must be native with the C compiler if { [isnative] && [check_compiler_available] } { run_cc_link_tests [list \ @@ -2148,7 +2136,6 @@ run_ld_link_tests [list \ ] # Linux only tests -global LD_CLASS if { "$LD_CLASS" == "64bit" } then { # This test needs 64-bit linker. run_dump_test "pr17618" -- cgit v1.1