Re: Add some expected failures for bfin linker tests

After commit 7ade0f1582c4 I was seeing bfin-elf +XPASS: weak symbols,
and on looking into the bfin targets a little, discovered we have two
bfin-linux targets.  One, bfin-uclinux, is like bfin-elf in that
ld -m elf32bfin is the default, and the other, bfin-linux-uclibc where
ld -m elf32bfinfd is the default.  So putting bfin-*-*linux* in test
xfails or elsewhere is wrong.  We want bfin-*-linux* instead to just
select the fdpic bfin target.

This patch corrects wrong bfin target triples in the ld testsuite,
not just the recent change but others I'd added to xfails too.
It also fixes the bfin-linux-uclibc ld-elf/64ksec fail

diff --git a/ld/testsuite/ld-elf/comm-data5.d b/ld/testsuite/ld-elf/comm-data5.d
index d13535150a274505379f515b9092471b07a5e70f..3e8c9b09a0eb06d2041f5504a756f9eaee9d753e 100644 (file)
--- a/ld/testsuite/ld-elf/comm-data5.d
+++ b/ld/testsuite/ld-elf/comm-data5.d
@@ -1,6 +1,6 @@
 #source: comm-data5.s
 #ld: 
 #readelf: -r
-#xfail: bfin-*-*linux* frv-*-*linux* lm32-*-linux*
+#xfail: bfin-*-linux* frv-*-*linux* lm32-*-linux*
 
 There are no relocations in this file.

diff --git a/ld/testsuite/ld-elf/pr23591.d b/ld/testsuite/ld-elf/pr23591.d
index 925453873e19c74eab6d2d9277652f25b46111a2..a97935eb3c35c3e9e1a212bdaab929cad65525b1 100644 (file)
--- a/ld/testsuite/ld-elf/pr23591.d
+++ b/ld/testsuite/ld-elf/pr23591.d
@@ -3,7 +3,7 @@
 #source: pr23591c.s
 #ld: -e _start
 #readelf: -sW
-#xfail: bfin-*-*linux* frv-*-linux* lm32-*-linux*
+#xfail: bfin-*-linux* frv-*-linux* lm32-*-linux*
 # bfin, frv, and lm32 fail with complaints about emitting dynamic
 # relocations in read-only sections.
 

diff --git a/ld/testsuite/ld-elf/pr23648.d b/ld/testsuite/ld-elf/pr23648.d
index 4b9b9be76e6421efdee4037b829677b62e44ae7a..848ebd91c909ec41dd23a12c090ab8ce52111148 100644 (file)
--- a/ld/testsuite/ld-elf/pr23648.d
+++ b/ld/testsuite/ld-elf/pr23648.d
@@ -1,6 +1,6 @@
 #ld: --gc-sections -T pr23648.t
 #target: [check_gc_sections_available]
-#xfail: bfin-*-*linux* frv-*-linux* lm32-*-linux*
+#xfail: bfin-*-linux* frv-*-linux* lm32-*-linux*
 #nm: -B
 
 #failif

diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp
index f04b0829b1743ee454c15f53b0c0109cda6639ab..28ebe1d3e819d95004198223973001615dd5548e 100644 (file)
--- a/ld/testsuite/ld-elf/sec64k.exp
+++ b/ld/testsuite/ld-elf/sec64k.exp
@@ -170,12 +170,13 @@ if [catch { set ofd [open "tmpdir/$test2.d" w] } x] {
 
 # too big for avr, d10v and msp
 # lack of fancy orphan section handling causes overlap on fr30 and iq2000
-# lm32 complains about relocations in read-only sections
+# bfin and lm32 complain about relocations in read-only sections
 if { ![istarget "d10v-*-*"]
      && ![istarget "avr-*-*"]
      && ![istarget "msp*-*-*"]
      && ![istarget "fr30-*-*"] 
      && ![istarget "iq2000-*-*"]
+     && ![istarget "bfin-*-linux*"]
      && ![istarget "lm32-*-linux*"]
      && ![istarget "pru-*-*"] } {
     foreach sfile $sfiles { puts $ofd "#source: $sfile" }

diff --git a/ld/testsuite/ld-gc/pr19167.d b/ld/testsuite/ld-gc/pr19167.d
index f652dd018f4778e52f62bd846836d1830c214ae0..f3024169134d98c53e51ba1b9f9cbfcf21f364e8 100644 (file)
--- a/ld/testsuite/ld-gc/pr19167.d
+++ b/ld/testsuite/ld-gc/pr19167.d
@@ -2,7 +2,7 @@
 #source: pr19167b.s
 #ld: --gc-sections -e _start
 #objdump: -s -j _foo
-#xfail: bfin-*-*linux* frv-*-*linux* lm32-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux* lm32-*-*linux*
 
 #...
 Contents of section _foo:

diff --git a/ld/testsuite/ld-gc/start.d b/ld/testsuite/ld-gc/start.d
index 0998ecfcc68b8dac2f72956863fb42336a3d5052..1f7ece590c82b2eee95ff5b2c8f84b6f5844427f 100644 (file)
--- a/ld/testsuite/ld-gc/start.d
+++ b/ld/testsuite/ld-gc/start.d
@@ -1,7 +1,7 @@
 #name: --gc-sections with __start_
 #ld: --gc-sections -e _start
 #nm: -n
-#xfail: bfin-*-*linux* frv-*-*linux* lm32-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux* lm32-*-*linux*
 
 #...
 [0-9a-f]+ D +_?__start__foo

diff --git a/ld/testsuite/ld-gc/start2.d b/ld/testsuite/ld-gc/start2.d
index b893ba2372952ec0190c81ceb783bfdb0f3ff5b6..d5a3e396b7525a467d10c3dbec91fa73d856cb68 100644 (file)
--- a/ld/testsuite/ld-gc/start2.d
+++ b/ld/testsuite/ld-gc/start2.d
@@ -2,7 +2,7 @@
 #ld: --gc-sections -e _start -z start-stop-gc
 #nm: -n
 #notarget: [uses_genelf]
-#xfail: bfin-*-*linux* frv-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux*
 
 #failif
 #...

diff --git a/ld/testsuite/ld-gc/start3.d b/ld/testsuite/ld-gc/start3.d
index a57dab187eae564aee0aad68ec230d796c07df34..d3d0a5fc1e8acd675dc0233e0ee45fd55d6ccc27 100644 (file)
--- a/ld/testsuite/ld-gc/start3.d
+++ b/ld/testsuite/ld-gc/start3.d
@@ -2,7 +2,7 @@
 #ld: --gc-sections -e _start
 #nm: -n
 #notarget: [is_generic]
-#xfail: bfin-*-*linux* frv-*-*linux* lm32-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux* lm32-*-*linux*
 
 #...
 [0-9a-f]+ T +bar

diff --git a/ld/testsuite/ld-gc/start4.d b/ld/testsuite/ld-gc/start4.d
index ae77aa9bf733babb6148f2bba9ffc9e763bd7578..60439a1262c1caf66c5c00f8eb7b7571ea6abf4c 100644 (file)
--- a/ld/testsuite/ld-gc/start4.d
+++ b/ld/testsuite/ld-gc/start4.d
@@ -2,7 +2,7 @@
 #ld: --gc-sections -e _start
 #nm: -n
 #target: [supports_gnu_unique]
-#xfail: bfin-*-*linux* frv-*-*linux* lm32-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux* lm32-*-*linux*
 
 #...
 [0-9a-f]+ R +bar_xx

diff --git a/ld/testsuite/ld-misc/defsym1.d b/ld/testsuite/ld-misc/defsym1.d
index 95868c45ac5f04bf69ef6751db907368bca5a163..fe5b94754f1b21c9113a3046be32d3a2508ae886 100644 (file)
--- a/ld/testsuite/ld-misc/defsym1.d
+++ b/ld/testsuite/ld-misc/defsym1.d
@@ -1,7 +1,7 @@
 #ld: -e 0 --defsym foo=1 tmpdir/start.o tmpdir/libfoo.a
 #nm: -B
 #source: dummy.s
-#xfail: bfin-*-*linux* frv-*-linux*
+#xfail: bfin-*-linux* frv-*-linux*
 
 # Check that --defsym works on archive.
 #failif

diff --git a/ld/testsuite/ld-scripts/empty-address-1.d b/ld/testsuite/ld-scripts/empty-address-1.d
index a2940b3d2c92a126b05e6593aa778eea6b1ac111..dbaf778024e32d528f347c687eaf32dc55766f4c 100644 (file)
--- a/ld/testsuite/ld-scripts/empty-address-1.d
+++ b/ld/testsuite/ld-scripts/empty-address-1.d
@@ -1,6 +1,6 @@
 #ld: -T empty-address-1.t
 #nm: -n
-#xfail: bfin-*-*linux* frv-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux*
 #...
 0+0 [AT] _start
 #...

diff --git a/ld/testsuite/ld-scripts/empty-address-2a.d b/ld/testsuite/ld-scripts/empty-address-2a.d
index ea6048d5cd847fd9cab805715c715c58bf0c2bad..4471a1be6a31df8113b792f19aa92996fea9c95c 100644 (file)
--- a/ld/testsuite/ld-scripts/empty-address-2a.d
+++ b/ld/testsuite/ld-scripts/empty-address-2a.d
@@ -1,7 +1,7 @@
 #source: empty-address-2.s
 #ld: -Ttext 0x0000000 -Tdata 0x200 -T empty-address-2a.t
 #nm: -n
-#xfail: bfin-*-*linux* frv-*-*linux* riscv64*-*-* tic54x-*-*
+#xfail: bfin-*-linux* frv-*-*linux* riscv64*-*-* tic54x-*-*
 #...
 0+0 T _start
 #...

diff --git a/ld/testsuite/ld-scripts/empty-address-2b.d b/ld/testsuite/ld-scripts/empty-address-2b.d
index 95499405940c2cdf31f74b31a1e09bf258e1d7a1..8dfe888b63dba56a535b0adce7f4fbb002e8a58e 100644 (file)
--- a/ld/testsuite/ld-scripts/empty-address-2b.d
+++ b/ld/testsuite/ld-scripts/empty-address-2b.d
@@ -1,7 +1,7 @@
 #source: empty-address-2.s
 #ld: -Ttext 0x0000000 -Tdata 0x200 -T empty-address-2b.t
 #nm: -n
-#xfail: bfin-*-*linux* frv-*-*linux* riscv64*-*-* tic54x-*-*
+#xfail: bfin-*-linux* frv-*-*linux* riscv64*-*-* tic54x-*-*
 #...
 0+0 T _start
 #...

diff --git a/ld/testsuite/ld-scripts/pr14962-2.d b/ld/testsuite/ld-scripts/pr14962-2.d
index 8df00d9d1f4a0184d4bf6404097b4aa35341db14..8b464da652c526349ad4d1b40da0801a7ea94d38 100644 (file)
--- a/ld/testsuite/ld-scripts/pr14962-2.d
+++ b/ld/testsuite/ld-scripts/pr14962-2.d
@@ -1,7 +1,7 @@
 #ld: -T pr14962-2.t
 #source: pr14962a.s
 #nm: -n
-#xfail: bfin-*-*linux* frv-*-*linux*
+#xfail: bfin-*-linux* frv-*-*linux*
 
 #...
 0+2000 [AT] _start

diff --git a/ld/testsuite/ld-scripts/pr14962.d b/ld/testsuite/ld-scripts/pr14962.d
index 779b3c926776416647860ec16fe736e3a64a12a0..4c8e3707f7e0209a9d56efe2f81c8d452d0b2616 100644 (file)
--- a/ld/testsuite/ld-scripts/pr14962.d
+++ b/ld/testsuite/ld-scripts/pr14962.d
@@ -5,8 +5,8 @@
 #xfail: mmix-knuth-mmixware
 # The reference to x would normally generate a cross-reference error
 # but the linker script converts x to absolute to avoid the error.
-#xfail: bfin-*-*linux*
-# The bfin backend complains about attempting to put a fixup into a read-only section.
+#xfail: bfin-*-linux*
+# The bfinfd backend complains about fixups in read-only sections.
 
 #...
 0+2000 A x

diff --git a/ld/testsuite/ld-scripts/weak.exp b/ld/testsuite/ld-scripts/weak.exp
index dff087d3a2a02b214dc70d450acdd8cc2d1230b6..004ea593e644dc068e3f3a3192af9d305bf6d41d 100644 (file)
--- a/ld/testsuite/ld-scripts/weak.exp
+++ b/ld/testsuite/ld-scripts/weak.exp
@@ -26,7 +26,8 @@ set testname "weak symbols"
 if { [is_elf_format] } {
     # hppa64 is incredibly broken
     setup_xfail hppa64-*-*
-    setup_xfail bfin-*-*
+    # elf32bfinfd target complains about fixups in read-only sections
+    setup_xfail bfin-*-linux*
 } elseif { [is_pecoff_format] } {
     # Weak symbols are broken for most PE targets.
     if { ![istarget aarch64-*-*]