diff options
162 files changed, 471 insertions, 237 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 24a81c8..a12ba7d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-10-30 H.J. Lu <hongjiu.lu@intel.com> + + PR gas/26703 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Generate + GNU_PROPERTY_X86_ISA_1_BASELINE for -z x86-64-baseline. + 2020-10-29 Nick Clifton <nickc@redhat.com> PR 26809 diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 4a0360f..97de9f2 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -2561,6 +2561,9 @@ _bfd_x86_elf_link_setup_gnu_properties case 0: isa_level = 0; break; + case 1: + isa_level = GNU_PROPERTY_X86_ISA_1_BASELINE; + break; case 2: isa_level = GNU_PROPERTY_X86_ISA_1_V2; break; diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 3ff3316..4ae34af 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,30 @@ +2020-10-30 H.J. Lu <hongjiu.lu@intel.com> + + PR gas/26703 + * readelf.c (decode_x86_isa): Handle + * GNU_PROPERTY_X86_ISA_1_BASELINE. + * testsuite/binutils-all/i386/empty.d: Updated. + * testsuite/binutils-all/i386/ibt.d: Likewise. + * testsuite/binutils-all/i386/pr21231a.d: Likewise. + * testsuite/binutils-all/i386/pr21231b.d: Likewise. + * testsuite/binutils-all/i386/shstk.d: Likewise. + * testsuite/binutils-all/x86-64/empty-x32.d: Likewise. + * testsuite/binutils-all/x86-64/empty.d: Likewise. + * testsuite/binutils-all/x86-64/ibt-x32.d: Likewise. + * testsuite/binutils-all/x86-64/ibt.d: Likewise. + * testsuite/binutils-all/x86-64/pr21231a.d: Likewise. + * testsuite/binutils-all/x86-64/pr21231b.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494a-x32.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494a.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494c-x32.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494c.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494d-x32.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494d.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494e-x32.d: Likewise. + * testsuite/binutils-all/x86-64/pr23494e.d: Likewise. + * testsuite/binutils-all/x86-64/shstk-x32.d: Likewise. + * testsuite/binutils-all/x86-64/shstk.d: Likewise. + 2020-10-29 H.J. Lu <hongjiu.lu@intel.com> PR binutils/26808 diff --git a/binutils/readelf.c b/binutils/readelf.c index 03cfc97..6373852 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -18609,12 +18609,6 @@ decode_x86_compat_2_isa (unsigned int bitmask) static void decode_x86_isa (unsigned int bitmask) { - if (!bitmask) - { - printf (_("x86-64-baseline")); - return; - } - while (bitmask) { unsigned int bit = bitmask & (- bitmask); @@ -18622,6 +18616,9 @@ decode_x86_isa (unsigned int bitmask) bitmask &= ~ bit; switch (bit) { + case GNU_PROPERTY_X86_ISA_1_BASELINE: + printf ("x86-64-baseline"); + break; case GNU_PROPERTY_X86_ISA_1_V2: printf ("x86-64-v2"); break; diff --git a/binutils/testsuite/binutils-all/i386/empty.d b/binutils/testsuite/binutils-all/i386/empty.d index ec54389..682a086 100644 --- a/binutils/testsuite/binutils-all/i386/empty.d +++ b/binutils/testsuite/binutils-all/i386/empty.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: <None> GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/i386/ibt.d b/binutils/testsuite/binutils-all/i386/ibt.d index 7723d70..0357ae3 100644 --- a/binutils/testsuite/binutils-all/i386/ibt.d +++ b/binutils/testsuite/binutils-all/i386/ibt.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/i386/pr21231a.d b/binutils/testsuite/binutils-all/i386/pr21231a.d index 657784d..ca2c088 100644 --- a/binutils/testsuite/binutils-all/i386/pr21231a.d +++ b/binutils/testsuite/binutils-all/i386/pr21231a.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x00000008 NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/i386/pr21231b.d b/binutils/testsuite/binutils-all/i386/pr21231b.d index 77ef4e6..0c21997 100644 --- a/binutils/testsuite/binutils-all/i386/pr21231b.d +++ b/binutils/testsuite/binutils-all/i386/pr21231b.d @@ -8,8 +8,8 @@ Displaying notes found in: .note.gnu.property GNU 0x0000002c NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 no copy on protected - x86 ISA used: x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 8>, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000>, <unknown: 10000>, <unknown: 20000>, <unknown: 40000>, <unknown: 80000>, <unknown: 100000>, <unknown: 200000>, <unknown: 400000>, <unknown: 800000>, <unknown: 1000000>, <unknown: 2000000>, <unknown: 4000000>, <unknown: 8000000>, <unknown: 10000000>, <unknown: 20000000>, <unknown: 40000000> - x86 ISA needed: x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 8>, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000> + x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000>, <unknown: 10000>, <unknown: 20000>, <unknown: 40000>, <unknown: 80000>, <unknown: 100000>, <unknown: 200000>, <unknown: 400000>, <unknown: 800000>, <unknown: 1000000>, <unknown: 2000000>, <unknown: 4000000>, <unknown: 8000000>, <unknown: 10000000>, <unknown: 20000000>, <unknown: 40000000> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000> GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/i386/shstk.d b/binutils/testsuite/binutils-all/i386/shstk.d index 8d2e9f2..c91864f 100644 --- a/binutils/testsuite/binutils-all/i386/shstk.d +++ b/binutils/testsuite/binutils-all/i386/shstk.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/empty-x32.d b/binutils/testsuite/binutils-all/x86-64/empty-x32.d index 820996b..bf96a4c 100644 --- a/binutils/testsuite/binutils-all/x86-64/empty-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/empty-x32.d @@ -9,5 +9,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: <None> GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/empty.d b/binutils/testsuite/binutils-all/x86-64/empty.d index 0f9d8ce..035e60f 100644 --- a/binutils/testsuite/binutils-all/x86-64/empty.d +++ b/binutils/testsuite/binutils-all/x86-64/empty.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: <None> GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/ibt-x32.d b/binutils/testsuite/binutils-all/x86-64/ibt-x32.d index 490938a..51760f4 100644 --- a/binutils/testsuite/binutils-all/x86-64/ibt-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/ibt-x32.d @@ -9,5 +9,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/ibt.d b/binutils/testsuite/binutils-all/x86-64/ibt.d index 500ab54..57daed9 100644 --- a/binutils/testsuite/binutils-all/x86-64/ibt.d +++ b/binutils/testsuite/binutils-all/x86-64/ibt.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/pr21231a.d b/binutils/testsuite/binutils-all/x86-64/pr21231a.d index f643a78..f173396 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr21231a.d +++ b/binutils/testsuite/binutils-all/x86-64/pr21231a.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x00000008 NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/pr21231b.d b/binutils/testsuite/binutils-all/x86-64/pr21231b.d index e9a185f..ab79335 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr21231b.d +++ b/binutils/testsuite/binutils-all/x86-64/pr21231b.d @@ -8,8 +8,8 @@ Displaying notes found in: .note.gnu.property GNU 0x00000038 NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 no copy on protected - x86 ISA used: x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 8>, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000>, <unknown: 10000>, <unknown: 20000>, <unknown: 40000>, <unknown: 80000>, <unknown: 100000>, <unknown: 200000>, <unknown: 400000>, <unknown: 800000>, <unknown: 1000000>, <unknown: 2000000>, <unknown: 4000000>, <unknown: 8000000>, <unknown: 10000000>, <unknown: 20000000>, <unknown: 40000000> - x86 ISA needed: x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 8>, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000> + x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000>, <unknown: 10000>, <unknown: 20000>, <unknown: 40000>, <unknown: 80000>, <unknown: 100000>, <unknown: 200000>, <unknown: 400000>, <unknown: 800000>, <unknown: 1000000>, <unknown: 2000000>, <unknown: 4000000>, <unknown: 8000000>, <unknown: 10000000>, <unknown: 20000000>, <unknown: 40000000> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v3, x86-64-v4, <unknown: 10>, <unknown: 20>, <unknown: 40>, <unknown: 80>, <unknown: 100>, <unknown: 200>, <unknown: 400>, <unknown: 800>, <unknown: 1000>, <unknown: 2000>, <unknown: 4000>, <unknown: 8000> GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d index 018809c..76fcff6 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494a-x32.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 ISA needed: <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494a.d b/binutils/testsuite/binutils-all/x86-64/pr23494a.d index dab7d18..6807adf 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494a.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494a.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 ISA needed: <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d index 05f3263..10457a6 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494c-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v3, <unknown: 8> + Properties: x86 ISA used: x86-64-v2, x86-64-v4 diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494c.d b/binutils/testsuite/binutils-all/x86-64/pr23494c.d index 6b0d4f3..97e2bf7 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494c.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494c.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v3, <unknown: 8> + Properties: x86 ISA used: x86-64-v2, x86-64-v4 diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d index 385cbdb..252ee5d 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494d-x32.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 ISA needed: <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494d.d b/binutils/testsuite/binutils-all/x86-64/pr23494d.d index 45e9a39..25ba072 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494d.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494d.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 ISA needed: <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d b/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d index 968262a..c0a28cd 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494e-x32.d @@ -10,4 +10,4 @@ Displaying notes found in: .note.gnu.property Properties: stack size: 0xffffffff x86 ISA needed: <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/binutils/testsuite/binutils-all/x86-64/pr23494e.d b/binutils/testsuite/binutils-all/x86-64/pr23494e.d index bbd9e21..11d3f9e 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr23494e.d +++ b/binutils/testsuite/binutils-all/x86-64/pr23494e.d @@ -10,4 +10,4 @@ Displaying notes found in: .note.gnu.property Properties: stack size: 0xffffffff x86 ISA needed: <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/binutils/testsuite/binutils-all/x86-64/shstk-x32.d b/binutils/testsuite/binutils-all/x86-64/shstk-x32.d index b798d88..5b76f93 100644 --- a/binutils/testsuite/binutils-all/x86-64/shstk-x32.d +++ b/binutils/testsuite/binutils-all/x86-64/shstk-x32.d @@ -9,5 +9,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/binutils/testsuite/binutils-all/x86-64/shstk.d b/binutils/testsuite/binutils-all/x86-64/shstk.d index 7523e45..52dae09 100644 --- a/binutils/testsuite/binutils-all/x86-64/shstk.d +++ b/binutils/testsuite/binutils-all/x86-64/shstk.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: x86 feature used: x86 diff --git a/gas/ChangeLog b/gas/ChangeLog index a52eb2b..b965dbb 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,25 @@ +2020-10-30 H.J. Lu <hongjiu.lu@intel.com> + + PR gas/26703 + * config/tc-i386.c (output_insn): Update for + GNU_PROPERTY_X86_ISA_1_BASELINE. + * testsuite/gas/i386/property-1.d: Updated. + * testsuite/gas/i386/property-2.d: Likewise. + * testsuite/gas/i386/property-3.d: Likewise. + * testsuite/gas/i386/property-4.d: Likewise. + * testsuite/gas/i386/property-5.d: Likewise. + * testsuite/gas/i386/property-6.d: Likewise. + * testsuite/gas/i386/property-11.d: Likewise. + * testsuite/gas/i386/property-12.d: Likewise. + * testsuite/gas/i386/x86-64-property-1.d: Likewise. + * testsuite/gas/i386/x86-64-property-2.d: Likewise. + * testsuite/gas/i386/x86-64-property-3.d: Likewise. + * testsuite/gas/i386/x86-64-property-4.d: Likewise. + * testsuite/gas/i386/x86-64-property-5.d: Likewise. + * testsuite/gas/i386/x86-64-property-6.d: Likewise. + * testsuite/gas/i386/x86-64-property-11.d: Likewise. + * testsuite/gas/i386/x86-64-property-12.d: Likewise. + 2020-10-26 H.J. Lu <hongjiu.lu@intel.com> PR gas/26778 diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index daeef4c..ea8bd1f 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -9199,48 +9199,6 @@ output_insn (void) || i.tm.cpu_flags.bitfield.cpuamx_tile) x86_feature_2_used |= GNU_PROPERTY_X86_FEATURE_2_TMM; - if (i.tm.cpu_flags.bitfield.cpusse3 - || i.tm.cpu_flags.bitfield.cpussse3 - || i.tm.cpu_flags.bitfield.cpusse4_1 - || i.tm.cpu_flags.bitfield.cpusse4_2 - || i.tm.cpu_flags.bitfield.cpucx16 - || i.tm.cpu_flags.bitfield.cpupopcnt - /* LAHF-SAHF insns in 64-bit mode. */ - || (flag_code == CODE_64BIT - && (i.tm.base_opcode | 1) == 0x9f)) - x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_V2; - if (i.tm.cpu_flags.bitfield.cpuavx - || i.tm.cpu_flags.bitfield.cpuavx2 - /* Any VEX encoded insns execpt for CpuAVX512F, CpuAVX512BW, - CpuAVX512DQ, LPW, TBM and AMX. */ - || (i.tm.opcode_modifier.vex - && !i.tm.cpu_flags.bitfield.cpuavx512f - && !i.tm.cpu_flags.bitfield.cpuavx512bw - && !i.tm.cpu_flags.bitfield.cpuavx512dq - && !i.tm.cpu_flags.bitfield.cpulwp - && !i.tm.cpu_flags.bitfield.cputbm - && !(x86_feature_2_used & GNU_PROPERTY_X86_FEATURE_2_TMM)) - || i.tm.cpu_flags.bitfield.cpuf16c - || i.tm.cpu_flags.bitfield.cpufma - || i.tm.cpu_flags.bitfield.cpulzcnt - || i.tm.cpu_flags.bitfield.cpumovbe - || i.tm.cpu_flags.bitfield.cpuxsave - || i.tm.cpu_flags.bitfield.cpuxsavec - || i.tm.cpu_flags.bitfield.cpuxsaveopt - || i.tm.cpu_flags.bitfield.cpuxsaves) - x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_V3; - if (i.tm.cpu_flags.bitfield.cpuavx512f - || i.tm.cpu_flags.bitfield.cpuavx512bw - || i.tm.cpu_flags.bitfield.cpuavx512dq - || i.tm.cpu_flags.bitfield.cpuavx512vl - /* Any EVEX encoded insns except for AVX512ER, AVX512PF and - VNNIW. */ - || (i.tm.opcode_modifier.evex - && !i.tm.cpu_flags.bitfield.cpuavx512er - && !i.tm.cpu_flags.bitfield.cpuavx512pf - && !i.tm.cpu_flags.bitfield.cpuavx512_4vnniw)) - x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_V4; - if (i.tm.cpu_flags.bitfield.cpu8087 || i.tm.cpu_flags.bitfield.cpu287 || i.tm.cpu_flags.bitfield.cpu387 @@ -9278,6 +9236,56 @@ output_insn (void) x86_feature_2_used |= GNU_PROPERTY_X86_FEATURE_2_XSAVEOPT; if (i.tm.cpu_flags.bitfield.cpuxsavec) x86_feature_2_used |= GNU_PROPERTY_X86_FEATURE_2_XSAVEC; + + if (x86_feature_2_used + || i.tm.cpu_flags.bitfield.cpucmov + || i.tm.cpu_flags.bitfield.cpusyscall + || (i.tm.base_opcode == 0xfc7 + && i.tm.opcode_modifier.opcodeprefix == 0 + && i.tm.extension_opcode == 1) /* cmpxchg8b */) + x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_BASELINE; + if (i.tm.cpu_flags.bitfield.cpusse3 + || i.tm.cpu_flags.bitfield.cpussse3 + || i.tm.cpu_flags.bitfield.cpusse4_1 + || i.tm.cpu_flags.bitfield.cpusse4_2 + || i.tm.cpu_flags.bitfield.cpucx16 + || i.tm.cpu_flags.bitfield.cpupopcnt + /* LAHF-SAHF insns in 64-bit mode. */ + || (flag_code == CODE_64BIT + && (i.tm.base_opcode | 1) == 0x9f)) + x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_V2; + if (i.tm.cpu_flags.bitfield.cpuavx + || i.tm.cpu_flags.bitfield.cpuavx2 + /* Any VEX encoded insns execpt for CpuAVX512F, CpuAVX512BW, + CpuAVX512DQ, LPW, TBM and AMX. */ + || (i.tm.opcode_modifier.vex + && !i.tm.cpu_flags.bitfield.cpuavx512f + && !i.tm.cpu_flags.bitfield.cpuavx512bw + && !i.tm.cpu_flags.bitfield.cpuavx512dq + && !i.tm.cpu_flags.bitfield.cpulwp + && !i.tm.cpu_flags.bitfield.cputbm + && !(x86_feature_2_used & GNU_PROPERTY_X86_FEATURE_2_TMM)) + || i.tm.cpu_flags.bitfield.cpuf16c + || i.tm.cpu_flags.bitfield.cpufma + || i.tm.cpu_flags.bitfield.cpulzcnt + || i.tm.cpu_flags.bitfield.cpumovbe + || i.tm.cpu_flags.bitfield.cpuxsaves + || (x86_feature_2_used + & (GNU_PROPERTY_X86_FEATURE_2_XSAVE + | GNU_PROPERTY_X86_FEATURE_2_XSAVEOPT + | GNU_PROPERTY_X86_FEATURE_2_XSAVEC)) != 0) + x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_V3; + if (i.tm.cpu_flags.bitfield.cpuavx512f + || i.tm.cpu_flags.bitfield.cpuavx512bw + || i.tm.cpu_flags.bitfield.cpuavx512dq + || i.tm.cpu_flags.bitfield.cpuavx512vl + /* Any EVEX encoded insns except for AVX512ER, AVX512PF and + VNNIW. */ + || (i.tm.opcode_modifier.evex + && !i.tm.cpu_flags.bitfield.cpuavx512er + && !i.tm.cpu_flags.bitfield.cpuavx512pf + && !i.tm.cpu_flags.bitfield.cpuavx512_4vnniw)) + x86_isa_1_used |= GNU_PROPERTY_X86_ISA_1_V4; } #endif diff --git a/gas/testsuite/gas/i386/property-1.d b/gas/testsuite/gas/i386/property-1.d index d40bd52..7c0107d 100644 --- a/gas/testsuite/gas/i386/property-1.d +++ b/gas/testsuite/gas/i386/property-1.d @@ -5,4 +5,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: diff --git a/gas/testsuite/gas/i386/property-11.d b/gas/testsuite/gas/i386/property-11.d index b3a4591..db48868 100644 --- a/gas/testsuite/gas/i386/property-11.d +++ b/gas/testsuite/gas/i386/property-11.d @@ -5,5 +5,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v3 + Properties: x86 ISA used: x86-64-baseline, x86-64-v3 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/property-12.d b/gas/testsuite/gas/i386/property-12.d index fb9fa5c..1a5c297 100644 --- a/gas/testsuite/gas/i386/property-12.d +++ b/gas/testsuite/gas/i386/property-12.d @@ -5,5 +5,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v4 + Properties: x86 ISA used: x86-64-baseline, x86-64-v4 x86 feature used: x86, XMM, MASK diff --git a/gas/testsuite/gas/i386/property-3.d b/gas/testsuite/gas/i386/property-3.d index b6aba35..d58e7e0 100644 --- a/gas/testsuite/gas/i386/property-3.d +++ b/gas/testsuite/gas/i386/property-3.d @@ -5,5 +5,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v2 + Properties: x86 ISA used: x86-64-baseline, x86-64-v2 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/property-4.d b/gas/testsuite/gas/i386/property-4.d index c23625c..46450c8 100644 --- a/gas/testsuite/gas/i386/property-4.d +++ b/gas/testsuite/gas/i386/property-4.d @@ -5,5 +5,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v3 + Properties: x86 ISA used: x86-64-baseline, x86-64-v3 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/property-5.d b/gas/testsuite/gas/i386/property-5.d index ba7679d..c04a6b8 100644 --- a/gas/testsuite/gas/i386/property-5.d +++ b/gas/testsuite/gas/i386/property-5.d @@ -5,5 +5,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v4 + Properties: x86 ISA used: x86-64-baseline, x86-64-v4 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/property-6.d b/gas/testsuite/gas/i386/property-6.d index d1a4ed6..a7dab96 100644 --- a/gas/testsuite/gas/i386/property-6.d +++ b/gas/testsuite/gas/i386/property-6.d @@ -5,5 +5,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v4 + Properties: x86 ISA used: x86-64-baseline, x86-64-v4 x86 feature used: x86, MASK diff --git a/gas/testsuite/gas/i386/x86-64-property-1.d b/gas/testsuite/gas/i386/x86-64-property-1.d index 931c7d2..52db167 100644 --- a/gas/testsuite/gas/i386/x86-64-property-1.d +++ b/gas/testsuite/gas/i386/x86-64-property-1.d @@ -6,4 +6,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: diff --git a/gas/testsuite/gas/i386/x86-64-property-11.d b/gas/testsuite/gas/i386/x86-64-property-11.d index d240229..d93e01b 100644 --- a/gas/testsuite/gas/i386/x86-64-property-11.d +++ b/gas/testsuite/gas/i386/x86-64-property-11.d @@ -6,5 +6,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v3 + Properties: x86 ISA used: x86-64-baseline, x86-64-v3 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/x86-64-property-12.d b/gas/testsuite/gas/i386/x86-64-property-12.d index ff12b65..1683204 100644 --- a/gas/testsuite/gas/i386/x86-64-property-12.d +++ b/gas/testsuite/gas/i386/x86-64-property-12.d @@ -6,5 +6,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v4 + Properties: x86 ISA used: x86-64-baseline, x86-64-v4 x86 feature used: x86, XMM, MASK diff --git a/gas/testsuite/gas/i386/x86-64-property-3.d b/gas/testsuite/gas/i386/x86-64-property-3.d index bc1e483..d248505 100644 --- a/gas/testsuite/gas/i386/x86-64-property-3.d +++ b/gas/testsuite/gas/i386/x86-64-property-3.d @@ -6,5 +6,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v2 + Properties: x86 ISA used: x86-64-baseline, x86-64-v2 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/x86-64-property-4.d b/gas/testsuite/gas/i386/x86-64-property-4.d index fd4bee0..be1d485 100644 --- a/gas/testsuite/gas/i386/x86-64-property-4.d +++ b/gas/testsuite/gas/i386/x86-64-property-4.d @@ -6,5 +6,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v3 + Properties: x86 ISA used: x86-64-baseline, x86-64-v3 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/x86-64-property-5.d b/gas/testsuite/gas/i386/x86-64-property-5.d index 73e24b9..a1385c2 100644 --- a/gas/testsuite/gas/i386/x86-64-property-5.d +++ b/gas/testsuite/gas/i386/x86-64-property-5.d @@ -6,5 +6,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v4 + Properties: x86 ISA used: x86-64-baseline, x86-64-v4 x86 feature used: x86, XMM diff --git a/gas/testsuite/gas/i386/x86-64-property-6.d b/gas/testsuite/gas/i386/x86-64-property-6.d index 330e6f6..5cdb873 100644 --- a/gas/testsuite/gas/i386/x86-64-property-6.d +++ b/gas/testsuite/gas/i386/x86-64-property-6.d @@ -6,5 +6,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-v4 + Properties: x86 ISA used: x86-64-baseline, x86-64-v4 x86 feature used: x86, MASK diff --git a/include/ChangeLog b/include/ChangeLog index 2267cda..afa52a3 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,11 @@ +2020-10-30 H.J. Lu <hongjiu.lu@intel.com> + + PR gas/26703 + * elf/common.h (GNU_PROPERTY_X86_ISA_1_BASELINE): New. + (GNU_PROPERTY_X86_ISA_1_V2): Uppdated. + (GNU_PROPERTY_X86_ISA_1_V3): Likewise. + (GNU_PROPERTY_X86_ISA_1_V4): Likewise. + 2020-10-26 Cooper Qu <cooper.qu@linux.alibaba.com> * opcode/csky.h (CSKY_VERSION_V1): New, currently used. diff --git a/include/elf/common.h b/include/elf/common.h index b3c30e0..fc672de 100644 --- a/include/elf/common.h +++ b/include/elf/common.h @@ -814,18 +814,19 @@ #define GNU_PROPERTY_X86_FEATURE_2_USED \ (GNU_PROPERTY_X86_UINT32_OR_AND_LO + 1) -/* Baseline: CMOV (cmov) CX8 (cmpxchg8b) FPU (fld), FXSR (fxsave), - SCE (syscall), MMX, SSE and SSE2. */ - -/* GNU_PROPERTY_X86_ISA_1_V2: Baseline, CMPXCHG16B (cmpxchg16b), - LAHF-SAHF (lahf), POPCNT (popcnt), SSE3, SSSE3, SSE4.1 and SSE4.2. */ -#define GNU_PROPERTY_X86_ISA_1_V2 (1U << 0) +/* GNU_PROPERTY_X86_ISA_1_BASELINE: CMOV, CX8 (cmpxchg8b), FPU (fld), + MMX, OSFXSR (fxsave), SCE (syscall), SSE and SSE2. */ +#define GNU_PROPERTY_X86_ISA_1_BASELINE (1U << 0) +/* GNU_PROPERTY_X86_ISA_1_V2: GNU_PROPERTY_X86_ISA_1_BASELINE, + CMPXCHG16B (cmpxchg16b), LAHF-SAHF (lahf), POPCNT (popcnt), SSE3, + SSSE3, SSE4.1 and SSE4.2. */ +#define GNU_PROPERTY_X86_ISA_1_V2 (1U << 1) /* GNU_PROPERTY_X86_ISA_1_V3: GNU_PROPERTY_X86_ISA_1_V2, AVX, AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE. */ -#define GNU_PROPERTY_X86_ISA_1_V3 (1U << 1) +#define GNU_PROPERTY_X86_ISA_1_V3 (1U << 2) /* GNU_PROPERTY_X86_ISA_1_V4: GNU_PROPERTY_X86_ISA_1_V3, AVX512F, AVX512BW, AVX512CD, AVX512DQ and AVX512VL. */ -#define GNU_PROPERTY_X86_ISA_1_V4 (1U << 2) +#define GNU_PROPERTY_X86_ISA_1_V4 (1U << 3) #define GNU_PROPERTY_X86_FEATURE_1_IBT (1U << 0) #define GNU_PROPERTY_X86_FEATURE_1_SHSTK (1U << 1) diff --git a/ld/ChangeLog b/ld/ChangeLog index 898c434..3f39eb4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,132 @@ +2020-10-30 H.J. Lu <hongjiu.lu@intel.com> + + PR gas/26703 + * NEWS: Mention -z x86-64-baseline. + * ld.texi: Document -z x86-64-baseline. + * emulparams/x86-64-level.sh: Handle -z x86-64-baseline. + * testsuite/ld-elf/x86-feature-1a.rd: Update. + * testsuite/ld-elf/x86-feature-1b.rd: Likewise. + * testsuite/ld-elf/x86-feature-1c.rd: Likewise. + * testsuite/ld-elf/x86-feature-1d.rd: Likewise. + * testsuite/ld-elf/x86-feature-1e.rd: Likewise. + * testsuite/ld-i386/pr23372c.d: Likewise. + * testsuite/ld-i386/pr23486c.d: Likewise. + * testsuite/ld-i386/pr23486d.d: Likewise. + * testsuite/ld-i386/pr24322a.d: Likewise. + * testsuite/ld-i386/pr24322b.d: Likewise. + * testsuite/ld-i386/property-1a.r: Likewise. + * testsuite/ld-i386/property-2a.r: Likewise. + * testsuite/ld-i386/property-3.r: Likewise. + * testsuite/ld-i386/property-3a.r: Likewise. + * testsuite/ld-i386/property-4.r: Likewise. + * testsuite/ld-i386/property-4a.r: Likewise. + * testsuite/ld-i386/property-5.r: Likewise. + * testsuite/ld-i386/property-5a.r: Likewise. + * testsuite/ld-i386/property-7a.r: Likewise. + * testsuite/ld-i386/property-x86-3.d: Likewise. + * testsuite/ld-i386/property-x86-4a.d: Likewise. + * testsuite/ld-i386/property-x86-5.d: Likewise. + * testsuite/ld-i386/property-x86-cet1.d: Likewise. + * testsuite/ld-i386/property-x86-cet2a.d: Likewise. + * testsuite/ld-i386/property-x86-cet5a.d: Likewise. + * testsuite/ld-i386/property-x86-cet5b.d: Likewise. + * testsuite/ld-i386/property-x86-ibt1a.d: Likewise. + * testsuite/ld-i386/property-x86-ibt1b.d: Likewise. + * testsuite/ld-i386/property-x86-ibt2.d: Likewise. + * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. + * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. + * testsuite/ld-i386/property-x86-ibt4.d: Likewise. + * testsuite/ld-i386/property-x86-ibt5.d: Likewise. + * testsuite/ld-i386/property-x86-isa1.d: Likewise. + * testsuite/ld-i386/property-x86-isa2.d: Likewise. + * testsuite/ld-i386/property-x86-isa3.d: Likewise. + * testsuite/ld-i386/property-x86-shstk1a.d: Likewise. + * testsuite/ld-i386/property-x86-shstk1b.d: Likewise. + * testsuite/ld-i386/property-x86-shstk2.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. + * testsuite/ld-i386/property-x86-shstk4.d: Likewise. + * testsuite/ld-i386/property-x86-shstk5.d: Likewise. + * testsuite/ld-x86-64/pr23372c-x32.d: Likewise. + * testsuite/ld-x86-64/pr23372c.d: Likewise. + * testsuite/ld-x86-64/pr23486c-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486c.d: Likewise. + * testsuite/ld-x86-64/pr23486d-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486d.d: Likewise. + * testsuite/ld-x86-64/pr24322a-x32.d: Likewise. + * testsuite/ld-x86-64/pr24322a.d: Likewise. + * testsuite/ld-x86-64/pr24322b-x32.d: Likewise. + * testsuite/ld-x86-64/pr24322b.d: Likewise. + * testsuite/ld-x86-64/pr24458a-x32.d: Likewise. + * testsuite/ld-x86-64/pr24458a.d: Likewise. + * testsuite/ld-x86-64/pr24458b-x32.d: Likewise. + * testsuite/ld-x86-64/pr24458b.d: Likewise. + * testsuite/ld-x86-64/pr24458c-x32.d: Likewise. + * testsuite/ld-x86-64/pr24458c.d: Likewise. + * testsuite/ld-x86-64/property-1a.r: Likewise. + * testsuite/ld-x86-64/property-2a.r: Likewise. + * testsuite/ld-x86-64/property-3.r: Likewise. + * testsuite/ld-x86-64/property-3a.r: Likewise. + * testsuite/ld-x86-64/property-4.r: Likewise. + * testsuite/ld-x86-64/property-4a.r: Likewise. + * testsuite/ld-x86-64/property-5.r: Likewise. + * testsuite/ld-x86-64/property-5a.r: Likewise. + * testsuite/ld-x86-64/property-7a.r: Likewise. + * testsuite/ld-x86-64/property-x86-3-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-3.d: Likewise. + * testsuite/ld-x86-64/property-x86-4a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-4a.d: Likewise. + * testsuite/ld-x86-64/property-x86-5-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-5.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet1-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet1.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet2a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet2a.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet5a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet5a.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet5b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-cet5b.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt1a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt1a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt1b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt1b.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt2-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt2.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt4-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt4.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt5-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa1-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa1.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa2-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa2.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa3-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa3.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt5.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk1a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk1a.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk1b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk1b.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk2-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk2.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk4-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk4.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk5-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk5.d: Likewise. + * testsuite/ld-i386/i386.exp: Run property-x86-isa4. + * testsuite/ld-i386/property-x86-isa4.d: New file. + * testsuite/ld-x86-64/property-x86-isa4-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-isa4.d: Likewise. + * ld/testsuite/ld-x86-64/x86-64.exp: Run property-x86-isa4 + and property-x86-isa4-x32. + 2020-10-26 H.J. Lu <hongjiu.lu@intel.com> * testsuite/ld-elfweak/elfweak.exp: Pass $NOLTO_CFLAGS to CC. @@ -5,8 +5,8 @@ encountered. This option can be suppressed via the configure time switch: --enable-error-handling-script=no. -* Add -z x86-64-v[234] to the x86 ELF linker to mark x86-64-v[234] ISA - level as needed. +* Add -z x86-64-{baseline|v[234]} to the x86 ELF linker to mark + x86-64-{baseline|v[234]} ISA level as needed. * Add -z unique-symbol to avoid duplicated local symbol names. diff --git a/ld/emulparams/x86-64-level.sh b/ld/emulparams/x86-64-level.sh index efa75ca..c74b236 100644 --- a/ld/emulparams/x86-64-level.sh +++ b/ld/emulparams/x86-64-level.sh @@ -1,15 +1,16 @@ PARSE_AND_LIST_OPTIONS_X86_64_LEVEL=' fprintf (file, _("\ - -z x86-64-v[234] Mark x86-64-v[234] ISA level as needed\n")); + -z x86-64-{baseline|v[234]} Mark x86-64-{baseline|v[234]} ISA level as needed\n")); ' PARSE_AND_LIST_ARGS_CASE_Z_X86_64_LEVEL=' + else if (strcmp (optarg, "x86-64-baseline") == 0) + params.isa_level = 1; else if (strncmp (optarg, "x86-64-v", 8) == 0) { char *end; unsigned int level = strtoul (optarg + 8 , &end, 10); if (*end != '\0' || level < 2 || level > 4) - einfo (_("%F%P: invalid x86-64 ISA level: %s\n"), - optarg); + einfo (_("%F%P: invalid x86-64 ISA level: %s\n"), optarg); params.isa_level = level; } ' @@ -1419,10 +1419,12 @@ Do not report unresolved symbol references from regular object files, either when creating an executable, or when creating a shared library. This option is the inverse of @samp{-z defs}. +@item x86-64-baseline @item x86-64-v2 @item x86-64-v3 @itemx x86-64-v4 Specify the x86-64 ISA level needed in .note.gnu.property section. +@option{x86-64-baseline} generates @code{GNU_PROPERTY_X86_ISA_1_BASELINE}. @option{x86-64-v2} generates @code{GNU_PROPERTY_X86_ISA_1_V2}. @option{x86-64-v3} generates @code{GNU_PROPERTY_X86_ISA_1_V3}. @option{x86-64-v4} generates @code{GNU_PROPERTY_X86_ISA_1_V4}. diff --git a/ld/testsuite/ld-elf/x86-feature-1a.rd b/ld/testsuite/ld-elf/x86-feature-1a.rd index fda3063..7d0d32d 100644 --- a/ld/testsuite/ld-elf/x86-feature-1a.rd +++ b/ld/testsuite/ld-elf/x86-feature-1a.rd @@ -3,4 +3,4 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-elf/x86-feature-1b.rd b/ld/testsuite/ld-elf/x86-feature-1b.rd index b0d6f64..d565fb7 100644 --- a/ld/testsuite/ld-elf/x86-feature-1b.rd +++ b/ld/testsuite/ld-elf/x86-feature-1b.rd @@ -3,4 +3,4 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-elf/x86-feature-1c.rd b/ld/testsuite/ld-elf/x86-feature-1c.rd index b0d6f64..d565fb7 100644 --- a/ld/testsuite/ld-elf/x86-feature-1c.rd +++ b/ld/testsuite/ld-elf/x86-feature-1c.rd @@ -3,4 +3,4 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-elf/x86-feature-1d.rd b/ld/testsuite/ld-elf/x86-feature-1d.rd index d5c3deb..3e09b51 100644 --- a/ld/testsuite/ld-elf/x86-feature-1d.rd +++ b/ld/testsuite/ld-elf/x86-feature-1d.rd @@ -3,4 +3,4 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: <None> x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-elf/x86-feature-1e.rd b/ld/testsuite/ld-elf/x86-feature-1e.rd index eb82ef2..e21b6e8 100644 --- a/ld/testsuite/ld-elf/x86-feature-1e.rd +++ b/ld/testsuite/ld-elf/x86-feature-1e.rd @@ -3,4 +3,4 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 0b1538e..9c06f70 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -479,6 +479,7 @@ run_dump_test "pr26711-3" run_dump_test "property-x86-isa1" run_dump_test "property-x86-isa2" run_dump_test "property-x86-isa3" +run_dump_test "property-x86-isa4" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr23372c.d b/ld/testsuite/ld-i386/pr23372c.d index fffd680..1f5b2d8 100644 --- a/ld/testsuite/ld-i386/pr23372c.d +++ b/ld/testsuite/ld-i386/pr23372c.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: diff --git a/ld/testsuite/ld-i386/pr23486c.d b/ld/testsuite/ld-i386/pr23486c.d index 92765f5..f3f526f 100644 --- a/ld/testsuite/ld-i386/pr23486c.d +++ b/ld/testsuite/ld-i386/pr23486c.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2 diff --git a/ld/testsuite/ld-i386/pr23486d.d b/ld/testsuite/ld-i386/pr23486d.d index c673e8e..1077e69 100644 --- a/ld/testsuite/ld-i386/pr23486d.d +++ b/ld/testsuite/ld-i386/pr23486d.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2 diff --git a/ld/testsuite/ld-i386/pr24322a.d b/ld/testsuite/ld-i386/pr24322a.d index a273e68..4f8000b 100644 --- a/ld/testsuite/ld-i386/pr24322a.d +++ b/ld/testsuite/ld-i386/pr24322a.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/pr24322b.d b/ld/testsuite/ld-i386/pr24322b.d index 244d8c3..ba3e79e 100644 --- a/ld/testsuite/ld-i386/pr24322b.d +++ b/ld/testsuite/ld-i386/pr24322b.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-1a.r b/ld/testsuite/ld-i386/property-1a.r index cbdd647..7c41da8 100644 --- a/ld/testsuite/ld-i386/property-1a.r +++ b/ld/testsuite/ld-i386/property-1a.r @@ -4,6 +4,6 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: #pass diff --git a/ld/testsuite/ld-i386/property-2a.r b/ld/testsuite/ld-i386/property-2a.r index 51bfde8..ab94fdf 100644 --- a/ld/testsuite/ld-i386/property-2a.r +++ b/ld/testsuite/ld-i386/property-2a.r @@ -4,6 +4,6 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: #pass diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r index 3578823..1bdb47c 100644 --- a/ld/testsuite/ld-i386/property-3.r +++ b/ld/testsuite/ld-i386/property-3.r @@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 #... - x86 ISA needed: x86-64-v2, x86-64-v3 + x86 ISA needed: x86-64-baseline, x86-64-v2 #pass diff --git a/ld/testsuite/ld-i386/property-3a.r b/ld/testsuite/ld-i386/property-3a.r index 89cc8fa..dac2cab 100644 --- a/ld/testsuite/ld-i386/property-3a.r +++ b/ld/testsuite/ld-i386/property-3a.r @@ -3,7 +3,7 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 - x86 ISA needed: x86-64-v2, x86-64-v3 + x86 ISA needed: x86-64-baseline, x86-64-v2 x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8> + x86 ISA used: x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r index a024b2a..8cc618c 100644 --- a/ld/testsuite/ld-i386/property-4.r +++ b/ld/testsuite/ld-i386/property-4.r @@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 #... - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-i386/property-4a.r b/ld/testsuite/ld-i386/property-4a.r index ff61875..64e58a7 100644 --- a/ld/testsuite/ld-i386/property-4a.r +++ b/ld/testsuite/ld-i386/property-4a.r @@ -3,7 +3,7 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r index eb24e3a..e3ba4f6 100644 --- a/ld/testsuite/ld-i386/property-5.r +++ b/ld/testsuite/ld-i386/property-5.r @@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x900000 #... - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-i386/property-5a.r b/ld/testsuite/ld-i386/property-5a.r index c99af9e..75c88ff 100644 --- a/ld/testsuite/ld-i386/property-5a.r +++ b/ld/testsuite/ld-i386/property-5a.r @@ -3,7 +3,7 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x900000 - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-i386/property-7a.r b/ld/testsuite/ld-i386/property-7a.r index c97fc72..661239b 100644 --- a/ld/testsuite/ld-i386/property-7a.r +++ b/ld/testsuite/ld-i386/property-7a.r @@ -5,4 +5,4 @@ Displaying notes found in: .note.gnu.property Properties: stack size: 0x800000 no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-3.d b/ld/testsuite/ld-i386/property-x86-3.d index 059388d..2616876 100644 --- a/ld/testsuite/ld-i386/property-x86-3.d +++ b/ld/testsuite/ld-i386/property-x86-3.d @@ -5,6 +5,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + Properties: x86 ISA needed: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + x86 ISA used: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> diff --git a/ld/testsuite/ld-i386/property-x86-4a.d b/ld/testsuite/ld-i386/property-x86-4a.d index 3006627..a1c6ca6 100644 --- a/ld/testsuite/ld-i386/property-x86-4a.d +++ b/ld/testsuite/ld-i386/property-x86-4a.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-5.d b/ld/testsuite/ld-i386/property-x86-5.d index 71faa63..73c6480 100644 --- a/ld/testsuite/ld-i386/property-x86-5.d +++ b/ld/testsuite/ld-i386/property-x86-5.d @@ -7,5 +7,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2 - x86 ISA used: x86-64-baseline + Properties: x86 ISA needed: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-cet1.d b/ld/testsuite/ld-i386/property-x86-cet1.d index fbce0bb..396897e 100644 --- a/ld/testsuite/ld-i386/property-x86-cet1.d +++ b/ld/testsuite/ld-i386/property-x86-cet1.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-cet2a.d b/ld/testsuite/ld-i386/property-x86-cet2a.d index 655762d..62f64cc 100644 --- a/ld/testsuite/ld-i386/property-x86-cet2a.d +++ b/ld/testsuite/ld-i386/property-x86-cet2a.d @@ -10,6 +10,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + Properties: x86 ISA needed: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + x86 ISA used: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> diff --git a/ld/testsuite/ld-i386/property-x86-cet5a.d b/ld/testsuite/ld-i386/property-x86-cet5a.d index bd7e2ed..98f148f 100644 --- a/ld/testsuite/ld-i386/property-x86-cet5a.d +++ b/ld/testsuite/ld-i386/property-x86-cet5a.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-cet5b.d b/ld/testsuite/ld-i386/property-x86-cet5b.d index 0b47267..2f172fa 100644 --- a/ld/testsuite/ld-i386/property-x86-cet5b.d +++ b/ld/testsuite/ld-i386/property-x86-cet5b.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-ibt1a.d b/ld/testsuite/ld-i386/property-x86-ibt1a.d index 1fee1ae..2bdd24a 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt1a.d +++ b/ld/testsuite/ld-i386/property-x86-ibt1a.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-ibt1b.d b/ld/testsuite/ld-i386/property-x86-ibt1b.d index adb00d7..0e22d8f 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt1b.d +++ b/ld/testsuite/ld-i386/property-x86-ibt1b.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-ibt2.d b/ld/testsuite/ld-i386/property-x86-ibt2.d index 68aa0fe..405ffad 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt2.d +++ b/ld/testsuite/ld-i386/property-x86-ibt2.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d index 290bcac..eca57db 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt3a.d +++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + Properties: x86 ISA needed: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + x86 ISA used: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d index 0ac9e7f..e6c2219 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt3b.d +++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + Properties: x86 ISA needed: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + x86 ISA used: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> diff --git a/ld/testsuite/ld-i386/property-x86-ibt4.d b/ld/testsuite/ld-i386/property-x86-ibt4.d index 0e613e2..beb4705 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt4.d +++ b/ld/testsuite/ld-i386/property-x86-ibt4.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-ibt5.d b/ld/testsuite/ld-i386/property-x86-ibt5.d index 23da096..3d18064 100644 --- a/ld/testsuite/ld-i386/property-x86-ibt5.d +++ b/ld/testsuite/ld-i386/property-x86-ibt5.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-isa1.d b/ld/testsuite/ld-i386/property-x86-isa1.d index 22ac02b..aa5dae5 100644 --- a/ld/testsuite/ld-i386/property-x86-isa1.d +++ b/ld/testsuite/ld-i386/property-x86-isa1.d @@ -7,5 +7,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v4 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v4 <procesor-specific type 0xc0009000 data: 30 00 00 00 > diff --git a/ld/testsuite/ld-i386/property-x86-isa4.d b/ld/testsuite/ld-i386/property-x86-isa4.d new file mode 100644 index 0000000..8275378 --- /dev/null +++ b/ld/testsuite/ld-i386/property-x86-isa4.d @@ -0,0 +1,9 @@ +#source: ../ld-x86-64/simple.s +#as: --32 -mx86-used-note=no +#ld: -r -m elf_i386 -z x86-64-baseline +#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 ISA needed: x86-64-baseline diff --git a/ld/testsuite/ld-i386/property-x86-shstk1a.d b/ld/testsuite/ld-i386/property-x86-shstk1a.d index ab774dc..7e392c9 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk1a.d +++ b/ld/testsuite/ld-i386/property-x86-shstk1a.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-shstk1b.d b/ld/testsuite/ld-i386/property-x86-shstk1b.d index 97517c3..f6e8901 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk1b.d +++ b/ld/testsuite/ld-i386/property-x86-shstk1b.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-shstk2.d b/ld/testsuite/ld-i386/property-x86-shstk2.d index 9700302..84a477b 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk2.d +++ b/ld/testsuite/ld-i386/property-x86-shstk2.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d index 1b6da4f..adabdd1 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk3a.d +++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + Properties: x86 ISA needed: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + x86 ISA used: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d index 98a1562..147414f 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk3b.d +++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + Properties: x86 ISA needed: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + x86 ISA used: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> diff --git a/ld/testsuite/ld-i386/property-x86-shstk4.d b/ld/testsuite/ld-i386/property-x86-shstk4.d index fa4c88c..31677d9 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk4.d +++ b/ld/testsuite/ld-i386/property-x86-shstk4.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-i386/property-x86-shstk5.d b/ld/testsuite/ld-i386/property-x86-shstk5.d index 64a3539..13de31c 100644 --- a/ld/testsuite/ld-i386/property-x86-shstk5.d +++ b/ld/testsuite/ld-i386/property-x86-shstk5.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr23372c-x32.d b/ld/testsuite/ld-x86-64/pr23372c-x32.d index 5698ec2..1be49b0 100644 --- a/ld/testsuite/ld-x86-64/pr23372c-x32.d +++ b/ld/testsuite/ld-x86-64/pr23372c-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr23372c.d b/ld/testsuite/ld-x86-64/pr23372c.d index e1281b2..ab19f4d 100644 --- a/ld/testsuite/ld-x86-64/pr23372c.d +++ b/ld/testsuite/ld-x86-64/pr23372c.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA used: x86-64-baseline + Properties: x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr23486c-x32.d b/ld/testsuite/ld-x86-64/pr23486c-x32.d index 11215f3..cfb1a2b 100644 --- a/ld/testsuite/ld-x86-64/pr23486c-x32.d +++ b/ld/testsuite/ld-x86-64/pr23486c-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2 diff --git a/ld/testsuite/ld-x86-64/pr23486c.d b/ld/testsuite/ld-x86-64/pr23486c.d index 38c54ca..aa118b0 100644 --- a/ld/testsuite/ld-x86-64/pr23486c.d +++ b/ld/testsuite/ld-x86-64/pr23486c.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2 diff --git a/ld/testsuite/ld-x86-64/pr23486d-x32.d b/ld/testsuite/ld-x86-64/pr23486d-x32.d index 74eb4c0..7e7fa1e 100644 --- a/ld/testsuite/ld-x86-64/pr23486d-x32.d +++ b/ld/testsuite/ld-x86-64/pr23486d-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2 diff --git a/ld/testsuite/ld-x86-64/pr23486d.d b/ld/testsuite/ld-x86-64/pr23486d.d index 4f33523..872462f 100644 --- a/ld/testsuite/ld-x86-64/pr23486d.d +++ b/ld/testsuite/ld-x86-64/pr23486d.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2 diff --git a/ld/testsuite/ld-x86-64/pr24322a-x32.d b/ld/testsuite/ld-x86-64/pr24322a-x32.d index 8009f91..4bbe33c 100644 --- a/ld/testsuite/ld-x86-64/pr24322a-x32.d +++ b/ld/testsuite/ld-x86-64/pr24322a-x32.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24322a.d b/ld/testsuite/ld-x86-64/pr24322a.d index 6ddb7a7..4a79057 100644 --- a/ld/testsuite/ld-x86-64/pr24322a.d +++ b/ld/testsuite/ld-x86-64/pr24322a.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24322b-x32.d b/ld/testsuite/ld-x86-64/pr24322b-x32.d index 76ebd1c..8356f3a 100644 --- a/ld/testsuite/ld-x86-64/pr24322b-x32.d +++ b/ld/testsuite/ld-x86-64/pr24322b-x32.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24322b.d b/ld/testsuite/ld-x86-64/pr24322b.d index 6ee0146..deca33e 100644 --- a/ld/testsuite/ld-x86-64/pr24322b.d +++ b/ld/testsuite/ld-x86-64/pr24322b.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24458a-x32.d b/ld/testsuite/ld-x86-64/pr24458a-x32.d index 9909f17..6a673c8 100644 --- a/ld/testsuite/ld-x86-64/pr24458a-x32.d +++ b/ld/testsuite/ld-x86-64/pr24458a-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24458a.d b/ld/testsuite/ld-x86-64/pr24458a.d index d0fbc33..73fbcae 100644 --- a/ld/testsuite/ld-x86-64/pr24458a.d +++ b/ld/testsuite/ld-x86-64/pr24458a.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24458b-x32.d b/ld/testsuite/ld-x86-64/pr24458b-x32.d index 9f80ed2..d690830 100644 --- a/ld/testsuite/ld-x86-64/pr24458b-x32.d +++ b/ld/testsuite/ld-x86-64/pr24458b-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24458b.d b/ld/testsuite/ld-x86-64/pr24458b.d index ee18948..ae78c97 100644 --- a/ld/testsuite/ld-x86-64/pr24458b.d +++ b/ld/testsuite/ld-x86-64/pr24458b.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24458c-x32.d b/ld/testsuite/ld-x86-64/pr24458c-x32.d index 7107c3f..b934c4b 100644 --- a/ld/testsuite/ld-x86-64/pr24458c-x32.d +++ b/ld/testsuite/ld-x86-64/pr24458c-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/pr24458c.d b/ld/testsuite/ld-x86-64/pr24458c.d index 690088a..7016655 100644 --- a/ld/testsuite/ld-x86-64/pr24458c.d +++ b/ld/testsuite/ld-x86-64/pr24458c.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-1a.r b/ld/testsuite/ld-x86-64/property-1a.r index cbdd647..7c41da8 100644 --- a/ld/testsuite/ld-x86-64/property-1a.r +++ b/ld/testsuite/ld-x86-64/property-1a.r @@ -4,6 +4,6 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: #pass diff --git a/ld/testsuite/ld-x86-64/property-2a.r b/ld/testsuite/ld-x86-64/property-2a.r index 51bfde8..ab94fdf 100644 --- a/ld/testsuite/ld-x86-64/property-2a.r +++ b/ld/testsuite/ld-x86-64/property-2a.r @@ -4,6 +4,6 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: #pass diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r index 3578823..1bdb47c 100644 --- a/ld/testsuite/ld-x86-64/property-3.r +++ b/ld/testsuite/ld-x86-64/property-3.r @@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 #... - x86 ISA needed: x86-64-v2, x86-64-v3 + x86 ISA needed: x86-64-baseline, x86-64-v2 #pass diff --git a/ld/testsuite/ld-x86-64/property-3a.r b/ld/testsuite/ld-x86-64/property-3a.r index 89cc8fa..dac2cab 100644 --- a/ld/testsuite/ld-x86-64/property-3a.r +++ b/ld/testsuite/ld-x86-64/property-3a.r @@ -3,7 +3,7 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 - x86 ISA needed: x86-64-v2, x86-64-v3 + x86 ISA needed: x86-64-baseline, x86-64-v2 x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8> + x86 ISA used: x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r index a024b2a..8cc618c 100644 --- a/ld/testsuite/ld-x86-64/property-4.r +++ b/ld/testsuite/ld-x86-64/property-4.r @@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 #... - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-x86-64/property-4a.r b/ld/testsuite/ld-x86-64/property-4a.r index ff61875..64e58a7 100644 --- a/ld/testsuite/ld-x86-64/property-4a.r +++ b/ld/testsuite/ld-x86-64/property-4a.r @@ -3,7 +3,7 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r index eb24e3a..e3ba4f6 100644 --- a/ld/testsuite/ld-x86-64/property-5.r +++ b/ld/testsuite/ld-x86-64/property-5.r @@ -4,5 +4,5 @@ Displaying notes found in: .note.gnu.property GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x900000 #... - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-x86-64/property-5a.r b/ld/testsuite/ld-x86-64/property-5a.r index c99af9e..75c88ff 100644 --- a/ld/testsuite/ld-x86-64/property-5a.r +++ b/ld/testsuite/ld-x86-64/property-5a.r @@ -3,7 +3,7 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x900000 - x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA needed: x86-64-baseline, x86-64-v2, x86-64-v4 x86 feature used: x86 - x86 ISA used: x86-64-v2, x86-64-v3, <unknown: 8> + x86 ISA used: x86-64-baseline, x86-64-v2, x86-64-v4 #pass diff --git a/ld/testsuite/ld-x86-64/property-7a.r b/ld/testsuite/ld-x86-64/property-7a.r index c97fc72..661239b 100644 --- a/ld/testsuite/ld-x86-64/property-7a.r +++ b/ld/testsuite/ld-x86-64/property-7a.r @@ -5,4 +5,4 @@ Displaying notes found in: .note.gnu.property Properties: stack size: 0x800000 no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-3-x32.d b/ld/testsuite/ld-x86-64/property-x86-3-x32.d index 5125a7a..78e2af7 100644 --- a/ld/testsuite/ld-x86-64/property-x86-3-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-3-x32.d @@ -6,6 +6,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-3.d b/ld/testsuite/ld-x86-64/property-x86-3.d index 9742308..de162bf 100644 --- a/ld/testsuite/ld-x86-64/property-x86-3.d +++ b/ld/testsuite/ld-x86-64/property-x86-3.d @@ -5,6 +5,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d index cf5046f..226bfca 100644 --- a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-4a.d b/ld/testsuite/ld-x86-64/property-x86-4a.d index 7c2bb78..0bec21f 100644 --- a/ld/testsuite/ld-x86-64/property-x86-4a.d +++ b/ld/testsuite/ld-x86-64/property-x86-4a.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000028 NT_GNU_PROPERTY_TYPE_0 Properties: no copy on protected x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-5-x32.d b/ld/testsuite/ld-x86-64/property-x86-5-x32.d index 8f62e3b..837ded6 100644 --- a/ld/testsuite/ld-x86-64/property-x86-5-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-5-x32.d @@ -7,5 +7,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2 - x86 ISA used: x86-64-baseline + Properties: x86 ISA needed: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-5.d b/ld/testsuite/ld-x86-64/property-x86-5.d index 3ba1f48..a2fb64b 100644 --- a/ld/testsuite/ld-x86-64/property-x86-5.d +++ b/ld/testsuite/ld-x86-64/property-x86-5.d @@ -7,5 +7,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2 - x86 ISA used: x86-64-baseline + Properties: x86 ISA needed: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d index 25cf016..831936c 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet1-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-cet1.d b/ld/testsuite/ld-x86-64/property-x86-cet1.d index 3e79729..43009dc 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet1.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet1.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d index 2f1facb..121b4ba 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet2a-x32.d @@ -10,6 +10,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-cet2a.d b/ld/testsuite/ld-x86-64/property-x86-cet2a.d index 9e3560c..fb9cddd 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet2a.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet2a.d @@ -10,6 +10,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d index 928cc13..109b734 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet5a-x32.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5a.d b/ld/testsuite/ld-x86-64/property-x86-cet5a.d index e36db37..a85f064 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet5a.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet5a.d @@ -7,4 +7,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d b/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d index 890d070..c2e488e 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet5b-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-cet5b.d b/ld/testsuite/ld-x86-64/property-x86-cet5b.d index 4f81698..32bc0e8 100644 --- a/ld/testsuite/ld-x86-64/property-x86-cet5b.d +++ b/ld/testsuite/ld-x86-64/property-x86-cet5b.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT, SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d index ba0de1b..fc6d3ea 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1a-x32.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1a.d b/ld/testsuite/ld-x86-64/property-x86-ibt1a.d index c5caf30..15c987e 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt1a.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1a.d @@ -9,4 +9,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt1b-x32.d index a891894..8053ab7 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt1b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1b-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt1b.d b/ld/testsuite/ld-x86-64/property-x86-ibt1b.d index 5120c01..ebd4a0b 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt1b.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt1b.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt2-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt2-x32.d index 3946aec..06f420a 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt2-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt2-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt2.d b/ld/testsuite/ld-x86-64/property-x86-ibt2.d index 2a55017..c691436 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt2.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt2.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d index ea4254e..72d6385 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d index f74b2d1..c22bf16 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d index a2ad6f8..61f29e4 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d index ab6bfb6..69338a6 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt4-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt4-x32.d index 95155c5..c4f9269 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt4-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt4-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt4.d b/ld/testsuite/ld-x86-64/property-x86-ibt4.d index 496c00c..c56aa68 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt4.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt4.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d index d9bf59e..f03b321 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt5-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt5.d b/ld/testsuite/ld-x86-64/property-x86-ibt5.d index 212c3b2..101f44a 100644 --- a/ld/testsuite/ld-x86-64/property-x86-ibt5.d +++ b/ld/testsuite/ld-x86-64/property-x86-ibt5.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: IBT x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-isa1-x32.d b/ld/testsuite/ld-x86-64/property-x86-isa1-x32.d index e50e135..dcb61c1 100644 --- a/ld/testsuite/ld-x86-64/property-x86-isa1-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-isa1-x32.d @@ -7,5 +7,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v4 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v4 <procesor-specific type 0xc0009000 data: 30 00 00 00 > diff --git a/ld/testsuite/ld-x86-64/property-x86-isa1.d b/ld/testsuite/ld-x86-64/property-x86-isa1.d index fd05ade..3c39ca6 100644 --- a/ld/testsuite/ld-x86-64/property-x86-isa1.d +++ b/ld/testsuite/ld-x86-64/property-x86-isa1.d @@ -7,5 +7,5 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v4 + Properties: x86 ISA needed: x86-64-baseline, x86-64-v4 <procesor-specific type 0xc0009000 data: 30 00 00 00 > diff --git a/ld/testsuite/ld-x86-64/property-x86-isa4-x32.d b/ld/testsuite/ld-x86-64/property-x86-isa4-x32.d new file mode 100644 index 0000000..ad60f6c --- /dev/null +++ b/ld/testsuite/ld-x86-64/property-x86-isa4-x32.d @@ -0,0 +1,9 @@ +#source: simple.s +#as: --x32 -mx86-used-note=no +#ld: -r -m elf32_x86_64 -z x86-64-baseline +#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 ISA needed: x86-64-baseline diff --git a/ld/testsuite/ld-x86-64/property-x86-isa4.d b/ld/testsuite/ld-x86-64/property-x86-isa4.d new file mode 100644 index 0000000..0ef6626 --- /dev/null +++ b/ld/testsuite/ld-x86-64/property-x86-isa4.d @@ -0,0 +1,9 @@ +#source: simple.s +#as: --64 -defsym __64_bit__=1 -mx86-used-note=no +#ld: -r -m elf_x86_64 -z x86-64-baseline +#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 ISA needed: x86-64-baseline diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk1a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk1a-x32.d index bc98572..54bb019 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk1a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk1a-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk1a.d b/ld/testsuite/ld-x86-64/property-x86-shstk1a.d index b61d272..e242909 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk1a.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk1a.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk1b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk1b-x32.d index 28807f2..84e1791 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk1b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk1b-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk1b.d b/ld/testsuite/ld-x86-64/property-x86-shstk1b.d index d30e15c..665c7ad 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk1b.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk1b.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk2-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk2-x32.d index 66839c3..de81bd1 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk2-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk2-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk2.d b/ld/testsuite/ld-x86-64/property-x86-shstk2.d index e75dc3a..db633c9 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk2.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk2.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d index f73ded6..3987a7a 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d index a653cf2..a2e75e7 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d index 893bf31..c4ed1d9 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d index b7be8bc..296da1f 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d @@ -7,6 +7,6 @@ Displaying notes found in: .note.gnu.property [ ]+Owner[ ]+Data size[ ]+Description GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 - Properties: x86 ISA needed: x86-64-v2, x86-64-v3, <unknown: 10>, <unknown: 20> + Properties: x86 ISA needed: x86-64-baseline, x86-64-v2, <unknown: 10>, <unknown: 20> x86 feature used: x86 - x86 ISA used: x86-64-v3, <unknown: 8>, <unknown: 20>, <unknown: 80> + x86 ISA used: x86-64-v2, x86-64-v4, <unknown: 20>, <unknown: 80> diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk4-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk4-x32.d index a04e304..f88f6ab 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk4-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk4-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk4.d b/ld/testsuite/ld-x86-64/property-x86-shstk4.d index 04cce50..8e8b108 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk4.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk4.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d index f78e6f4..0199d3a 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk5-x32.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000024 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk5.d b/ld/testsuite/ld-x86-64/property-x86-shstk5.d index c96782c..bba3476 100644 --- a/ld/testsuite/ld-x86-64/property-x86-shstk5.d +++ b/ld/testsuite/ld-x86-64/property-x86-shstk5.d @@ -8,4 +8,4 @@ Displaying notes found in: .note.gnu.property GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 Properties: x86 feature: SHSTK x86 feature used: x86 - x86 ISA used: x86-64-baseline + x86 ISA used: diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 9170207..b99e6f1 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -446,6 +446,8 @@ run_dump_test "property-x86-isa2" run_dump_test "property-x86-isa2-x32" run_dump_test "property-x86-isa3" run_dump_test "property-x86-isa3-x32" +run_dump_test "property-x86-isa4" +run_dump_test "property-x86-isa4-x32" if ![istarget "x86_64-*-linux*"] { return |