summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2018-11-12 09:34:57 -0800
committerH.J. Lu <hjl.tools@gmail.com>2018-11-12 09:34:57 -0800
commit872bbbc0dafc8392c275eba860ea36e713d16141 (patch)
treec91e738d057935ac4ca6368536eaa8ca25b5f402
parentgold: Ignore gnu.build.attributes section (diff)
parenti386: Accept both .plt.got and .plt.sec sections (diff)
downloadbinutils-gdb-users/hjl/linux/master.tar.gz
binutils-gdb-users/hjl/linux/master.tar.bz2
binutils-gdb-users/hjl/linux/master.tar.xz
Merge remote-tracking branch 'origin/master' into users/hjl/linux/masterusers/hjl/linux/master
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/testsuite/ld-i386/plt-main-ibt.dd2
2 files changed, 6 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 510e333..803662f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
12018-11-12 H.J. Lu <hongjiu.lu@intel.com>
2
3 * testsuite/ld-i386/plt-main-ibt.dd: Accept both .plt.got and
4 .plt.sec sections.
5
12018-11-12 Nick Clifton <nickc@redhat.com> 62018-11-12 Nick Clifton <nickc@redhat.com>
2 7
3 PR 10865 8 PR 10865
diff --git a/ld/testsuite/ld-i386/plt-main-ibt.dd b/ld/testsuite/ld-i386/plt-main-ibt.dd
index 18240a2..6a1d4bf 100644
--- a/ld/testsuite/ld-i386/plt-main-ibt.dd
+++ b/ld/testsuite/ld-i386/plt-main-ibt.dd
@@ -1,5 +1,5 @@
1#... 1#...
2Disassembly of section .plt.got: 2Disassembly of section .plt.(sec|got):
3 3
4[a-f0-9]+ <[_a-z]+@plt>: 4[a-f0-9]+ <[_a-z]+@plt>:
5[ ]*[a-f0-9]+: f3 0f 1e fb endbr32 5[ ]*[a-f0-9]+: f3 0f 1e fb endbr32