From b0ab06937385e0ae25cebf1991787d64f439bf12 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Fri, 30 Oct 2020 06:49:57 -0700
Subject: [PATCH] x86: Support GNU_PROPERTY_X86_ISA_1_BASELINE marker

GCC 11 supports -march=x86-64-v[234] to enable x86 micro-architecture ISA
levels:

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97250

X86 ISA markers are updated:

https://gitlab.com/x86-psABIs/x86-64-ABI/-/merge_requests/13

GNU_PROPERTY_X86_ISA_1_BASELINE is added and GNU_PROPERTY_X86_ISA_1_V[234]
are updated:

 #define GNU_PROPERTY_X86_ISA_1_BASELINE (1U << 0)
 #define GNU_PROPERTY_X86_ISA_1_V2       (1U << 1)
 #define GNU_PROPERTY_X86_ISA_1_V3       (1U << 2)
 #define GNU_PROPERTY_X86_ISA_1_V4       (1U << 3)

Add -z x86-64-baseline linker command line option to mark x86-64-baseline
ISA level as needed.

bfd/

	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.

binutils/

	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.

gas/

	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.

include/

	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.

ld/

	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.
---
 bfd/ChangeLog                                 |   6 +
 bfd/elfxx-x86.c                               |   3 +
 binutils/ChangeLog                            |  27 ++++
 binutils/readelf.c                            |   9 +-
 binutils/testsuite/binutils-all/i386/empty.d  |   2 +-
 binutils/testsuite/binutils-all/i386/ibt.d    |   2 +-
 .../testsuite/binutils-all/i386/pr21231a.d    |   2 +-
 .../testsuite/binutils-all/i386/pr21231b.d    |   6 +-
 binutils/testsuite/binutils-all/i386/shstk.d  |   2 +-
 .../testsuite/binutils-all/x86-64/empty-x32.d |   2 +-
 .../testsuite/binutils-all/x86-64/empty.d     |   2 +-
 .../testsuite/binutils-all/x86-64/ibt-x32.d   |   2 +-
 binutils/testsuite/binutils-all/x86-64/ibt.d  |   2 +-
 .../testsuite/binutils-all/x86-64/pr21231a.d  |   2 +-
 .../testsuite/binutils-all/x86-64/pr21231b.d  |   6 +-
 .../binutils-all/x86-64/pr23494a-x32.d        |   2 +-
 .../testsuite/binutils-all/x86-64/pr23494a.d  |   2 +-
 .../binutils-all/x86-64/pr23494c-x32.d        |   2 +-
 .../testsuite/binutils-all/x86-64/pr23494c.d  |   2 +-
 .../binutils-all/x86-64/pr23494d-x32.d        |   2 +-
 .../testsuite/binutils-all/x86-64/pr23494d.d  |   2 +-
 .../binutils-all/x86-64/pr23494e-x32.d        |   2 +-
 .../testsuite/binutils-all/x86-64/pr23494e.d  |   2 +-
 .../testsuite/binutils-all/x86-64/shstk-x32.d |   2 +-
 .../testsuite/binutils-all/x86-64/shstk.d     |   2 +-
 gas/ChangeLog                                 |  22 +++
 gas/config/tc-i386.c                          |  92 +++++++------
 gas/testsuite/gas/i386/property-1.d           |   2 +-
 gas/testsuite/gas/i386/property-11.d          |   2 +-
 gas/testsuite/gas/i386/property-12.d          |   2 +-
 gas/testsuite/gas/i386/property-3.d           |   2 +-
 gas/testsuite/gas/i386/property-4.d           |   2 +-
 gas/testsuite/gas/i386/property-5.d           |   2 +-
 gas/testsuite/gas/i386/property-6.d           |   2 +-
 gas/testsuite/gas/i386/x86-64-property-1.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-property-11.d   |   2 +-
 gas/testsuite/gas/i386/x86-64-property-12.d   |   2 +-
 gas/testsuite/gas/i386/x86-64-property-3.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-property-4.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-property-5.d    |   2 +-
 gas/testsuite/gas/i386/x86-64-property-6.d    |   2 +-
 include/ChangeLog                             |   8 ++
 include/elf/common.h                          |  17 +--
 ld/ChangeLog                                  | 129 ++++++++++++++++++
 ld/NEWS                                       |   4 +-
 ld/emulparams/x86-64-level.sh                 |   7 +-
 ld/ld.texi                                    |   2 +
 ld/testsuite/ld-elf/x86-feature-1a.rd         |   2 +-
 ld/testsuite/ld-elf/x86-feature-1b.rd         |   2 +-
 ld/testsuite/ld-elf/x86-feature-1c.rd         |   2 +-
 ld/testsuite/ld-elf/x86-feature-1d.rd         |   2 +-
 ld/testsuite/ld-elf/x86-feature-1e.rd         |   2 +-
 ld/testsuite/ld-i386/i386.exp                 |   1 +
 ld/testsuite/ld-i386/pr23372c.d               |   2 +-
 ld/testsuite/ld-i386/pr23486c.d               |   2 +-
 ld/testsuite/ld-i386/pr23486d.d               |   2 +-
 ld/testsuite/ld-i386/pr24322a.d               |   2 +-
 ld/testsuite/ld-i386/pr24322b.d               |   2 +-
 ld/testsuite/ld-i386/property-1a.r            |   2 +-
 ld/testsuite/ld-i386/property-2a.r            |   2 +-
 ld/testsuite/ld-i386/property-3.r             |   2 +-
 ld/testsuite/ld-i386/property-3a.r            |   4 +-
 ld/testsuite/ld-i386/property-4.r             |   2 +-
 ld/testsuite/ld-i386/property-4a.r            |   4 +-
 ld/testsuite/ld-i386/property-5.r             |   2 +-
 ld/testsuite/ld-i386/property-5a.r            |   4 +-
 ld/testsuite/ld-i386/property-7a.r            |   2 +-
 ld/testsuite/ld-i386/property-x86-3.d         |   4 +-
 ld/testsuite/ld-i386/property-x86-4a.d        |   2 +-
 ld/testsuite/ld-i386/property-x86-5.d         |   4 +-
 ld/testsuite/ld-i386/property-x86-cet1.d      |   2 +-
 ld/testsuite/ld-i386/property-x86-cet2a.d     |   4 +-
 ld/testsuite/ld-i386/property-x86-cet5a.d     |   2 +-
 ld/testsuite/ld-i386/property-x86-cet5b.d     |   2 +-
 ld/testsuite/ld-i386/property-x86-ibt1a.d     |   2 +-
 ld/testsuite/ld-i386/property-x86-ibt1b.d     |   2 +-
 ld/testsuite/ld-i386/property-x86-ibt2.d      |   2 +-
 ld/testsuite/ld-i386/property-x86-ibt3a.d     |   4 +-
 ld/testsuite/ld-i386/property-x86-ibt3b.d     |   4 +-
 ld/testsuite/ld-i386/property-x86-ibt4.d      |   2 +-
 ld/testsuite/ld-i386/property-x86-ibt5.d      |   2 +-
 ld/testsuite/ld-i386/property-x86-isa1.d      |   2 +-
 ld/testsuite/ld-i386/property-x86-isa4.d      |   9 ++
 ld/testsuite/ld-i386/property-x86-shstk1a.d   |   2 +-
 ld/testsuite/ld-i386/property-x86-shstk1b.d   |   2 +-
 ld/testsuite/ld-i386/property-x86-shstk2.d    |   2 +-
 ld/testsuite/ld-i386/property-x86-shstk3a.d   |   4 +-
 ld/testsuite/ld-i386/property-x86-shstk3b.d   |   4 +-
 ld/testsuite/ld-i386/property-x86-shstk4.d    |   2 +-
 ld/testsuite/ld-i386/property-x86-shstk5.d    |   2 +-
 ld/testsuite/ld-x86-64/pr23372c-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr23372c.d             |   2 +-
 ld/testsuite/ld-x86-64/pr23486c-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr23486c.d             |   2 +-
 ld/testsuite/ld-x86-64/pr23486d-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr23486d.d             |   2 +-
 ld/testsuite/ld-x86-64/pr24322a-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr24322a.d             |   2 +-
 ld/testsuite/ld-x86-64/pr24322b-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr24322b.d             |   2 +-
 ld/testsuite/ld-x86-64/pr24458a-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr24458a.d             |   2 +-
 ld/testsuite/ld-x86-64/pr24458b-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr24458b.d             |   2 +-
 ld/testsuite/ld-x86-64/pr24458c-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/pr24458c.d             |   2 +-
 ld/testsuite/ld-x86-64/property-1a.r          |   2 +-
 ld/testsuite/ld-x86-64/property-2a.r          |   2 +-
 ld/testsuite/ld-x86-64/property-3.r           |   2 +-
 ld/testsuite/ld-x86-64/property-3a.r          |   4 +-
 ld/testsuite/ld-x86-64/property-4.r           |   2 +-
 ld/testsuite/ld-x86-64/property-4a.r          |   4 +-
 ld/testsuite/ld-x86-64/property-5.r           |   2 +-
 ld/testsuite/ld-x86-64/property-5a.r          |   4 +-
 ld/testsuite/ld-x86-64/property-7a.r          |   2 +-
 ld/testsuite/ld-x86-64/property-x86-3-x32.d   |   4 +-
 ld/testsuite/ld-x86-64/property-x86-3.d       |   4 +-
 ld/testsuite/ld-x86-64/property-x86-4a-x32.d  |   2 +-
 ld/testsuite/ld-x86-64/property-x86-4a.d      |   2 +-
 ld/testsuite/ld-x86-64/property-x86-5-x32.d   |   4 +-
 ld/testsuite/ld-x86-64/property-x86-5.d       |   4 +-
 .../ld-x86-64/property-x86-cet1-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/property-x86-cet1.d    |   2 +-
 .../ld-x86-64/property-x86-cet2a-x32.d        |   4 +-
 ld/testsuite/ld-x86-64/property-x86-cet2a.d   |   4 +-
 .../ld-x86-64/property-x86-cet5a-x32.d        |   2 +-
 ld/testsuite/ld-x86-64/property-x86-cet5a.d   |   2 +-
 .../ld-x86-64/property-x86-cet5b-x32.d        |   2 +-
 ld/testsuite/ld-x86-64/property-x86-cet5b.d   |   2 +-
 .../ld-x86-64/property-x86-ibt1a-x32.d        |   2 +-
 ld/testsuite/ld-x86-64/property-x86-ibt1a.d   |   2 +-
 .../ld-x86-64/property-x86-ibt1b-x32.d        |   2 +-
 ld/testsuite/ld-x86-64/property-x86-ibt1b.d   |   2 +-
 .../ld-x86-64/property-x86-ibt2-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/property-x86-ibt2.d    |   2 +-
 .../ld-x86-64/property-x86-ibt3a-x32.d        |   4 +-
 ld/testsuite/ld-x86-64/property-x86-ibt3a.d   |   4 +-
 .../ld-x86-64/property-x86-ibt3b-x32.d        |   4 +-
 ld/testsuite/ld-x86-64/property-x86-ibt3b.d   |   4 +-
 .../ld-x86-64/property-x86-ibt4-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/property-x86-ibt4.d    |   2 +-
 .../ld-x86-64/property-x86-ibt5-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/property-x86-ibt5.d    |   2 +-
 .../ld-x86-64/property-x86-isa1-x32.d         |   2 +-
 ld/testsuite/ld-x86-64/property-x86-isa1.d    |   2 +-
 .../ld-x86-64/property-x86-isa4-x32.d         |   9 ++
 ld/testsuite/ld-x86-64/property-x86-isa4.d    |   9 ++
 .../ld-x86-64/property-x86-shstk1a-x32.d      |   2 +-
 ld/testsuite/ld-x86-64/property-x86-shstk1a.d |   2 +-
 .../ld-x86-64/property-x86-shstk1b-x32.d      |   2 +-
 ld/testsuite/ld-x86-64/property-x86-shstk1b.d |   2 +-
 .../ld-x86-64/property-x86-shstk2-x32.d       |   2 +-
 ld/testsuite/ld-x86-64/property-x86-shstk2.d  |   2 +-
 .../ld-x86-64/property-x86-shstk3a-x32.d      |   4 +-
 ld/testsuite/ld-x86-64/property-x86-shstk3a.d |   4 +-
 .../ld-x86-64/property-x86-shstk3b-x32.d      |   4 +-
 ld/testsuite/ld-x86-64/property-x86-shstk3b.d |   4 +-
 .../ld-x86-64/property-x86-shstk4-x32.d       |   2 +-
 ld/testsuite/ld-x86-64/property-x86-shstk4.d  |   2 +-
 .../ld-x86-64/property-x86-shstk5-x32.d       |   2 +-
 ld/testsuite/ld-x86-64/property-x86-shstk5.d  |   2 +-
 ld/testsuite/ld-x86-64/x86-64.exp             |   2 +
 162 files changed, 471 insertions(+), 237 deletions(-)
 create mode 100644 ld/testsuite/ld-i386/property-x86-isa4.d
 create mode 100644 ld/testsuite/ld-x86-64/property-x86-isa4-x32.d
 create mode 100644 ld/testsuite/ld-x86-64/property-x86-isa4.d

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 24a81c89ab2..a12ba7de337 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 4a0360fb098..97de9f2b537 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 3ff3316efcc..4ae34af4928 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 03cfc97464b..63738526d74 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 ec54389be6e..682a0866b2d 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 7723d70bf09..0357ae3e3a4 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 657784d4f08..ca2c088a5f8 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 77ef4e635e8..0c219978f80 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 8d2e9f29690..c91864f76d7 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 820996bbd9b..bf96a4c2834 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 0f9d8ceca55..035e60f4f34 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 490938a2cc5..51760f4694b 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 500ab54e4d4..57daed9c4ea 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 f643a78a6ee..f1733960ed4 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 e9a185f1674..ab793356224 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 018809c6cfb..76fcff6d9b7 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 dab7d1859cb..6807adf67ba 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 05f32635ced..10457a69a7d 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 6b0d4f348e1..97e2bf70aa3 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 385cbdbc4e1..252ee5d771e 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 45e9a39aff8..25ba072846c 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 968262a9d7a..c0a28cd1b93 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 bbd9e21d588..11d3f9e00e1 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 b798d887410..5b76f93e316 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 7523e453ecb..52dae0902ad 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 a52eb2bd036..b965dbb90ea 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 daeef4c7a4c..ea8bd1f5ac9 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 d40bd5259e0..7c0107d3167 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 b3a4591b5dd..db48868a295 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 fb9fa5c19aa..1a5c2978075 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 b6aba35806c..d58e7e07f5d 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 c23625cd67f..46450c87af4 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 ba7679d84ba..c04a6b84f5d 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 d1a4ed6caaa..a7dab96232f 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 931c7d26477..52db167599d 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 d2402293acc..d93e01bb245 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 ff12b6598ed..168320441a3 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 bc1e48303a3..d2485058521 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 fd4bee055bb..be1d4852ae5 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 73e24b918fc..a1385c246c3 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 330e6f646ba..5cdb873bb50 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 2267cda7bd5..afa52a33525 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 b3c30e0e2f7..fc672de9f21 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 898c43473ca..3f39eb462e7 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.
diff --git a/ld/NEWS b/ld/NEWS
index 81c44191d2b..02fc93bfc5d 100644
--- a/ld/NEWS
+++ b/ld/NEWS
@@ -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 efa75cad9ff..c74b236900a 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;
 	}
 '
