PE image base fallout

Fixes x86_64-w64-mingw32 tests that failed with the recent diagnosis
for out of range RVA, and a couple of other gc-sections tests that failed
for other reasons.

	* testsuite/ld-gc/gc.exp: Pass "-image-base 0" to ld for PE, and
	arrange to define __main for some run_dump_test tests.
	* testsuite/ld-gc/pr13683.d: Accept more symbols.
	* testsuite/ld-gc/pr14265.d: Likewise, and ordering.
	* testsuite/ld-scripts/crossref.exp: Pass "-image-base 0" to ld for PE.
	* testsuite/ld-srec/srec.exp: Likewise.
	* testsuite/lib/ld-lib.exp (ld_link_defsyms): Use is_pecoff_format.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b5298b9848edddab14e6c0600d82cb4936c4057a..acb8aabc991345aec84eb05fbbca65fde330a293 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2021-03-12  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-gc/gc.exp: Pass "-image-base 0" to ld for PE, and
+       arrange to define __main for some run_dump_test tests.
+       * testsuite/ld-gc/pr13683.d: Accept more symbols.
+       * testsuite/ld-gc/pr14265.d: Likewise, and ordering.
+       * testsuite/ld-scripts/crossref.exp: Pass "-image-base 0" to ld for PE.
+       * testsuite/ld-srec/srec.exp: Likewise.
+       * testsuite/lib/ld-lib.exp (ld_link_defsyms): Use is_pecoff_format.
+
 2021-03-11  Nelson Chu  <nelson.chu@sifive.com>
 
        * emultempl/riscvelf.em (after_allocation): Run ldelf_map_segments

