From f7968f08b782bee249c66162736f1e82d7b39159 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <hjl.tools@gmail.com> Date: Thu, 18 Jan 2018 16:23:33 -0800 Subject: [PATCH] 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. --- ld/ChangeLog | 6 ++++++ ld/testsuite/ld-elf/linkinfo1a.d | 4 ++-- ld/testsuite/ld-elf/linkinfo1b.d | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 6b6886e871b..dc56d0c4bfe 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +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 diff --git a/ld/testsuite/ld-elf/linkinfo1a.d b/ld/testsuite/ld-elf/linkinfo1a.d index 1aeaf00f86a..63c4dc796a4 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 f8e3bd033ae..738850e9e3e 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