OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alan Modra 2020-06-04 14:57:12 +09:30
parent a0c0ad5670
commit e2c8dab6ae
38 changed files with 41 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ld/ChangeLog
View File

@ -1,3 +1,44 @@
2020-06-04 Alan Modra <amodra@gmail.com>
* 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 <amodra@gmail.com>
* testsuite/ld-dynamic/export-dynamic-symbol-2.d: Match output for

1
ld/testsuite/config/default.exp
View File

@ -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) "#\

2
ld/testsuite/ld-bootstrap/bootstrap.exp
View File

@ -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"]

3
ld/testsuite/ld-elf/compress.exp
View File

@ -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"

1
ld/testsuite/ld-elf/elf.exp
View File

@ -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"

6
ld/testsuite/ld-elf/exclude.exp
View File

@ -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"

3
ld/testsuite/ld-elf/frame.exp
View File

@ -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"

4
ld/testsuite/ld-elf/indirect.exp
View File

@ -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" ""

6
ld/testsuite/ld-elf/linux-x86.exp
View File

@ -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" \

4
ld/testsuite/ld-elf/shared.exp
View File

@ -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

2
ld/testsuite/ld-elf/tls.exp
View File

@ -39,8 +39,6 @@ if [istarget "sparc*-*-*"] {
append AFLAGS_PIC " -K PIC"
}
global NOSANTIZE_CFLAGS
run_ld_link_tests [list \
[list \
"Build pr22263-1" \

7
ld/testsuite/ld-elf/tls_common.exp
View File

@ -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"

3
ld/testsuite/ld-elfcomm/elfcomm.exp
View File

@ -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] } {

2
ld/testsuite/ld-elfweak/elfweak.exp
View File

@ -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.

2
ld/testsuite/ld-frv/fdpic.exp
View File

@ -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"

2
ld/testsuite/ld-frv/tls.exp
View File

@ -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"

5
ld/testsuite/ld-gc/gc.exp
View File

@ -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"

6
ld/testsuite/ld-i386/i386.exp
View File

@ -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]

3
ld/testsuite/ld-i386/no-plt.exp
View File

@ -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" \

1
ld/testsuite/ld-ifunc/ifunc.exp
View File

@ -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"

1
ld/testsuite/ld-mips-elf/mips-elf-flags.exp
View File

@ -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*]} {

3
ld/testsuite/ld-nios2/nios2.exp
View File

@ -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

6
ld/testsuite/ld-plugin/lto.exp
View File

@ -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

3
ld/testsuite/ld-plugin/plugin.exp
View File

@ -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 && \

1
ld/testsuite/ld-powerpc/export-class.exp
View File

@ -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 {

1
ld/testsuite/ld-scripts/align.exp
View File

@ -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"

2
ld/testsuite/ld-scripts/crossref.exp
View File

@ -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"

2
ld/testsuite/ld-scripts/defined.exp
View File

@ -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-*-*"]) } {

1
ld/testsuite/ld-scripts/overlay-size.exp
View File

@ -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-*-*"]) } {

1
ld/testsuite/ld-scripts/provide.exp
View File

@ -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"

1
ld/testsuite/ld-scripts/weak.exp
View File

@ -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"

1
ld/testsuite/ld-selective/selective.exp
View File

@ -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"

2
ld/testsuite/ld-sh/rd-sh.exp
View File

@ -31,8 +31,6 @@ if ![istarget sh*-*-*] {
return
}
global ASFLAGS
global LDFLAGS
set asflags_save "$ASFLAGS"
set ldflags_save "$LDFLAGS"

3
ld/testsuite/ld-size/size.exp
View File

@ -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" \

1
ld/testsuite/ld-srec/srec.exp
View File

@ -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"

3
ld/testsuite/ld-x86-64/mpx.exp
View File

@ -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" \

3
ld/testsuite/ld-x86-64/no-plt.exp
View File

@ -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" \

13
ld/testsuite/ld-x86-64/x86-64.exp
View File

@ -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"