From 7a34d0ea4ddd5ff205637fbad5faf2e977921720 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 13 Jul 2020 19:57:28 +0930 Subject: [PATCH] x86_64-cygwin tests Tests just having "xfail: x86_64-*-cygwin" aren't good, since presumably if a test fails on x86_64-cygwin then it also fails on x86_64-*-pe* and x86_64-*-mingw*. binutils/ * testsuite/lib/binutils-common.exp (is_pecoff_format): Accept optional machine-os arg. ld/ * testsuite/ld-scripts/default-script1.d: Don't skip, xfail using is_pecoff_format. * testsuite/ld-scripts/default-script2.d: Likewise. * testsuite/ld-scripts/default-script3.d: Likewise. * testsuite/ld-scripts/default-script4.d: Likewise. * testsuite/ld-scripts/pr20302.d: Remove x86_64-*-cygwin from notarget. * testsuite/ld-scripts/provide-6.d: Remove x86_64-*-cygwin from xfail. * testsuite/ld-scripts/provide-8.d: Likewise. --- binutils/ChangeLog | 5 +++++ binutils/testsuite/lib/binutils-common.exp | 23 +++++++++++++--------- ld/ChangeLog | 11 +++++++++++ ld/testsuite/ld-scripts/default-script1.d | 8 ++++---- ld/testsuite/ld-scripts/default-script2.d | 8 ++++---- ld/testsuite/ld-scripts/default-script3.d | 8 ++++---- ld/testsuite/ld-scripts/default-script4.d | 8 ++++---- ld/testsuite/ld-scripts/pr20302.d | 3 +-- ld/testsuite/ld-scripts/provide-6.d | 1 - ld/testsuite/ld-scripts/provide-8.d | 2 +- 10 files changed, 48 insertions(+), 29 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 14917c7f574..b30bbc40984 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2020-07-13 Alan Modra + + * testsuite/lib/binutils-common.exp (is_pecoff_format): Accept + optional machine-os arg. + 2020-07-11 H.J. Lu * readelf.c (decode_x86_feature_2): Handle diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 948b910b835..345840c0b24 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -94,15 +94,20 @@ proc is_aout_format {} { # True if the object format is known to be PE COFF. # -proc is_pecoff_format {} { - if { [istarget *-*-beospe*] - || [istarget *-*-cegcc*] - || [istarget *-*-cygwin*] - || [istarget *-*-interix*] - || [istarget *-*-mingw*] - || [istarget *-*-netbsdpe*] - || [istarget *-*-pe*] - || [istarget *-*-winnt*] } { +proc is_pecoff_format args { + if { [llength $args] == 1 } { + set m_os [lindex $args 0] + } else { + set m_os *-* + } + if { [istarget $m_os-beospe*] + || [istarget $m_os-cegcc*] + || [istarget $m_os-cygwin*] + || [istarget $m_os-interix*] + || [istarget $m_os-mingw*] + || [istarget $m_os-netbsdpe*] + || [istarget $m_os-pe*] + || [istarget $m_os-winnt*] } { return 1 } return 0 diff --git a/ld/ChangeLog b/ld/ChangeLog index c0bbaf95dfa..98d10c0b73a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,14 @@ +2020-07-13 Alan Modra + + * testsuite/ld-scripts/default-script1.d: Don't skip, xfail + using is_pecoff_format. + * testsuite/ld-scripts/default-script2.d: Likewise. + * testsuite/ld-scripts/default-script3.d: Likewise. + * testsuite/ld-scripts/default-script4.d: Likewise. + * testsuite/ld-scripts/pr20302.d: Remove x86_64-*-cygwin from notarget. + * testsuite/ld-scripts/provide-6.d: Remove x86_64-*-cygwin from xfail. + * testsuite/ld-scripts/provide-8.d: Likewise. + 2020-07-10 Alan Modra * ld.texi (PowerPC64 ELF64): Document --no-inline-optimize, diff --git a/ld/testsuite/ld-scripts/default-script1.d b/ld/testsuite/ld-scripts/default-script1.d index 110b30e3449..ec88067f438 100644 --- a/ld/testsuite/ld-scripts/default-script1.d +++ b/ld/testsuite/ld-scripts/default-script1.d @@ -1,7 +1,7 @@ -# source: default-script.s -# ld: -defsym _START=0x800 -T default-script.t -# nm: -n -# skip: x86_64-*-mingw* x86_64-*-cygwin +#source: default-script.s +#ld: -defsym _START=0x800 -T default-script.t +#nm: -n +#xfail: {[is_pecoff_format x86_64-*]} # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000 #... diff --git a/ld/testsuite/ld-scripts/default-script2.d b/ld/testsuite/ld-scripts/default-script2.d index 3fd43864530..b10ac96288e 100644 --- a/ld/testsuite/ld-scripts/default-script2.d +++ b/ld/testsuite/ld-scripts/default-script2.d @@ -1,7 +1,7 @@ -# source: default-script.s -# ld: -T default-script.t -defsym _START=0x800 -# nm: -n -# skip: x86_64-*-mingw* x86_64-*-cygwin +#source: default-script.s +#ld: -T default-script.t -defsym _START=0x800 +#nm: -n +#xfail: {[is_pecoff_format x86_64-*]} # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000 #... diff --git a/ld/testsuite/ld-scripts/default-script3.d b/ld/testsuite/ld-scripts/default-script3.d index 43164bddc76..4742bc31e4f 100644 --- a/ld/testsuite/ld-scripts/default-script3.d +++ b/ld/testsuite/ld-scripts/default-script3.d @@ -1,7 +1,7 @@ -# source: default-script.s -# ld: -defsym _START=0x800 -dT default-script.t -# nm: -n -# skip: x86_64-*-mingw* x86_64-*-cygwin +#source: default-script.s +#ld: -defsym _START=0x800 -dT default-script.t +#nm: -n +#xfail: {[is_pecoff_format x86_64-*]} # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000 #... diff --git a/ld/testsuite/ld-scripts/default-script4.d b/ld/testsuite/ld-scripts/default-script4.d index d92e9d60895..09b6dbf08ba 100644 --- a/ld/testsuite/ld-scripts/default-script4.d +++ b/ld/testsuite/ld-scripts/default-script4.d @@ -1,7 +1,7 @@ -# source: default-script.s -# ld: --default-script default-script.t -defsym _START=0x800 -# nm: -n -# skip: x86_64-*-mingw* x86_64-*-cygwin +#source: default-script.s +#ld: --default-script default-script.t -defsym _START=0x800 +#nm: -n +#xfail: {[is_pecoff_format x86_64-*]} # Skipped on Mingw64 and Cygwin because the image base defaults to 0x100000000 #... diff --git a/ld/testsuite/ld-scripts/pr20302.d b/ld/testsuite/ld-scripts/pr20302.d index b89e32b349e..7eb25ce858d 100644 --- a/ld/testsuite/ld-scripts/pr20302.d +++ b/ld/testsuite/ld-scripts/pr20302.d @@ -1,11 +1,10 @@ #ld: -Tdata=0x1000 -Tdata=0x2000 -Tcross2.t #source: align2a.s #objdump: -h -#notarget: *-*-*aout *-*-netbsd *-*-vms ns32k-*-* rx-*-* x86_64-*-cygwin +#notarget: *-*-*aout *-*-netbsd *-*-vms ns32k-*-* rx-*-* # AOUT and NETBSD (ns32k is aout) have fixed address for the data section. # VMS targets need extra libraries. # RX uses non standard section names. -# x86_64 Cygwin biases all start addresses to be > 2Gb. #... . \.data[ ]+0+[0-9a-f]+[ ]+0+02000[ ]+0+02000.* diff --git a/ld/testsuite/ld-scripts/provide-6.d b/ld/testsuite/ld-scripts/provide-6.d index 6b3808ee4e2..27a2d0d5a0b 100644 --- a/ld/testsuite/ld-scripts/provide-6.d +++ b/ld/testsuite/ld-scripts/provide-6.d @@ -1,7 +1,6 @@ #source: provide-5.s #ld: -T provide-6.t #nm: -B -#xfail: x86_64-*-cygwin #... 0+1000 D foo diff --git a/ld/testsuite/ld-scripts/provide-8.d b/ld/testsuite/ld-scripts/provide-8.d index f5abc524e89..16510be9e90 100644 --- a/ld/testsuite/ld-scripts/provide-8.d +++ b/ld/testsuite/ld-scripts/provide-8.d @@ -1,7 +1,7 @@ #source: provide-5.s #ld: -T provide-8.t #nm: -B -#xfail: x86_64-*-cygwin mmix-*-* sh-*-pe spu-*-* +#xfail: mmix-*-* sh-*-pe spu-*-* #... 0+4000 D __FOO -- 2.30.2