git.ipfire.org Git - thirdparty/binutils-gdb.git/commit

author	H.J. Lu <hjl.tools@gmail.com>
	Tue, 6 Oct 2020 22:38:23 +0000 (15:38 -0700)
committer	H.J. Lu <hjl.tools@gmail.com>
	Wed, 7 Oct 2020 13:55:12 +0000 (06:55 -0700)
commit	5c1bd3f52c69d00f56f9cb71737396c2651e508d
tree	8cece4234256ae9426e2017b820b9a5d74cbb146	tree \| snapshot
parent	93b9bf1651a04cb5334435bbb535ff706cf28ffc	commit \| diff

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)

bfd/ChangeLog		diff \| blob \| blame \| history
bfd/elfxx-x86.c		diff \| blob \| blame \| history
ld/ChangeLog		diff \| blob \| blame \| history
ld/testsuite/ld-i386/i386.exp		diff \| blob \| blame \| history
ld/testsuite/ld-i386/pr26711-1.d	[new file with mode: 0644]	blob
ld/testsuite/ld-i386/pr26711-2.d	[new file with mode: 0644]	blob
ld/testsuite/ld-i386/pr26711-3.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711-1-x32.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711-1.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711-2-x32.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711-2.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711-3-x32.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711-3.d	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/pr26711.s	[new file with mode: 0644]	blob
ld/testsuite/ld-x86-64/x86-64.exp		diff \| blob \| blame \| history