[PATCH] x86: Properly merge -z ibt and -z shstk

[H.J. Lu]

On Tue, Oct 6, 2020 at 3:36 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> 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.

I am backporting it to 2.34 and 2.35 branches.

-- 
H.J.