From bb8974772177ff4c043bfc28305bba66e7badf36 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 2 Apr 2020 10:52:57 +0200 Subject: [PATCH] ld: Disable ifunc tests on Solaris A couple of ld ifunc tests currently FAIL on 64-bit Solaris/x86: FAIL: ld-ifunc/ifunc-10-x86-64 FAIL: ld-ifunc/ifunc-11-x86-64 FAIL: ld-ifunc/ifunc-12-x86-64 FAIL: ld-ifunc/ifunc-13-x86-64 FAIL: ld-ifunc/ifunc-14a-x86-64 FAIL: ld-ifunc/ifunc-14b-x86-64 FAIL: ld-ifunc/ifunc-14c-x86-64 FAIL: ld-ifunc/ifunc-14d-x86-64 FAIL: ld-ifunc/ifunc-14e-x86-64 FAIL: ld-ifunc/ifunc-14f-x86-64 FAIL: ld-ifunc/ifunc-15-x86-64 FAIL: ld-ifunc/ifunc-17a-x86-64 FAIL: ld-ifunc/ifunc-17b-x86-64 FAIL: ld-ifunc/ifunc-2-local-x86-64-now FAIL: ld-ifunc/ifunc-2-local-x86-64 FAIL: ld-ifunc/ifunc-2-x86-64-now FAIL: ld-ifunc/ifunc-2-x86-64 FAIL: ld-ifunc/ifunc-20-x86-64 FAIL: ld-ifunc/pr17154-x86-64-now FAIL: ld-ifunc/pr17154-x86-64 For one, the actual error is weird: ./ld-new: target elf64-x86-64 not found failed with: <./ld-new: target elf64-x86-64 not found>, no expected output FAIL: ld-ifunc/ifunc-10-x86-64 although ld -V does report the elf_x86_64 emulation as supported: $ ./ld/ld-new -V GNU ld (GNU Binutils) 2.34.50.20200328 Supported emulations: elf_x86_64_sol2 elf_x86_64 [...] When using ld -m elf_x86_64_sol2 instead, one of the testcases links successfully. However, there's no point in pursuing this: Solaris does not support ifunc, as can be seen in : /* * GNU/Linux specific symbol type not used by Solaris */ #define STT_GNU_IFUNC 10 and never will, given that it has symbol capabilities as solution to effectively the same problem: http://www.linker-aliens.org/blogs/rie/entry/symbol_capabilitie/ Therefore this patch disables ifunc testing on Solaris completely by removing Solaris from binutils/testsuite/lib/binutils-common.exp (supports_gnu_osabi). The ifunc part is justified above. SHF_GNU_MBIND is in the OS-specific range and conflicts with #define SHF_SUNW_REALLOC 0x01000000 /* internal: krtld realloc */ While the comment suggests this might be relocatable without too much problems, the description of mbind (no formal spec AFAICS, just the comment in the binutils patch submission) strongly suggests that this isn't relevant to Solaris at all. Indirectly, clearing supports_gnu_osabi on Solaris disables supports_gnu_unique. Again, Solaris has /* * GNU/Linux specific binding not used by Solaris */ #define STB_GNU_UNIQUE 10 so this seems the right thing to do. Afterwards, one can remove the explicit mentions of *-*-solaris2* in quite a number of (but not all) the ld-ifunc dump file notarget lists. There's one fallout, though: two gas tests now XPASS because they are xfail'ed for !supports_gnu_osabi: XPASS: mbind sections 12 XPASS: mbind section contents 16 XPASS: mbind sections 16 XPASS: mbind section contents 16 To fix that, I've changed #xfail: ![supports_gnu_osabi] to notarget. Tested on x86_64-pc-solaris2.11, i386-pc-solaris2.11, x86_64-pc-linux-gnu, and i686-pc-linux-gnu. ld: * testsuite/ld-ifunc/ifunc-10-i386.d: Remove *-*-solaris2* from notarget. * ifunc-11-i386.d: Likewise. * ifunc-12-i386.d: Likewise. * ifunc-13-i386.d: Likewise. * ifunc-14a-i386.d: Likewise. * ifunc-14b-i386.d: Likewise. * ifunc-14c-i386.d: Likewise. * ifunc-14d-i386.d: Likewise. * ifunc-14e-i386.d: Likewise. * ifunc-14f-i386.d: Likewise. * ifunc-15-i386.d: Likewise. * ifunc-16-i386-now.d: Likewise. * ifunc-16-i386.d: Likewise. * ifunc-17a-i386.d: Likewise. * ifunc-17b-i386.d: Likewise. * ifunc-18a-i386.d: Likewise. * ifunc-18b-i386.d: Likewise. * ifunc-19a-i386.d: Likewise. * ifunc-19b-i386.d: Likewise. * ifunc-2-i386-now.d: Likewise. * ifunc-2-i386.d: Likewise. * ifunc-2-local-i386-now.d: Likewise. * ifunc-2-local-i386.d: Likewise. * ifunc-20-i386.d: Likewise. * ifunc-21-i386.d: Likewise. * ifunc-22-i386.d: Likewise. * ifunc-5a-i386.d: Likewise. * ifunc-5a-local-i386.d: Likewise. * ifunc-5b-i386.d: Likewise. * ifunc-5b-local-i386.d: Likewise. * ifunc-5r-local-i386.d: Likewise. * ifunc-6a-i386.d: Likewise. * ifunc-6b-i386.d: Likewise. * ifunc-7a-i386.d: Likewise. * ifunc-7b-i386.d: Likewise. * ifunc-8-i386.d: Likewise. * ifunc-9-i386.d: Likewise. * pr17154-i386-now.d: Likewise. * pr17154-i386.d: Likewise. * ifunc-23a-x86.d: Remove notarget. * ifunc-24a-x86.d: Likewise. * ifunc-25a-x86.d: Likewise. gas: * testsuite/gas/elf/section12a.d: Use notarget instead of xfail. * testsuite/gas/elf/section12b.d: Likewise. * testsuite/gas/elf/section16a.d: Likewise. * testsuite/gas/elf/section16b.d: Likewise. binutils: * testsuite/lib/binutils-common.exp (supports_gnu_osabi): Don't enable on *-*-solaris*. --- binutils/ChangeLog | 5 ++ binutils/testsuite/lib/binutils-common.exp | 3 +- gas/ChangeLog | 7 +++ gas/testsuite/gas/elf/section12a.d | 2 +- gas/testsuite/gas/elf/section12b.d | 2 +- gas/testsuite/gas/elf/section16a.d | 2 +- gas/testsuite/gas/elf/section16b.d | 2 +- ld/ChangeLog | 47 +++++++++++++++++++ ld/testsuite/ld-ifunc/ifunc-10-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-11-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-12-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-13-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-14a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-14b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-14c-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-14d-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-14e-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-14f-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-15-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-16-i386-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-16-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-17a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-17b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-18a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-18b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-19a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-19b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-i386-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-i386.d | 2 +- .../ld-ifunc/ifunc-2-local-i386-now.d | 2 +- ld/testsuite/ld-ifunc/ifunc-2-local-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-20-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-21-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-22-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-23a-x86.d | 1 - ld/testsuite/ld-ifunc/ifunc-24a-x86.d | 1 - ld/testsuite/ld-ifunc/ifunc-25a-x86.d | 1 - ld/testsuite/ld-ifunc/ifunc-5a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-5b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-6a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-6b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-7a-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-7b-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-8-i386.d | 2 +- ld/testsuite/ld-ifunc/ifunc-9-i386.d | 2 +- ld/testsuite/ld-ifunc/pr17154-i386-now.d | 2 +- ld/testsuite/ld-ifunc/pr17154-i386.d | 2 +- 50 files changed, 103 insertions(+), 48 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index a08be238790..2eba234de02 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2020-04-02 Rainer Orth + + * testsuite/lib/binutils-common.exp (supports_gnu_osabi): Don't + enable on *-*-solaris*. + 2020-03-30 Nick Clifton PR binutils/25662 diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp index 57b94f528a7..08dcc4d739c 100644 --- a/binutils/testsuite/lib/binutils-common.exp +++ b/binutils/testsuite/lib/binutils-common.exp @@ -201,8 +201,7 @@ proc supports_gnu_osabi {} { || ( [istarget *-*-nto*] && ![istarget arm*-*-*] ) || [istarget *-*-irix*] || [istarget *-*-*eabi*] - || [istarget *-*-rtems*] - || [istarget *-*-solaris*] } { + || [istarget *-*-rtems*] } { return 1 } if { [istarget "wasm32*-*-*"] } { diff --git a/gas/ChangeLog b/gas/ChangeLog index 83108d362c2..93e44c5153b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2020-04-02 Rainer Orth + + * testsuite/gas/elf/section12a.d: Use notarget instead of xfail. + * testsuite/gas/elf/section12b.d: Likewise. + * testsuite/gas/elf/section16a.d: Likewise. + * testsuite/gas/elf/section16b.d: Likewise. + 2020-04-02 Gunther Nikl * config/tc-m68k.c (m68k_ip): Fix range check for index register diff --git a/gas/testsuite/gas/elf/section12a.d b/gas/testsuite/gas/elf/section12a.d index 15801617d58..08ecbd21107 100644 --- a/gas/testsuite/gas/elf/section12a.d +++ b/gas/testsuite/gas/elf/section12a.d @@ -3,7 +3,7 @@ #readelf: -Sg --wide #name: mbind sections 12 # A number of targets do not support SHF_GNU_MBIND -#xfail: ![supports_gnu_osabi] +#notarget: ![supports_gnu_osabi] #... \[[ 0-9]+\] \.mbind\.data[ ]+PROGBITS[ ]+0+0 0+[0-9a-f]+ 0+1 00 WAD 0 0 1 diff --git a/gas/testsuite/gas/elf/section12b.d b/gas/testsuite/gas/elf/section12b.d index 98a4b9521d7..92dd3f75854 100644 --- a/gas/testsuite/gas/elf/section12b.d +++ b/gas/testsuite/gas/elf/section12b.d @@ -6,7 +6,7 @@ # expected below. #xfail: rx-*-* # A number of targets do not support SHF_GNU_MBIND -#xfail: ![supports_gnu_osabi] +#notarget: ![supports_gnu_osabi] #... Contents of section .mbind.data: diff --git a/gas/testsuite/gas/elf/section16a.d b/gas/testsuite/gas/elf/section16a.d index 0d664752d8d..e5a1a85d8cd 100644 --- a/gas/testsuite/gas/elf/section16a.d +++ b/gas/testsuite/gas/elf/section16a.d @@ -3,7 +3,7 @@ #readelf: -Sg --wide #name: mbind sections 16 # A number of targets do not support SHF_GNU_MBIND -#xfail: ![supports_gnu_osabi] +#notarget: ![supports_gnu_osabi] #... \[[ 0-9]+\] \.mbind\.data[ ]+PROGBITS[ ]+0+0 0+[0-9a-f]+ 0+1 00 WAD 0 0 1 diff --git a/gas/testsuite/gas/elf/section16b.d b/gas/testsuite/gas/elf/section16b.d index 9014fab9e7b..6e085c3cab4 100644 --- a/gas/testsuite/gas/elf/section16b.d +++ b/gas/testsuite/gas/elf/section16b.d @@ -6,7 +6,7 @@ # expected below. #xfail: rx-*-* # A number of targets do not support SHF_GNU_MBIND -#xfail: ![supports_gnu_osabi] +#notarget: ![supports_gnu_osabi] #... Contents of section .mbind.data: diff --git a/ld/ChangeLog b/ld/ChangeLog index a2964ebbafd..3d66a84893a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,50 @@ +2020-04-02 Rainer Orth + + * testsuite/ld-ifunc/ifunc-10-i386.d: Remove *-*-solaris2* from + notarget. + * ifunc-11-i386.d: Likewise. + * ifunc-12-i386.d: Likewise. + * ifunc-13-i386.d: Likewise. + * ifunc-14a-i386.d: Likewise. + * ifunc-14b-i386.d: Likewise. + * ifunc-14c-i386.d: Likewise. + * ifunc-14d-i386.d: Likewise. + * ifunc-14e-i386.d: Likewise. + * ifunc-14f-i386.d: Likewise. + * ifunc-15-i386.d: Likewise. + * ifunc-16-i386-now.d: Likewise. + * ifunc-16-i386.d: Likewise. + * ifunc-17a-i386.d: Likewise. + * ifunc-17b-i386.d: Likewise. + * ifunc-18a-i386.d: Likewise. + * ifunc-18b-i386.d: Likewise. + * ifunc-19a-i386.d: Likewise. + * ifunc-19b-i386.d: Likewise. + * ifunc-2-i386-now.d: Likewise. + * ifunc-2-i386.d: Likewise. + * ifunc-2-local-i386-now.d: Likewise. + * ifunc-2-local-i386.d: Likewise. + * ifunc-20-i386.d: Likewise. + * ifunc-21-i386.d: Likewise. + * ifunc-22-i386.d: Likewise. + * ifunc-5a-i386.d: Likewise. + * ifunc-5a-local-i386.d: Likewise. + * ifunc-5b-i386.d: Likewise. + * ifunc-5b-local-i386.d: Likewise. + * ifunc-5r-local-i386.d: Likewise. + * ifunc-6a-i386.d: Likewise. + * ifunc-6b-i386.d: Likewise. + * ifunc-7a-i386.d: Likewise. + * ifunc-7b-i386.d: Likewise. + * ifunc-8-i386.d: Likewise. + * ifunc-9-i386.d: Likewise. + * pr17154-i386-now.d: Likewise. + * pr17154-i386.d: Likewise. + + * ifunc-23a-x86.d: Remove notarget. + * ifunc-24a-x86.d: Likewise. + * ifunc-25a-x86.d: Likewise. + 2020-04-02 Nick Clifton PR ld/25747 diff --git a/ld/testsuite/ld-ifunc/ifunc-10-i386.d b/ld/testsuite/ld-ifunc/ifunc-10-i386.d index b72545acfec..baff0fc7f6f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-10-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-10-i386.d @@ -2,6 +2,6 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* There are no relocations in this file. diff --git a/ld/testsuite/ld-ifunc/ifunc-11-i386.d b/ld/testsuite/ld-ifunc/ifunc-11-i386.d index b72545acfec..baff0fc7f6f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-11-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-11-i386.d @@ -2,6 +2,6 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* There are no relocations in this file. diff --git a/ld/testsuite/ld-ifunc/ifunc-12-i386.d b/ld/testsuite/ld-ifunc/ifunc-12-i386.d index cd41f5bfb9c..217b5ca9170 100644 --- a/ld/testsuite/ld-ifunc/ifunc-12-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-12-i386.d @@ -2,6 +2,6 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* There are no relocations in this file. diff --git a/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d index 1f6bd959f6f..1af22fd35d6 100644 --- a/ld/testsuite/ld-ifunc/ifunc-13-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-13-i386.d @@ -4,7 +4,7 @@ #as: --32 -mrelax-relocations=yes #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entry: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-14a-i386.d b/ld/testsuite/ld-ifunc/ifunc-14a-i386.d index 93a583462be..4a1c967ec01 100644 --- a/ld/testsuite/ld-ifunc/ifunc-14a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-14a-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -d --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #failif #... diff --git a/ld/testsuite/ld-ifunc/ifunc-14b-i386.d b/ld/testsuite/ld-ifunc/ifunc-14b-i386.d index 213dc8096b1..eeb6ce20ee8 100644 --- a/ld/testsuite/ld-ifunc/ifunc-14b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-14b-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -d --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #failif #... diff --git a/ld/testsuite/ld-ifunc/ifunc-14c-i386.d b/ld/testsuite/ld-ifunc/ifunc-14c-i386.d index 29960ed06cc..f8e50642a5a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-14c-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-14c-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #failif #... diff --git a/ld/testsuite/ld-ifunc/ifunc-14d-i386.d b/ld/testsuite/ld-ifunc/ifunc-14d-i386.d index a355d36d6e1..95099144067 100644 --- a/ld/testsuite/ld-ifunc/ifunc-14d-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-14d-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #failif #... diff --git a/ld/testsuite/ld-ifunc/ifunc-14e-i386.d b/ld/testsuite/ld-ifunc/ifunc-14e-i386.d index c47ff3e5de4..45f29b82512 100644 --- a/ld/testsuite/ld-ifunc/ifunc-14e-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-14e-i386.d @@ -5,7 +5,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #failif #... diff --git a/ld/testsuite/ld-ifunc/ifunc-14f-i386.d b/ld/testsuite/ld-ifunc/ifunc-14f-i386.d index 9f92a715acd..50a209bf562 100644 --- a/ld/testsuite/ld-ifunc/ifunc-14f-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-14f-i386.d @@ -5,7 +5,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #failif #... diff --git a/ld/testsuite/ld-ifunc/ifunc-15-i386.d b/ld/testsuite/ld-ifunc/ifunc-15-i386.d index bac4afe4ad2..c0194b225af 100644 --- a/ld/testsuite/ld-ifunc/ifunc-15-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-15-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.got' at offset 0x[0-9a-f]+ contains 1 entry: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d index 879976b5a89..42386028c7f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-16-i386-now.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-16-i386.d b/ld/testsuite/ld-ifunc/ifunc-16-i386.d index 8e0c06908ca..3fca3fc5c2d 100644 --- a/ld/testsuite/ld-ifunc/ifunc-16-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-16-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-17a-i386.d b/ld/testsuite/ld-ifunc/ifunc-17a-i386.d index 1ff40c26a59..7d79ca7bb5a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-17a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-17a-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -s --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #... +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo diff --git a/ld/testsuite/ld-ifunc/ifunc-17b-i386.d b/ld/testsuite/ld-ifunc/ifunc-17b-i386.d index 1d54a90c0e0..e8ab4208036 100644 --- a/ld/testsuite/ld-ifunc/ifunc-17b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-17b-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -s --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #... +[0-9]+: +[0-9a-f]+ +4 +OBJECT +GLOBAL +DEFAULT +[1-9] foo diff --git a/ld/testsuite/ld-ifunc/ifunc-18a-i386.d b/ld/testsuite/ld-ifunc/ifunc-18a-i386.d index e79d136b0e2..d0fa3dad1e8 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-18a-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.ifunc' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-18b-i386.d b/ld/testsuite/ld-ifunc/ifunc-18b-i386.d index a7d295bf061..448323e59dc 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-18b-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.ifunc' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-19a-i386.d b/ld/testsuite/ld-ifunc/ifunc-19a-i386.d index e2d19178c73..6b11169188b 100644 --- a/ld/testsuite/ld-ifunc/ifunc-19a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-19a-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.ifunc' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-19b-i386.d b/ld/testsuite/ld-ifunc/ifunc-19b-i386.d index 29f590052c6..ae6831671a9 100644 --- a/ld/testsuite/ld-ifunc/ifunc-19b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-19b-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.ifunc' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d index 533cd78b3ac..2b6864a66d1 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-i386-now.d @@ -3,7 +3,7 @@ #as: --32 #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* .*: +file format .* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-i386.d b/ld/testsuite/ld-ifunc/ifunc-2-i386.d index 3cf1ef0e12c..bc00d526c00 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-i386.d @@ -2,7 +2,7 @@ #as: --32 #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #... [ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-f]+<\*ABS\*@plt> diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d index b11324c87f0..c25f27a81df 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386-now.d @@ -3,7 +3,7 @@ #as: --32 #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* .*: +file format .* diff --git a/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d index 3cf1ef0e12c..bc00d526c00 100644 --- a/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-2-local-i386.d @@ -2,7 +2,7 @@ #as: --32 #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #... [ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-f]+<\*ABS\*@plt> diff --git a/ld/testsuite/ld-ifunc/ifunc-20-i386.d b/ld/testsuite/ld-ifunc/ifunc-20-i386.d index 5c138564c46..b7edd370a3a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-20-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-20-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entry: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d index 12ab848fe6a..24f287fae92 100644 --- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d @@ -2,7 +2,7 @@ #as: --32 -mrelax-relocations=yes #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* .*: +file format .* diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d index 12ab848fe6a..24f287fae92 100644 --- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d @@ -2,7 +2,7 @@ #as: --32 -mrelax-relocations=yes #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* .*: +file format .* diff --git a/ld/testsuite/ld-ifunc/ifunc-23a-x86.d b/ld/testsuite/ld-ifunc/ifunc-23a-x86.d index 7359d045755..a9891407fb6 100644 --- a/ld/testsuite/ld-ifunc/ifunc-23a-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-23a-x86.d @@ -2,7 +2,6 @@ #ld: #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-solaris* Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym.* Value +Symbol's Name.* diff --git a/ld/testsuite/ld-ifunc/ifunc-24a-x86.d b/ld/testsuite/ld-ifunc/ifunc-24a-x86.d index 7b63a5ceb39..91e87ee8f4f 100644 --- a/ld/testsuite/ld-ifunc/ifunc-24a-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-24a-x86.d @@ -2,7 +2,6 @@ #ld: #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-solaris* Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym.* Value +Symbol's Name.* diff --git a/ld/testsuite/ld-ifunc/ifunc-25a-x86.d b/ld/testsuite/ld-ifunc/ifunc-25a-x86.d index e07c819ba6f..5f49fd83ffc 100644 --- a/ld/testsuite/ld-ifunc/ifunc-25a-x86.d +++ b/ld/testsuite/ld-ifunc/ifunc-25a-x86.d @@ -2,7 +2,6 @@ #ld: #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-solaris* Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entry: +Offset +Info +Type +Sym.* Value +Symbol's Name.* diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-i386.d b/ld/testsuite/ld-ifunc/ifunc-5a-i386.d index 3fd52a6c6d6..b64e5b818c1 100644 --- a/ld/testsuite/ld-ifunc/ifunc-5a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-5a-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d index 979d5b98030..d4ad13a4bab 100644 --- a/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-5a-local-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-i386.d b/ld/testsuite/ld-ifunc/ifunc-5b-i386.d index 3d9aa277c11..2c971ba09c3 100644 --- a/ld/testsuite/ld-ifunc/ifunc-5b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-5b-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.got' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d index 0af572c9fe8..eb6d83be136 100644 --- a/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-5b-local-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d b/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d index 3eccf932bf0..f66b796bea0 100644 --- a/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-5r-local-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.text' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-6a-i386.d b/ld/testsuite/ld-ifunc/ifunc-6a-i386.d index 3dc853adcf4..8d0c14ba3a8 100644 --- a/ld/testsuite/ld-ifunc/ifunc-6a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-6a-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-6b-i386.d b/ld/testsuite/ld-ifunc/ifunc-6b-i386.d index 5809f089058..36aa8328c5c 100644 --- a/ld/testsuite/ld-ifunc/ifunc-6b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-6b-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.got' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-7a-i386.d b/ld/testsuite/ld-ifunc/ifunc-7a-i386.d index dfe3028d4ee..d9bbb60abde 100644 --- a/ld/testsuite/ld-ifunc/ifunc-7a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-7a-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-7b-i386.d b/ld/testsuite/ld-ifunc/ifunc-7b-i386.d index 427fa2b6c3a..dee920f15de 100644 --- a/ld/testsuite/ld-ifunc/ifunc-7b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-7b-i386.d @@ -3,7 +3,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-8-i386.d b/ld/testsuite/ld-ifunc/ifunc-8-i386.d index 0930c2cb039..67472fa190a 100644 --- a/ld/testsuite/ld-ifunc/ifunc-8-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-8-i386.d @@ -4,7 +4,7 @@ #as: --32 #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/ifunc-9-i386.d b/ld/testsuite/ld-ifunc/ifunc-9-i386.d index dba1ac1f16a..79007c2b4d7 100644 --- a/ld/testsuite/ld-ifunc/ifunc-9-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-9-i386.d @@ -3,7 +3,7 @@ #ld: -m elf_i386 --export-dynamic #readelf: -r --wide #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* diff --git a/ld/testsuite/ld-ifunc/pr17154-i386-now.d b/ld/testsuite/ld-ifunc/pr17154-i386-now.d index 74d653c4e2d..d977aab1440 100644 --- a/ld/testsuite/ld-ifunc/pr17154-i386-now.d +++ b/ld/testsuite/ld-ifunc/pr17154-i386-now.d @@ -3,7 +3,7 @@ #as: --32 #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* .*: +file format .* diff --git a/ld/testsuite/ld-ifunc/pr17154-i386.d b/ld/testsuite/ld-ifunc/pr17154-i386.d index 6fc8fbeb66b..4ca5b776372 100644 --- a/ld/testsuite/ld-ifunc/pr17154-i386.d +++ b/ld/testsuite/ld-ifunc/pr17154-i386.d @@ -3,7 +3,7 @@ #as: --32 #objdump: -dw #target: x86_64-*-* i?86-*-* -#notarget: *-*-lynxos *-*-nacl* *-*-nto* *-*-solaris2* +#notarget: *-*-lynxos *-*-nacl* *-*-nto* #... 0+180 <.*>: -- 2.30.2