diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-01-18 16:23:33 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-01-18 16:23:51 -0800 |
| commit | f7968f08b782bee249c66162736f1e82d7b39159 (patch) | |
| tree | 8059587be219a6329c249db151a44fd14886a9dc /ld | |
| parent | c5bdb022609634970dd981517d478e6cc332629c (diff) | |
| download | binutils-f7968f08b782bee249c66162736f1e82d7b39159.zip binutils-f7968f08b782bee249c66162736f1e82d7b39159.tar.gz binutils-f7968f08b782bee249c66162736f1e82d7b39159.tar.bz2 | |
x86: Update ld-elf/linkinfo1[ab].d for Solaris/x86
Update ld-elf/linkinfo1[ab].d to accommodate slightly different PLT/GOT
order/layout for Solaris/x86 targets.
* testsuite/ld-elf/linkinfo1a.d: Updated for slightly different
PLT/GOT order/layout for Solaris/x86 targets.
* testsuite/ld-elf/linkinfo1b.d: Likewise.
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/linkinfo1a.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/linkinfo1b.d | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 6b6886e..dc56d0c4b 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,11 @@ 2018-01-18 H.J. Lu <hongjiu.lu@intel.com> + * testsuite/ld-elf/linkinfo1a.d: Updated for slightly different + PLT/GOT order/layout for Solaris/x86 targets. + * testsuite/ld-elf/linkinfo1b.d: Likewise. + +2018-01-18 H.J. Lu <hongjiu.lu@intel.com> + PR ld/22728 * emultempl/solaris2.em (elf_solaris2_after_allocation): Fold into ... diff --git a/ld/testsuite/ld-elf/linkinfo1a.d b/ld/testsuite/ld-elf/linkinfo1a.d index 1aeaf00..63c4dc7 100644 --- a/ld/testsuite/ld-elf/linkinfo1a.d +++ b/ld/testsuite/ld-elf/linkinfo1a.d @@ -4,7 +4,7 @@ #target: x86_64-* i?86-* #... - \[[ 0-9]+\] \.rel[a]?\.plt[ \t]+REL[A]?[ \t][ \t0-9a-f]+AI[ \t]+[0-9a-f]+[ \t]+9[ \t]+[0-9a-f]+ + \[[ 0-9]+\] \.rel[a]?\.plt[ \t]+REL[A]?[ \t][ \t0-9a-f]+AI[ \t]+[0-9a-f]+[ \t]+(9|10)[ \t]+[0-9a-f]+ #... - \[[ 9\] \.got.plt[ \t]+PROGBITS?[ \t][ \t0-9a-f]+WA[ \t]+[0-9a-f]+[ \t]+0[ \t]+[0-9a-f]+ + \[[[ ]*(9|10)\] \.got(|.plt)[ \t]+PROGBITS?[ \t][ \t0-9a-f]+WA[ \t]+[0-9a-f]+[ \t]+0[ \t]+[0-9a-f]+ #pass diff --git a/ld/testsuite/ld-elf/linkinfo1b.d b/ld/testsuite/ld-elf/linkinfo1b.d index f8e3bd0..738850e 100644 --- a/ld/testsuite/ld-elf/linkinfo1b.d +++ b/ld/testsuite/ld-elf/linkinfo1b.d @@ -5,7 +5,7 @@ #target: x86_64-* i?86-* #... - \[[ 0-9]+\] \.rel[a]?\.plt[ \t]+REL[A]?[ \t][ \t0-9a-f]+AI[ \t]+[0-9a-f]+[ \t]+9[ \t]+[0-9a-f]+ + \[[ 0-9]+\] \.rel[a]?\.plt[ \t]+REL[A]?[ \t][ \t0-9a-f]+AI[ \t]+[0-9a-f]+[ \t]+(9|10)[ \t]+[0-9a-f]+ #... - \[[ 9\] \.got.plt[ \t]+PROGBITS?[ \t][ \t0-9a-f]+WA[ \t]+[0-9a-f]+[ \t]+0[ \t]+[0-9a-f]+ + \[[[ ]*(9|10)\] \.got(|.plt)[ \t]+PROGBITS?[ \t][ \t0-9a-f]+WA[ \t]+[0-9a-f]+[ \t]+0[ \t]+[0-9a-f]+ #pass |