diff --git a/ld/ld.texi b/ld/ld.texi
index 48e78aecdb7..cf8f05c39e0 100644
--- a/ld/ld.texi
+++ b/ld/ld.texi
@@ -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 fda3063b78c..7d0d32deedd 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 b0d6f64562f..d565fb7f99f 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 b0d6f64562f..d565fb7f99f 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 d5c3debd019..3e09b518664 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 eb82ef2d6cf..e21b6e84a1c 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 0b1538ed81d..9c06f7006b7 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 fffd680f069..1f5b2d8e8b3 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 92765f5ddcf..f3f526f09bb 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 c673e8e0d74..1077e697e60 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 a273e687f92..4f8000b8e16 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 244d8c3df45..ba3e79e7546 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 cbdd6477a45..7c41da862e2 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 51bfde81633..ab94fdf14a3 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 3578823f93e..1bdb47c7b6b 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 89cc8fa76bc..dac2cab1313 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 a024b2a60ad..8cc618cbfad 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 ff61875ce3e..64e58a7563c 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 eb24e3ad270..e3ba4f659b9 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 c99af9e9413..75c88ff7ba3 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 c97fc72524e..661239ba4d9 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 059388dfca0..261687636bd 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 3006627abe9..a1c6ca6d7f8 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 71faa63eb2c..73c648037e1 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 fbce0bbaecc..396897e4750 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 655762deed1..62f64cca68c 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 bd7e2edfaa6..98f148f6ed1 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 0b47267e16b..2f172fa2e01 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 1fee1ae2d30..2bdd24a81b4 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 adb00d72ea7..0e22d8f9d79 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 68aa0feebcf..405ffad2437 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 290bcac1c84..eca57dbe2da 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 0ac9e7ff000..e6c2219373d 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 0e613e23bf1..beb4705b4a1 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 23da096b852..3d18064751c 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 22ac02b5c43..aa5dae55a76 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 00000000000..8275378201b
--- /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 ab774dc6a52..7e392c9e82e 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 97517c32fd4..f6e89016960 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 97003022289..84a477b14a9 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 1b6da4f4302..adabdd16120 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 98a15629106..147414ff5d3 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 fa4c88c148f..31677d9806d 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 64a35398aab..13de31cd304 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 5698ec268b5..1be49b0e253 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 e1281b2e1cd..ab19f4d0b0e 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 11215f3d036..cfb1a2b6a3c 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 38c54cad8a3..aa118b09594 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 74eb4c0969a..7e7fa1e0285 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 4f335238c3d..872462f076b 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 8009f910974..4bbe33ca355 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 6ddb7a7163d..4a790571cd7 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 76ebd1cfa37..8356f3a4456 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 6ee01464434..deca33e9664 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 9909f1760d6..6a673c8c70d 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 d0fbc3390fb..73fbcaebcf7 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 9f80ed20d99..d69083075a6 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 ee1894894d1..ae78c974a19 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 7107c3f9892..b934c4bb673 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 690088a532f..7016655a933 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 cbdd6477a45..7c41da862e2 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 51bfde81633..ab94fdf14a3 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 3578823f93e..1bdb47c7b6b 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 89cc8fa76bc..dac2cab1313 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 a024b2a60ad..8cc618cbfad 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 ff61875ce3e..64e58a7563c 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 eb24e3ad270..e3ba4f659b9 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 c99af9e9413..75c88ff7ba3 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 c97fc72524e..661239ba4d9 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 5125a7aba15..78e2af703de 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 974230875c0..de162bfcd09 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 cf5046f6e02..226bfca6342 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 7c2bb782d89..0bec21f8550 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 8f62e3be325..837ded6de09 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 3ba1f481ca3..a2fb64bfce9 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 25cf016ac2e..831936c9cc1 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 3e797299e87..43009dc3396 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 2f1facb52ff..121b4ba0754 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 9e3560c259e..fb9cddd6ffc 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 928cc137a08..109b73422b2 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 e36db3734a7..a85f064356e 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 890d07021c2..c2e488e88b7 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 4f81698d94a..32bc0e8b405 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 ba0de1b42c5..fc6d3eaf17a 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 c5caf309479..15c987ee898 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 a8918944bb1..8053ab73cf7 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 5120c01881d..ebd4a0b55f1 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 3946aec3a37..06f420a5514 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 2a55017ab2a..c6914368b3d 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 ea4254e728e..72d63853898 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 f74b2d1e9c2..c22bf1653eb 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 a2ad6f8fe7d..61f29e45a9d 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 ab6bfb6281f..69338a60ccc 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 95155c51d1f..c4f9269b93f 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 496c00cc2ac..c56aa68ae0b 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 d9bf59eb963..f03b321c1a2 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 212c3b2b9a3..101f44a25db 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 e50e135cb06..dcb61c1da57 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 fd05ade1f8a..3c39ca6d7cd 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 00000000000..ad60f6cc014
--- /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 00000000000..0ef6626fa9b
--- /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 bc9857236c4..54bb019c032 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 b61d272f689..e242909d1d4 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 28807f2f6e2..84e17912931 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 d30e15c9485..665c7adbd9d 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 66839c32516..de81bd1fa5d 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 e75dc3a617e..db633c96483 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 f73ded63330..3987a7af2d5 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 a653cf241e9..a2e75e7b07f 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 893bf31de8d..c4ed1d9b9aa 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 b7be8bc9fe1..296da1f8561 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 a04e3048505..f88f6ab40ad 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 04cce50b651..8e8b1083453 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 f78e6f42805..0199d3afa04 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 c96782cdfb4..bba3476e822 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 91702076b97..b99e6f19b57 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
-- 
2.39.2