diff --git a/ld/testsuite/ld-gc/gc.exp b/ld/testsuite/ld-gc/gc.exp
index cd5c6f7c4ea76a014eb6616f6f275bddef0ee875..298f2d48406127f58b6d0c5292c34c93eb707230 100644 (file)
--- a/ld/testsuite/ld-gc/gc.exp
+++ b/ld/testsuite/ld-gc/gc.exp
@@ -54,6 +54,9 @@ proc test_gc { testname filename linker ldflags} {
 
     set outfile "tmpdir/$filename"
     set options "-L$srcdir/$subdir"
+    if [is_pecoff_format] {
+       append ldflags " --image-base 0"
+    }
     append options " " $ldflags " " [ld_link_defsyms] " " $objfile
 
     if ![ld_link $linker $outfile $options] {
@@ -86,9 +89,13 @@ test_gc "Check --gc-section/-q" "gcrexe" $ld "--gc-sections -q -e main"
 test_gc "Check --gc-section/-r/-e" "gcrel" $ld "-r --gc-sections -e main"
 test_gc "Check --gc-section/-r/-u" "gcrel" $ld "-r --gc-sections -u used_func"
 
+set old_ldflags $LDFLAGS
+if [is_pecoff_format] {
+    append LDFLAGS " --image-base 0"
+}
 set old_asflags $ASFLAGS
 if [is_underscore_target] {
-    set ASFLAGS "$ASFLAGS --defsym UNDERSCORE=1"
+    append ASFLAGS " --defsym UNDERSCORE=1"
 }
 
 run_dump_test "noent"
@@ -111,7 +118,7 @@ if { [is_elf_format] && [check_shared_lib_support] } then {
        set gasopt "-mpic -mpid=near"
     }
     # These targets do not default to linking with shared libraries.
-    set old_ldflags $LDFLAGS
+    set save_ldflags $LDFLAGS
     if { [istarget "mips*vr4100*-*-elf*"] \
         || [istarget "mips*vr4300*-*-elf*"] \
         || [istarget "mips*vr5000*-*-elf*"] } {
@@ -130,7 +137,7 @@ if { [is_elf_format] && [check_shared_lib_support] } then {
     } else {
        run_dump_test "pr20022"
     }
-    set LDFLAGS $old_ldflags
+    set LDFLAGS $save_ldflags
 }
 
 if { [check_compiler_available] } {
@@ -144,25 +151,28 @@ if { [check_compiler_available] } {
     }
 }
 
+set symdefs ""
+if [is_pecoff_format] {
+    set symdefs {{ld {--defsym __main=main --defsym ___main=main}}}
+}
+
 if { [check_compiler_available] } {
-       ld_compile "$CC $CFLAGS $cflags" $srcdir/$subdir/pr13683.c tmpdir/pr13683.o
-       run_dump_test "pr13683"
+    ld_compile "$CC $CFLAGS $cflags" $srcdir/$subdir/pr13683.c tmpdir/pr13683.o
+    run_dump_test "pr13683" $symdefs
 }
 
 if { [check_compiler_available] } {
     ld_compile "$CC $CFLAGS $cflags $NOPIE_CFLAGS" $srcdir/$subdir/pr14265.c tmpdir/pr14265.o
-    run_dump_test "pr14265"
+    run_dump_test "pr14265" $symdefs
 }
 
 if { [check_compiler_available] } {
     ld_compile "$CC $CFLAGS $cflags -O0" $srcdir/$subdir/pr19161-1.c tmpdir/pr19161-1.o
     ld_compile "$CC $CFLAGS $cflags -O0" $srcdir/$subdir/pr19161-2.c tmpdir/pr19161-2.o
-    set saved_LDFLAGS "$LDFLAGS"
     if [istarget hppa*-*-linux*] {
-       set LDFLAGS "$LDFLAGS --defsym '\$\$dyncall=0'"
+       set symdefs {{ld {--defsym '\$\$dyncall=0'}}}
     }
-    run_dump_test "pr19161"
-    set LDFLAGS "$saved_LDFLAGS"
+    run_dump_test "pr19161" $symdefs
 }
 
 if { [is_elf_format] && [check_shared_lib_support] \
@@ -185,3 +195,4 @@ if { [is_elf_format] } then {
 }
 
 set ASFLAGS $old_asflags
+set LDFLAGS $old_ldflags

diff --git a/ld/testsuite/ld-gc/pr13683.d b/ld/testsuite/ld-gc/pr13683.d
index 5561484fd5e5fbcfd4f94a5e3073ec775ca23b11..2c4d424e05f9e4285d22180db98f13090e793452 100644 (file)
--- a/ld/testsuite/ld-gc/pr13683.d
+++ b/ld/testsuite/ld-gc/pr13683.d
@@ -8,5 +8,6 @@
 
 #...
 0*[1-9a-f]+[0-9a-f]*[  ](T|D)[         ]_*foo
+#...
 0*[1-9a-f]+[0-9a-f]*[  ](T|D)[         ]_*foo2
 #...

diff --git a/ld/testsuite/ld-gc/pr14265.d b/ld/testsuite/ld-gc/pr14265.d
index 9e77ef3a25100e08ad7d7cfd7708a65c88104e7a..70896eb1f783ad72df1190ed150831155412a892 100644 (file)
--- a/ld/testsuite/ld-gc/pr14265.d
+++ b/ld/testsuite/ld-gc/pr14265.d
@@ -4,12 +4,15 @@
 #nm: --format=bsd --numeric-sort
 
 #...
-[0-9a-f]+[     ][dD][  ]_*foo1_start
+[0-9a-f]+ ([dD] _*foo1_start|D _*foo1)
 #...
-[0-9a-f]+[     ]D[     ]_*foo1
+[0-9a-f]+ (D _*foo1|[dD] _*foo1_start)
 #...
-[0-9a-f]+[     ][dD][  ]_*foo1_end
-[0-9a-f]+[     ][dD][  ]_*foo2_start
-[0-9a-f]+[     ]D[     ]_*foo2
-[0-9a-f]+[     ][dD][  ]_*foo2_end
+[0-9a-f]+ [dD] _*foo1_end
+#...
+[0-9a-f]+ ([dD] _*foo2_start|D _*foo2)
+#...
+[0-9a-f]+ (D _*foo2|[dD] _*foo2_start)
+#...
+[0-9a-f]+ [dD] _*foo2_end
 #...

diff --git a/ld/testsuite/ld-scripts/crossref.exp b/ld/testsuite/ld-scripts/crossref.exp
index 467b5d5d7e94f914a61f776ee6fdd1165549b2a6..4eaafcc0f250bf791188af588d91752be22a4672 100644 (file)
--- a/ld/testsuite/ld-scripts/crossref.exp
+++ b/ld/testsuite/ld-scripts/crossref.exp
@@ -76,7 +76,11 @@ set flags [big_or_little_endian]
 
 # arc-elf32 requires the symbol __SDATA_BEGIN__ to always be present.
 if [istarget arc*-*-elf32] {
-    set flags "$flags --defsym=__SDATA_BEGIN__=0"
+    append flags " --defsym __SDATA_BEGIN__=0"
+}
+
+if [is_pecoff_format] {
+    append flags " --image-base 0"
 }
 
 set exec_output [run_host_cmd "$ld" "$flags -o tmpdir/cross1 -T $srcdir/$subdir/cross1.t tmpdir/cross1.o tmpdir/cross2.o"]

diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index e3e4b98ee3c75d41129c2a781e720c651b00d97e..c8d561b87a3eddf58f9f5a3d7fb87de0023791a5 100644 (file)
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -238,7 +238,10 @@ proc run_srec_test { test objs } {
     # poorly with a.out.
 
     if { $sizeof_headers } {
-       set flags "$flags -Ttext 0x1000"
+       append flags " -Ttext 0x1000"
+       if [is_pecoff_format] {
+           append flags " --image-base 0"
+       }
     }
 
     # ARM targets cannot convert format in the linker
@@ -295,12 +298,12 @@ proc run_srec_test { test objs } {
 
     # Xtensa ELF targets relax by default; S-Record linker does not
     if [istarget xtensa*-*-*] {
-       set flags "$flags -no-relax"
+       append flags " -no-relax"
     }
 
     # PRU ELF target relaxes by default; S-Record linker does not
     if [istarget pru*-*-*] {
-       set flags "$flags -no-relax"
+       append flags " -no-relax"
     }
 
     if { ![ld_link $ld tmpdir/sr1 "$flags $objs"] \

diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 9febe283b9397cd9957e52da0e8b73b4c0014aed..a56c945f9b1d5f694870277ad0b9c5c980a53ca3 100644 (file)
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -380,7 +380,7 @@ proc ld_link_defsyms {} {
     }
 
     # Windows targets need __main, some prefixed with underscore.
-    if {[istarget *-*-cygwin* ] || [istarget *-*-mingw*]} {
+    if [is_pecoff_format] {
        append flags " --defsym __main=main --defsym ___main=main"
     }