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-06 15:38:34 -0700 |
commit | 574df58f5295ef2728526e6a73b5f429b05f2a8c (patch) | |
tree | 6b9e44b9368a64b1e19ae96174a1e39c40c034b1 /ld/testsuite/ld-i386 | |
parent | 981b570a53f525ee1776524297a55eef9415d50d (diff) | |
download | gdb-574df58f5295ef2728526e6a73b5f429b05f2a8c.zip gdb-574df58f5295ef2728526e6a73b5f429b05f2a8c.tar.gz gdb-574df58f5295ef2728526e6a73b5f429b05f2a8c.tar.bz2 |
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.
Diffstat (limited to 'ld/testsuite/ld-i386')
-rw-r--r-- | ld/testsuite/ld-i386/i386.exp | 3 | ||||
-rw-r--r-- | ld/testsuite/ld-i386/pr26711-1.d | 10 | ||||
-rw-r--r-- | ld/testsuite/ld-i386/pr26711-2.d | 10 | ||||
-rw-r--r-- | ld/testsuite/ld-i386/pr26711-3.d | 10 |
4 files changed, 33 insertions, 0 deletions
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index d0b8ed7..cd7b4de 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -472,6 +472,9 @@ run_dump_test "pr24322b" run_dump_test "align-branch-1" run_dump_test "pr26018" run_dump_test "pr26263" +run_dump_test "pr26711-1" +run_dump_test "pr26711-2" +run_dump_test "pr26711-3" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr26711-1.d b/ld/testsuite/ld-i386/pr26711-1.d new file mode 100644 index 0000000..24a8429 --- /dev/null +++ b/ld/testsuite/ld-i386/pr26711-1.d @@ -0,0 +1,10 @@ +#source: ../ld-x86-64/pr26711.s +#source: ../ld-x86-64/start.s +#as: --32 -mx86-used-note=no +#ld: -m elf_i386 -z ibt +#readelf: -n + +Displaying notes found in: .note.gnu.property +[ ]+Owner[ ]+Data size[ ]+Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 feature: IBT diff --git a/ld/testsuite/ld-i386/pr26711-2.d b/ld/testsuite/ld-i386/pr26711-2.d new file mode 100644 index 0000000..e92559f --- /dev/null +++ b/ld/testsuite/ld-i386/pr26711-2.d @@ -0,0 +1,10 @@ +#source: ../ld-x86-64/pr26711.s +#source: ../ld-x86-64/start.s +#as: --32 -mx86-used-note=no +#ld: -m elf_i386 -z shstk +#readelf: -n + +Displaying notes found in: .note.gnu.property +[ ]+Owner[ ]+Data size[ ]+Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 feature: SHSTK diff --git a/ld/testsuite/ld-i386/pr26711-3.d b/ld/testsuite/ld-i386/pr26711-3.d new file mode 100644 index 0000000..df9bfced --- /dev/null +++ b/ld/testsuite/ld-i386/pr26711-3.d @@ -0,0 +1,10 @@ +#source: ../ld-x86-64/pr26711.s +#source: ../ld-x86-64/start.s +#as: --32 -mx86-used-note=no +#ld: -m elf_i386 -z ibt -z shstk +#readelf: -n + +Displaying notes found in: .note.gnu.property +[ ]+Owner[ ]+Data size[ ]+Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: x86 feature: IBT, SHSTK |