diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-10-06 15:38:23 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-10-07 06:55:12 -0700 |
| commit | 5c1bd3f52c69d00f56f9cb71737396c2651e508d (patch) | |
| tree | 8cece4234256ae9426e2017b820b9a5d74cbb146 /bfd/ChangeLog | |
| parent | 93b9bf1651a04cb5334435bbb535ff706cf28ffc (diff) | |
| download | binutils-gdb-5c1bd3f52c69d00f56f9cb71737396c2651e508d.tar.gz | |
x86: Properly merge -z ibt and -z shstk
Merge -z ibt and -z shstk only with GNU_PROPERTY_X86_FEATURE_1_AND, not
any GNU_PROPERTY_X86_UINT32_AND_XXX properties.
bfd/
PR ld/26711
* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Merge -z ibt
and -z shstk only with GNU_PROPERTY_X86_FEATURE_1_AND.
ld/
PR ld/26711
* testsuite/ld-i386/i386.exp: Run ld/26711 tests.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-i386/pr26711-1.d: Likewise.
* testsuite/ld-i386/pr26711-2.d: Likewise.
* testsuite/ld-i386/pr26711-3.d: Likewise.
* testsuite/ld-x86-64/pr26711-1-x32.d: Likewise.
* testsuite/ld-x86-64/pr26711-1.d: Likewise.
* testsuite/ld-x86-64/pr26711-2-x32.d: Likewise.
* testsuite/ld-x86-64/pr26711-2.d: Likewise.
* testsuite/ld-x86-64/pr26711-3-x32.d: Likewise.
* testsuite/ld-x86-64/pr26711-3.d: Likewise.
* testsuite/ld-x86-64/pr26711.s: Likewise.
(cherry picked from commit 574df58f5295ef2728526e6a73b5f429b05f2a8c)
Diffstat (limited to 'bfd/ChangeLog')
| -rw-r--r-- | bfd/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d533d05793e..ad6f9346c05 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-10-07 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/26711 + * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Merge -z ibt + and -z shstk only with GNU_PROPERTY_X86_FEATURE_1_AND. + 2020-09-10 Alan Modra <amodra@gmail.com> Apply from master |