+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/binutils-all/i386/compressed-1b.d: Pass
+       -mx86-used-note=no to assembler.
+       * testsuite/binutils-all/i386/compressed-1c.d: Likewise.
+       * testsuite/binutils-all/x86-64/compressed-1b.d: Likewise.
+       * testsuite/binutils-all/x86-64/compressed-1c.d: Likewise.
+       * testsuite/binutils-all/i386/empty.d: Pass -mx86-used-note=yes
+       to assembler and update expected output from "readelf -n".
+       * 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/pr23494b-x32.d: Likewise.
+       * testsuite/binutils-all/x86-64/pr23494b.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.
+
 2018-08-30  H.J. Lu  <hongjiu.lu@intel.com>
 
        * readelf.c (process_section_headers): Treat SHT_FINI_ARRAY and
 
 #PROG: strip
 #source: compressed-1.s
-#as: --32
+#as: --32 -mx86-used-note=no
 #strip:
 #readelf: -S --wide
 #name: strip on uncompressed debug sections
 
 #PROG: strip
 #source: compressed-1.s
-#as: --32 --compress-debug-sections
+#as: --32 --compress-debug-sections -mx86-used-note=no
 #strip:
 #readelf: -S --wide
 #name: strip on compressed debug sections
 
 #PROG: objcopy
-#as: --32
+#as: --32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: 
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --32
+#as: --32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --32
+#as: --32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x00000008      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --32
+#as: --32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
        no copy on protected 
        x86 ISA used: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI, <unknown: 1000000>, <unknown: 2000000>, <unknown: 4000000>, <unknown: 8000000>, <unknown: 10000000>, <unknown: 20000000>, <unknown: 40000000>
        x86 ISA needed: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --32
+#as: --32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: strip
 #source: compressed-1.s
-#as: --64
+#as: --64 -mx86-used-note=no
 #strip:
 #readelf: -S --wide
 #name: strip on uncompressed debug sections
 
 #PROG: strip
 #source: compressed-1.s
-#as: --64 --compress-debug-sections
+#as: --64 --compress-debug-sections -mx86-used-note=no
 #strip:
 #readelf: -S --wide
 #name: strip on compressed debug sections
 
 #source: empty.s
 #PROG: objcopy
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: 
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: 
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: ibt.s
 #PROG: objcopy
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --64
+#as: --64 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x00000008      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --64
+#as: --64 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
        no copy on protected 
        x86 ISA used: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI, <unknown: 1000000>, <unknown: 2000000>, <unknown: 4000000>, <unknown: 8000000>, <unknown: 10000000>, <unknown: 20000000>, <unknown: 40000000>
        x86 ISA needed: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: pr23494a.s
 #PROG: objcopy
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE4_1, AVX
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: pr23494a.s
 #PROG: objcopy
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE4_1, AVX
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: pr23494a.s
 #PROG: objcopy
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64 -R .note.gnu.property
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 #source: pr23494a.s
 #PROG: objcopy
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64 -R .note.gnu.property
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 #source: pr23494b.s
 #PROG: objcopy
-#as: --x32
+#as: --x32 -mx86-used-note=no
 #objcopy: -O elf64-x86-64
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 #source: pr23494b.s
 #PROG: objcopy
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=no
 #objcopy: -O elf32-x86-64
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 #PROG: objcopy
 #source: pr23494a.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64 --decompress-debug-sections
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE4_1, AVX
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #PROG: objcopy
 #source: pr23494a.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64 --decompress-debug-sections
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE4_1, AVX
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #PROG: objcopy
 #source: pr23494c.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy: -O elf64-x86-64 --decompress-debug-sections
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000040      NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0xffffffff
        x86 ISA needed: SSE4_1, AVX
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #PROG: objcopy
 #source: pr23494c.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy: -O elf32-x86-64 --decompress-debug-sections
 #readelf: -n
 #not-target: x86_64-*-nacl*
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: stack size: 0xffffffff
        x86 ISA needed: SSE4_1, AVX
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: shstk.s
 #PROG: objcopy
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #PROG: objcopy
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #objcopy:
 #readelf: -n
 
   Owner                 Data size      Description
   GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/gas/i386/bss.d: Pass -mx86-used-note=no to assembler.
+       * testsuite/gas/i386/ilp32/quad.d: Likewise.
+       * testsuite/gas/i386/ilp32/reloc64.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-size-1.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-size-3.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-size-5.d: Likewise.
+       * testsuite/gas/i386/ilp32/x86-64-unwind.d: Likewise.
+       * testsuite/gas/i386/property-1.d: Likewise.
+       * testsuite/gas/i386/relax.d: Likewise.
+       * testsuite/gas/i386/reloc64.d: Likewise.
+       * testsuite/gas/i386/size-1.d: Likewise.
+       * testsuite/gas/i386/size-3.d: Likewise.
+       * testsuite/gas/i386/x86-64-property-1.d: Likewise.
+       * testsuite/gas/i386/x86-64-size-1.d: Likewise.
+       * testsuite/gas/i386/x86-64-size-3.d: Likewise.
+       * testsuite/gas/i386/x86-64-size-5.d: Likewise.
+       * testsuite/gas/i386/x86-64-unwind.d: Likewise.
+       * testsuite/gas/i386/divide.d: Append "#pass".
+
 2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
 
        * NEWS: Mention -mx86-used-note=[no|yes].
 
+#as: -mx86-used-note=no
 #objdump: -s
 #name: i386 .bss
 
 
 Contents of section .*
  0000 01000000 02000000 03000000 04000000 .*
  0010 05000000 .*
+#pass
 
+#as: -mx86-used-note=no
 #objdump: -sr
 #name: x86-64 (ILP32) quad
 
 
+#as: -mx86-used-note=no
 #objdump: -Drw
 #name: x86-64 (ILP32) relocs
 
 
+#as: -mx86-used-note=no
 #name: x32 size 1
 #source: ../size-1.s
 #readelf: -r
 
+#as: -mx86-used-note=no
 #name: x32 size 3
 #source: ../size-3.s
 #readelf: -r
 
+#as: -mx86-used-note=no
 #name: x32 size 5
 #source: ../x86-64-size-5.s
 #readelf: -r
 
+#as: -mx86-used-note=no
 #source: ../x86-64-unwind.s
 #readelf: -S
 #name: x86-64 (ILP32) unwind
 
 #name: i386 property 1
+#as: -mx86-used-note=no
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
 
+#as: -mx86-used-note=no
 #name: i386 relax
 #objdump: -s
 
 
+#as: -mx86-used-note=no
 #objdump: -Drw
 #name: x86-64 relocs
 
 
+#as: -mx86-used-note=no
 #name: i386 size 1
 #readelf: -r
 
 
+#as: -mx86-used-note=no
 #name: i386 size 3
 #readelf: -r
 
 
 #name: x86-64 property 1
 #source: property-1.s
-#as: -defsym __64_bit__=1
+#as: -mx86-used-note=no -defsym __64_bit__=1
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
 
+#as: -mx86-used-note=no
 #name: x86-64 size 1
 #source: size-1.s
 #readelf: -r
 
+#as: -mx86-used-note=no
 #name: x86-64 size 3
 #source: size-3.s
 #readelf: -r
 
+#as: -mx86-used-note=no
 #name: x86-64 size 5
 #readelf: -r
 
 
+#as: -mx86-used-note=no
 #readelf: -S
 #name: x86-64 unwind
 
 
+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/ld-i386/i386.exp: (ASFLAGS): Save, append
+       -mx86-used-note=no and restore.  Pass -mx86-used-note=yes and
+       -mx86-used-note=no to assembler.
+       * testsuite/ld-x86-64/x86-64.exp: Likewise.
+       * testsuite/ld-i386/no-plt.exp: Pass -mx86-used-note=yes to
+       assembler.
+       * testsuite/ld-i386/tls.exp: Likewise.
+       * testsuite/ld-x86-64/no-plt.exp: Likewise.
+       * testsuite/ld-x86-64/tls.exp: Likewise.
+       * testsuite/ld-i386/pr23486a.d: Pass -mx86-used-note=no to
+       assembler.
+       * testsuite/ld-i386/pr23486b.d: Likewise.
+       * testsuite/ld-x86-64/bnd-branch-1-now.d: Likewise.
+       * testsuite/ld-x86-64/bnd-ifunc-1-now.d: Likewise.
+       * testsuite/ld-x86-64/bnd-ifunc-2-now.d: Likewise.
+       * testsuite/ld-x86-64/bnd-ifunc-2.d: Likewise.
+       * testsuite/ld-x86-64/bnd-plt-1-now.d: Likewise.
+       * testsuite/ld-x86-64/bnd-plt-1.d: Likewise.
+       * testsuite/ld-x86-64/pr23486a-x32.d: Likewise.
+       * testsuite/ld-x86-64/pr23486a.d: Likewise.
+       * testsuite/ld-x86-64/pr23486b-x32.d: Likewise.
+       * testsuite/ld-x86-64/pr23486b.d: Likewise.
+       * testsuite/ld-i386/property-x86-3.d: Pass -mx86-used-note=yes
+       to assembler and update expected output from "readelf -n".
+       * testsuite/ld-i386/property-x86-4a.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-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/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-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-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/property-1a.r: New file.
+       * testsuite/ld-i386/property-2a.r: Likewise.
+       * testsuite/ld-i386/property-3a.r: Likewise.
+       * testsuite/ld-i386/property-4a.r: Likewise.
+       * testsuite/ld-i386/property-5a.r: Likewise.
+       * testsuite/ld-i386/property-7a.r: Likewise.
+       * testsuite/ld-x86-64/property-1a.r: Likewise.
+       * testsuite/ld-x86-64/property-2a.r: Likewise.
+       * testsuite/ld-x86-64/property-3a.r: Likewise.
+       * testsuite/ld-x86-64/property-4a.r: Likewise.
+       * testsuite/ld-x86-64/property-5a.r: Likewise.
+       * testsuite/ld-x86-64/property-7a.r: Likewise.
+       * testsuite/ld-x86-64/mpx.exp: Pass -mx86-used-note=no to
+       assembler.
+
 2018-08-29  Chenghua Xu  <paul.hua.gm@gmail.com>
 
        * testsuite/ld-mips-elf/mips-elf-flags.exp: Run good_combination
 
 # MA 02110-1301, USA.
 #
 
+global ASFLAGS
+set saved_ASFLAGS "$ASFLAGS"
+if { [is_elf_format] \
+     && ([istarget "i?86-*-*"] || [istarget "x86_64-*-*"]) } {
+    set ASFLAGS "$ASFLAGS -mx86-used-note=no"
+}
+
 # Test i386 linking; all types of relocs.  This tests the assembler and
 # tools like objdump as well as the linker.
 
      "--32" {tlsie1.s}
      {{objdump -dwr tlsie1.dd}} "tlsie1"}
     {"PR ld/17313 (1)" "-melf_i386" ""
-     "--32" {zero.s} {} ""}
+     "--32 -mx86-used-note=yes" {zero.s} {} ""}
     {"PR ld/17313 (2)" "-melf_i386 -shared --just-symbols=tmpdir/zero.o" ""
-     "--32" {lea1.s} {} "libpr17313.so"}
+     "--32 -mx86-used-note=yes" {lea1.s} {} "libpr17313.so"}
     {"PR ld/17306 (1)" "-melf_i386" ""
-     "--32" {pr17306b.s} {} ""}
+     "--32 -mx86-used-note=yes" {pr17306b.s} {} ""}
     {"PR ld/17306 (2)" "-melf_i386 -shared -Bsymbolic --just-symbols=tmpdir/pr17306b.o" ""
-     "--32" {pr17306a.s} {} "libpr17306.so"}
+     "--32 -mx86-used-note=yes" {pr17306a.s} {} "libpr17306.so"}
     {"PR ld/17709 (1)" "-melf_i386 -shared" ""
-     "--32" {pr17709a.s} {} "libpr17709.so"}
+     "--32 -mx86-used-note=yes" {pr17709a.s} {} "libpr17709.so"}
     {"PR ld/17709 (2)" "-melf_i386 tmpdir/libpr17709.so" ""
-     "--32" {pr17709b.s} {{readelf -r pr17709.rd}} "pr17709"}
+     "--32 -mx86-used-note=yes"
+     {pr17709b.s} {{readelf -r pr17709.rd}} "pr17709"}
     {"Build pr19827a.o" "" ""
-     "--32" { pr19827a.S }}
+     "--32 -mx86-used-note=yes" { pr19827a.S }}
     {"Build pr19827b.so" "-melf_i386 -shared" ""
-     "--32" { pr19827b.S } {} "pr19827b.so"}
+     "--32 -mx86-used-note=yes"
+     { pr19827b.S } {} "pr19827b.so"}
     {"Build pr19827" "-melf_i386 -pie tmpdir/pr19827a.o tmpdir/pr19827b.so" ""
-     "--32" { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
+     "--32 -mx86-used-note=yes"
+     { dummy.s } {{readelf {-rW} pr19827.rd}} "pr19827"}
     {"Build pr19827.so" "-melf_i386 -shared -Bsymbolic" ""
-     "--32" { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
+     "--32 -mx86-used-note=yes"
+     { pr19827a.S }  {{readelf {-rW} pr19827.rd}} "pr19827.so"}
 }
 
 # So as to avoid rewriting every last test case here in a nacl variant,
        || [istarget "i?86-*-nacl*"]
        || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]) } {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
        [list \
            "Build libpr19704a.so" \
            "-shared -Wl,-soname,libpr19704.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {} \
            "libpr19704a.so" \
        [list \
            "Build libpr19704b.so" \
            "-shared -Wl,-soname,libpr19704.so" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr19704b.c } \
            {} \
            "libpr19704b.so" \
        [list \
            "Run pr19704" \
            "$ldflags tmpdir/libpr19704.so -Wl,-R,tmpdir" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { pr19704a.c } \
            "pr19704" \
            "pr19704.out" \
        [list \
            "Build plt-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { plt-lib.c } \
            {} \
            "libplt-lib.so" \
        [list \
            "Build libplt-main1.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes" \
            { plt-main1.c } \
            {{readelf {-Wr} plt-main1.rd}} \
            "libplt-main1.a" \
        [list \
            "Build libplt-main2.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes" \
            { plt-main2.c } \
            {{readelf {-Wr} plt-main2.rd}} \
            "libplt-main2.a" \
        [list \
            "Build libplt-main3.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes $PLT_CFLAGS" \
            { plt-main3.c } \
            {{readelf {-Wr} plt-main3.rd}} \
            "libplt-main3.a" \
        [list \
            "Build libplt-main4.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mrelax-relocations=yes $PLT_CFLAGS" \
            { plt-main4.c } \
            {{readelf {-Wr} plt-main4.rd}} \
            "libplt-main4.a" \
            "Build plt-main" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { plt-main5.c } \
            {{readelf {-Wr} plt-main.rd}} \
            "plt-main" \
            "Build plt-main with PIE" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so -pie" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { plt-main5.c } \
            {{readelf {-Wr} plt-main.rd}} \
            "plt-main" \
        [list \
            "Build copyreloc-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { copyreloc-lib.c } \
            {} \
            "copyreloc-lib.so" \
        [list \
            "Build libcopyreloc-main.a" \
            "" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { copyreloc-main.S } \
            {} \
            "libcopyreloc-main.a" \
        [list \
            "Build copyreloc-main with PIE and GOTOFF (1)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main1.rd}} \
            "copyreloc-main" \
        [list \
            "Build copyreloc-main with PIE and GOTOFF (2)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main2.rd}} \
            "copyreloc-main" \
        [list \
            "Build pr17689.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr17689a.c } \
            {} \
            "pr17689.so" \
        [list \
            "Build pr17689.so with -z now" \
            "-shared -Wl,-z,now" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr17689a.c } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now.so" \
        [list \
            "Build pr17689ver.so" \
            "-shared -Wl,--version-script,pr17689a.t" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr17689a.c } \
            {} \
            "pr17689ver.so" \
        [list \
            "Build pr17689.a" \
            "" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { pr17689b.S } \
            {} \
            "pr17689.a" \
        [list \
            "Build pr17689 with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17689.rd}} \
            "pr17689" \
        [list \
            "Build pr17689 with PIE, -z now and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -Wl,-z,now" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now" \
        [list \
            "Build pr17689ver with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689ver.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17689ver.rd}} \
            "pr17689ver" \
        [list \
            "Build pr17827 with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.c } \
            {{readelf {-Wr} pr17827.rd}} \
            "pr17827" \
        [list \
            "Build pr18900.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr18900a.c } \
            "" \
            "pr18900.so" \
        [list \
            "Build pr18900.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { pr18900b.c pr18900c.c } \
            "" \
            "pr18900.o" \
        [list \
            "Build pr18900a" \
            "tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900a.rd}} \
            "pr18900a" \
        [list \
            "Build pr18900b" \
            "-Wl,--as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900b.rd}} \
            "pr18900b" \
        [list \
            "Build pr19031.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mrelax-relocations=yes" \
            { pr19031a.c } \
            "" \
            "pr19031.so" \
        [list \
            "Build got1d.so" \
            "-shared" \
-           "" \
+           "-Wa,-mrelax-relocations=yes" \
            { got1d.S } \
            "" \
            "got1d.so" \
        [list \
            "Build gotpc1" \
            "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/gotpc1.o tmpdir/got1d.so" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            { dummy.s } \
            {{objdump {-dw} got1.dd}} \
            "got1" \
        [list \
            "Build pr19319.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            { pr19319a.S } \
            "" \
            "pr19319.so" \
        [list \
            "Build property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1" \
        [list \
            "Build property 1 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
-           {{readelf {-n} property-1.r}} \
+           {{readelf {-n} property-1a.r}} \
            "property-1.o" \
        ] \
        [list \
            "Build property 1 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1.so" \
        [list \
            "Build property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2" \
        [list \
            "Build property 2 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
-           {{readelf {-n} property-2.r}} \
+           {{readelf {-n} property-2a.r}} \
            "property-2.o" \
        ] \
        [list \
            "Build property 2 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2.so" \
        [list \
            "Build property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S} \
            {{readelf {-n} property-3.r}} \
            "property-3" \
        [list \
            "Build property 3 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-3.r}} \
+           {{readelf {-n} property-3a.r}} \
            "property-3.o" \
        ] \
        [list \
            "Build property 3 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-3.r}} \
            "property-3.so" \
        [list \
            "Build property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
        [list \
            "Build property 4 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-4.r}} \
+           {{readelf {-n} property-4a.r}} \
            "property-4.o" \
        ] \
        [list \
            "Build property 4 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-4.r}} \
            "property-4.so" \
        [list \
            "Build property 4 (-Wl,-z,stack-size=0)" \
            "-Wl,-z,stack-size=0" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
        [list \
            "Build property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-5.r}} \
            "property-5" \
        [list \
            "Build property 5 (.o)" \
            "-r -nostdlib -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-5.r}} \
+           {{readelf {-n} property-5a.r}} \
            "property-5.o" \
        ] \
        [list \
            "Build property 5 (.so)" \
            "-shared -Wl,-z,stack-size=0x900000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-5.r}} \
            "property-5.so" \
        [list \
            "Build property-6.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {property-6a.c property-6c.S} \
            {{readelf {-n} property-6.r}} \
            "property-6.so" \
        [list \
            "Build property-6.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-6b.c property-stack.S} \
-           {{readelf {-n} property-2.r}} \
+           {{readelf {-n} property-2a.r}} \
            "property-6.o" \
        ] \
        [list \
            "Build property-6" \
            "-Wl,--as-needed tmpdir/property-6.o tmpdir/property-6.so" \
+           "-Wa,-mx86-used-note=no" \
            { dummy.s } \
-           "" \
            {{readelf {-n} property-2.r}} \
            "property-6" \
        ] \
        [list \
            "Build property 7a (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-unsorted-1.S} \
-           {{readelf {-n} property-7.r}} \
+           {{readelf {-n} property-7a.r}} \
            "property-7a.o" \
        ] \
        [list \
            "Build property 7b (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-unsorted-2.S} \
-           {{readelf {-n} property-7.r}} \
+           {{readelf {-n} property-7a.r}} \
            "property-7b.o" \
        ] \
     ]
            "Run plt-main" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main" \
            "plt-main.out" \
            "Run plt-main with PIE" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main-pie" \
            "plt-main.out" \
        [list \
            "Run copyreloc-main with PIE and GOTOFF" \
            "-Wl,--as-needed tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "copyreloc-main" \
            "copyreloc-main.out" \
        [list \
            "Run pr17689 with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr17689" \
            "pr17689.out" \
        [list \
            "Run pr17689 with PIE, -z now and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -z now" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr17689now" \
            "pr17689.out" \
        [list \
            "Run pr17689ver with PIE and GOTOFF" \
            "tmpdir/pr17689b.o tmpdir/pr17689ver.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr17689ver" \
            "pr17689.out" \
        [list \
            "Run pr18900" \
            "tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr18900" \
            "pr18900.out" \
        [list \
            "Run pr19031" \
            "$NOPIE_LDFLAGS tmpdir/pr19031.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19031b.S pr19031c.c } \
            "pr19031" \
            "pr19031.out" \
        [list \
            "Run got1" \
            "$NOPIE_LDFLAGS tmpdir/got1d.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { got1a.S got1b.c got1c.c } \
            "got1" \
            "got1.out" \
        [list \
            "Run property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1" "pass.out" \
        ] \
        [list \
            "Run property 1 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 1 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1-static" "pass.out" \
        ] \
        [list \
            "Run property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-2" "pass.out" \
        ] \
        [list \
            "Run property 2 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-2-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 2 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
        [list \
            "Run property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S} \
            "property-3" "pass.out" \
        ] \
        [list \
            "Run property 3 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-1.S property-stack.S} \
            "property-3-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 3 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-1.S pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
        [list \
            "Run property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            "property-4" "pass.out" \
        ] \
        [list \
            "Run property 4 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
            "property-4-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 4 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            "property-4-static" "pass.out" \
        ] \
        [list \
            "Run property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            "property-5" "pass.out" \
        ] \
        [list \
            "Run property 5 (PIE)" \
            "-pie -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
            "property-5-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 5 (static)" \
            "-static -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            "property-5-static" "pass.out" \
        ] \
        [list \
            "Build ifunc-1a.o ifunc-1b.o ifunc-1c.o ifunc-1d.o" \
            "" \
-           "-fPIC -O2 -g" \
+           "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
            { ifunc-1a.c ifunc-1b.S ifunc-1c.S ifunc-1d.S } \
        ] \
        [list \
            "Build pr21168a.o" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21168a.c } \
        ] \
        [list \
            "Build pr21168.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21168b.S } \
            "" \
            "pr21168.so" \
            "Run ifunc-1a" \
            "tmpdir/ifunc-1a.o tmpdir/ifunc-1b.o \
             tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "ifunc-1a" \
            "pass.out" \
            "Run ifunc-1b" \
            "--static tmpdir/ifunc-1a.o tmpdir/ifunc-1b.o \
            tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "ifunc-1b" \
            "pass.out" \
        [list \
            "Run pr21168" \
            "tmpdir/pr21168a.o tmpdir/pr21168.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr21168" \
            "pass.out" \
            [list \
                "Build pr21168.so with -z ibtplt" \
                "-shared -Wl,-z,ibtplt" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr21168b.S } \
                "" \
                "pr21168-ibt.so" \
                "Build ifunc-1a with -z ibtplt" \
                "-Wl,-z,ibtplt $NOPIE_LDFLAGS tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                {{objdump {-dw} plt-main-ibt.dd}} \
                "ifunc-1a-ibt" \
                "Build ifunc-1a with PIE -z ibtplt" \
                "-Wl,-z,ibtplt -pie tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                {{objdump {-dw} plt-pie-ibt.dd}} \
                "ifunc-1a-pie-ibt" \
                "Run ifunc-1a with -z ibtplt" \
                "-Wl,-z,ibtplt $NOPIE_LDFLAGS tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                "ifunc-1a-ibt" \
                "pass.out" \
                "Run ifunc-1a with PIE -z ibtplt" \
                "-Wl,-z,ibtplt -pie tmpdir/ifunc-1a.o \
                 tmpdir/ifunc-1b.o tmpdir/ifunc-1c.o tmpdir/ifunc-1d.o" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                "ifunc-1a-pie-ibt" \
                "pass.out" \
            [list \
                "Run pr21168 with -z ibtplt" \
                "tmpdir/pr21168a.o tmpdir/pr21168-ibt.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.c } \
                "pr21168-ibt" \
                "pass.out" \
        [list \
            "Build pr22001-1.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1a.c } \
            {} \
            "pr22001-1.so" \
        [list \
            "Build pr21997-1.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { property-stack.S property-no-copy.S pr21997-1a.S } \
            {} \
            "pr21997-1.so" \
        [list \
            "Build pr22842.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22842a.c } \
            {} \
            "pr22842.so" \
        [list \
            "Run weakundef1 without PIE" \
            "$NOPIE_LDFLAGS" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { weakundef1.c } \
            "weakundef1pie" \
            "pass.out" \
        [list \
            "Run pr22001-1" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1" \
            "pass.out" \
        [list \
            "Run pr22001-1 (PIE 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.S } \
            "pr22001-1-pie-1" \
            "pass.out" \
        [list \
            "Run pr22001-1 (PIE 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.S } \
            "pr22001-1-pie-2" \
            "pass.out" \
        [list \
            "Run pr22001-1 (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1-pic-1" \
            "pass.out" \
        [list \
            "Run pr22001-1 (PIC 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1-pic-2" \
            "pass.out" \
        [list \
            "Run pr21997-1" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1" \
            "pass.out" \
        [list \
            "Run pr21997-1 (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1-pic-1" \
            "pass.out" \
        [list \
            "Run pr21997-1 (PIC 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1-pic-2" \
            "pass.out" \
        [list \
            "Run pr21997-1 (PIE 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.S } \
            "pr21997-1-pie-1" \
            "pass.out" \
        [list \
            "Run pr21997-1 (PIE 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.S } \
            "pr21997-1-pie-2" \
            "pass.out" \
        [list \
            "Build pr22842" \
            "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22842b.S } \
            "pr22842" \
            "pass.out" \
            [list \
                "Run weakundef1 with PIE" \
                "-pie" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { weakundef1.c } \
                "weakundef1pie" \
                "pass.out" \
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "x86_64-*-linux*"]) } {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
        "basic PLT generation (PIC, -z now)" \
        "-z now -shared -melf_i386 tmpdir/libpltlib.so" \
        "" \
-       "--32" \
+       "--32 -mx86-used-note=yes" \
        {plt-pic.s} \
        {{objdump -dwr plt-pic2.dd}} \
        "plt-pic2.so" \
        "Build pr21626.so" \
        "-shared -melf_i386" \
        "" \
-       "--32" \
+       "--32 -mx86-used-note=yes" \
        {property-x86-3.s} \
        "" \
        "pr21626.so" \
        "Build pr21626" \
        "-melf_i386 tmpdir/pr21626.so" \
        "" \
-       "--32" \
+       "--32 -mx86-used-note=yes" \
        {start.s foo.s} \
        "" \
        "pr21626" \
 run_dump_test "ibt-plt-3b"
 run_dump_test "ibt-plt-3c"
 run_dump_test "ibt-plt-3d"
+
+set ASFLAGS "$saved_ASFLAGS"
 
     [list \
        "Build no-plt-func1.o no-plt-main1.o" \
        "" \
-       "-fPIE" \
+       "-fPIE -Wa,-mx86-used-note=yes" \
        {no-plt-func1.c no-plt-main1.c} \
     ] \
     [list \
        "Build no-plt-check1a.o no-plt-extern1a.o \
         no-plt-check1b.o no-plt-extern1b.o" \
        "" \
-       "-Wa,-mrelax-relocations=yes" \
+       "-Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
        {no-plt-check1a.S no-plt-extern1a.S \
         no-plt-check1b.S no-plt-extern1b.S } \
     ] \
     [list \
        "Build libno-plt-1a.so" \
        "-shared tmpdir/no-plt-func1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libno-plt-1a.so" \
     [list \
        "Build libno-plt-1b.so" \
        "-shared tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr libno-plt-1b.rd} \
         {objdump -dwrj.text libno-plt-1b.dd}} \
        "No PLT (dynamic 1a)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1a.rd} {objdump -dwrj.text no-plt-1a.dd}} \
        "no-plt-1a" \
        "No PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1b.rd} {objdump -dwrj.text no-plt-1b.dd}} \
        "no-plt-1b" \
        "No PLT (dynamic 1c)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1c.rd} {objdump -dwrj.text no-plt-1c.dd}} \
        "no-plt-1c" \
        "No PLT (static 1d)" \
        "-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
        "no-plt-1d" \
        "No PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1e.rd} {objdump -dwrj.text no-plt-1e.dd}} \
        "no-plt-1e" \
        "No PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        {{readelf -Wr no-plt-1f.rd} {objdump -dwrj.text no-plt-1f.dd}} \
        "no-plt-1f" \
        "No PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        {{readelf -Wr no-plt-1g.rd} {objdump -dwrj.text no-plt-1g.dd}} \
        "no-plt-1g" \
        "No PLT (dynamic 1h)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1h.rd} {objdump -dwrj.text no-plt-1h.dd}} \
        "no-plt-1h" \
        "No PLT (dynamic 1i)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-extern1b.o tmpdir/libno-plt-1a.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1i.rd} {objdump -dwrj.text no-plt-1i.dd}} \
        "no-plt-1i" \
        "No PLT (static 1j)" \
        "-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1j.rd} {objdump -dwrj.text no-plt-1j.dd}} \
        "no-plt-1j" \
        "No PLT (dynamic 1a)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1a" \
        "pass.out" \
        "No PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1b" \
        "pass.out" \
        "No PLT (dynamic 1c)" \
        "tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1c" \
        "pass.out" \
        "No PLT (static 1d)" \
        "-static tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1d" \
        "pass.out" \
        "No PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1a.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1e" \
        "pass.out" \
        "No PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1f" \
        "pass.out" \
        "No PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1a.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1g" \
        "pass.out" \
        "No PLT (dynamic 1h)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        "no-plt-1h" \
        "pass.out" \
        "No PLT (dynamic 1i)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-extern1b.o tmpdir/libno-plt-1a.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        "no-plt-1i" \
        "pass.out" \
        "No PLT (static 1j)" \
        "-static tmpdir/no-plt-check1b.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1b.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        "no-plt-1j" \
        "pass.out" \
        [list \
            "Build pr20244-3a.o pr20244-3b.o pr20244-3c.o pr20244-3d.o" \
            "" \
-           "-fPIC -O2 -g" \
+           "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
            { pr20244-3a.c pr20244-3b.S pr20244-3c.S pr20244-3d.S } \
        ] \
        [list \
            "Build pr20253-1a.o pr20253-1b.o pr20253-1c.o pr20253-1d.o" \
            "" \
-           "-fPIE -O2 -g" \
+           "-fPIE -O2 -g -Wa,-mx86-used-note=yes" \
            { pr20253-1a.c pr20253-1b.S pr20253-1c.S pr20253-1d.S } \
        ] \
        [list \
            "Build libpr20253-1a.so" \
            "-shared tmpdir/pr20253-1b.o \
             tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {} \
            "libpr20253-1a.so" \
        ] \
        [list \
            "Build pr20253-2a.o pr20253-2b.o pr20253-2c.o pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            "-fPIE -O2 -g" \
            { pr20253-2a.c pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
        ] \
            "Run pr20244-3a" \
            "$NOPIE_LDFLAGS tmpdir/pr20244-3a.o tmpdir/pr20244-3b.o \
             tmpdir/pr20244-3c.o tmpdir/pr20244-3d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr20244-3a" \
            "pass.out" \
            "Run pr20244-3b" \
            "--static tmpdir/pr20244-3a.o tmpdir/pr20244-3b.o \
            tmpdir/pr20244-3c.o tmpdir/pr20244-3d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.c } \
            "pr20244-3b" \
            "pass.out" \
            "Run pr20253-1a" \
            "tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \
             tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-1a" \
            "pass.out" \
            "Run pr20253-1b" \
            "--static tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \
            tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-1b" \
            "pass.out" \
            "Run pr20253-1c" \
            "-pie tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \
            tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-1c" \
            "pass.out" \
        [list \
            "Run pr20253-1d" \
            "tmpdir/pr20253-1a.o tmpdir/libpr20253-1a.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-1d" \
            "pass.out" \
        [list \
            "Run pr20253-1e" \
            "-pie tmpdir/pr20253-1a.o tmpdir/libpr20253-1a.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-1e" \
            "pass.out" \
        [list \
            "Run pr20253-1f" \
            "$NOPIE_LDFLAGS tmpdir/pr20253-1a.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr20253-1b.S pr20253-1c.S pr20253-1d.S } \
            "pr20253-1f" \
            "pass.out" \
        [list \
            "Run pr20253-1g" \
            "--static tmpdir/pr20253-1a.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr20253-1b.S pr20253-1c.S pr20253-1d.S } \
            "pr20253-1g" \
            "pass.out" \
            "Run pr20253-2a" \
            "$NOPIE_LDFLAGS tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
             tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2a" \
            "pass.out" \
            "Run pr20253-2b" \
            "--static tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
            tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2b" \
            "pass.out" \
        [list \
            "Run pr20253-2c" \
            "$NOPIE_LDFLAGS tmpdir/pr20253-2a.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
            "pr20253-2c" \
            "pass.out" \
        [list \
            "Run pr20253-2d" \
            "--static tmpdir/pr20253-2a.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
            "pr20253-2d" \
            "pass.out" \
 
 #source: ../ld-x86-64/pr23486a.s
 #source: ../ld-x86-64/pr23486b.s
-#as: --32
+#as: --32 -mx86-used-note=no
 #ld: -r -m elf_i386
 #readelf: -n
 
 
 #source: ../ld-x86-64/pr23486b.s
 #source: ../ld-x86-64/pr23486a.s
-#as: --32
+#as: --32 -mx86-used-note=no
 #ld: -r -m elf_i386
 #readelf: -n
 
 
--- /dev/null
+#...
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
+      Properties: no copy on protected 
+       x86 ISA used: <None>
+       x86 feature used: x86
+
+#pass
 
--- /dev/null
+#...
+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 used: <None>
+       x86 feature used: x86
+
+#pass
 
--- /dev/null
+#...
+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: CMOV, SSE
+       x86 ISA used: SSE, SSE3
+       x86 feature used: x86
+#pass
 
--- /dev/null
+#...
+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: CMOV, SSE, SSE3
+       x86 ISA used: CMOV, SSE, SSE3
+       x86 feature used: x86
+#pass
 
--- /dev/null
+#...
+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: CMOV, SSE, SSE3
+       x86 ISA used: CMOV, SSE, SSE3
+       x86 feature used: x86
+#pass
 
--- /dev/null
+#...
+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
+       no copy on protected 
+       x86 ISA used: <None>
+       x86 feature used: x86
 
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -shared -m elf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE, SSE3, SSE4_1, AVX
        x86 ISA used: CMOV, SSE, SSSE3, SSE4_1
+       x86 feature used: x86
 
 #source: property-x86-4a.s
 #source: property-x86-4b.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -m elf_i386 --gc-sections --entry=main
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000008      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x0000002c      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
+       x86 feature needed: x86
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
 #source: property-x86-ibt.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
 #source: property-x86-empty.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-3.s
 #source: property-x86-ibt.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE, SSE3, SSE4_1, AVX
+       x86 ISA used: CMOV, SSE, SSSE3, SSE4_1
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
 #source: property-x86-3.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE, SSE3, SSE4_1, AVX
+       x86 ISA used: CMOV, SSE, SSSE3, SSE4_1
+       x86 feature used: x86
 
 #source: property-x86-empty.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386 -z ibt
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: start.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386 -z ibt
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
 #source: property-x86-shstk.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
 #source: property-x86-empty.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-3.s
 #source: property-x86-shstk.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE, SSE3, SSE4_1, AVX
+       x86 ISA used: CMOV, SSE, SSSE3, SSE4_1
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
 #source: property-x86-3.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: SSE, SSE3, SSE4_1, AVX
+       x86 ISA used: CMOV, SSE, SSSE3, SSE4_1
+       x86 feature used: x86
 
 #source: property-x86-empty.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386 -z shstk
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: start.s
-#as: --32
+#as: --32 -mx86-used-note=yes
 #ld: -r -melf_i386 -z shstk
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
     [list \
        "Build tls-def1.o tls-main1.o" \
        "" \
-       "-fPIE" \
+       "-fPIE -Wa,-mx86-used-note=yes" \
        {tls-def1.c tls-main1.c} \
     ] \
     [list \
        "Build tls-gd1.o tls-ld1.o" \
        "" \
-       "-fPIC -Wa,-mrelax-relocations=yes" \
+       "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
        {tls-gd1.S tls-ld1.S} \
     ] \
     [list \
        "Build libtls-1a.so" \
        "-shared tmpdir/tls-def1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libtls-1a.so" \
     [list \
        "Build libtls-1b.so" \
        "-shared tmpdir/tls-gd1.o tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libtls-1b.so" \
     [list \
        "Build libtls-1bn.so" \
        "-Wl,-z,now -shared tmpdir/tls-gd1.o tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libtls-1bn.so" \
        "TLS GD/LD -> LE transition without PLT (dynamic)" \
        "tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1a" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (dynamic, -z now)" \
        "-Wl,-z,now tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1an" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (PIE)" \
        "-pie tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1b" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (PIE, -z now)" \
        "-pie -Wl,-z,now tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1bn" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (static)" \
        "-static tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1c" \
        "pass.out" \
        "TLS GD/LD -> IE transition without PLT" \
        "tmpdir/tls-main1.o tmpdir/tls-gd1.o tmpdir/tls-ld1.o \
         tmpdir/libtls-1a.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1d" \
        "pass.out" \
        "TLS GD/LD -> IE transition without PLT (-z now)" \
        "-Wl,-z,now tmpdir/tls-main1.o tmpdir/tls-gd1.o tmpdir/tls-ld1.o \
         tmpdir/libtls-1a.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1dn" \
        "pass.out" \
        "TLS without PLT (1)" \
        "-Wl,--no-as-needed tmpdir/tls-main1.o \
         tmpdir/libtls-1a.so tmpdir/libtls-1b.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1e" \
        "pass.out" \
        "TLS without PLT (2)" \
        "tmpdir/tls-main1.o tmpdir/tls-def1.o \
         tmpdir/libtls-1b.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1f" \
        "pass.out" \
        "TLS without PLT (3)" \
        "-Wl,--no-as-needed -Wl,-z,now tmpdir/tls-main1.o \
         tmpdir/libtls-1a.so tmpdir/libtls-1bn.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1en" \
        "pass.out" \
        "TLS without PLT (4)" \
        "-Wl,-z,now tmpdir/tls-main1.o tmpdir/tls-def1.o \
         tmpdir/libtls-1bn.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1fn" \
        "pass.out" \
     [list \
        "Build libtlsdesc1.so" \
        "-shared" \
-       "-fPIC $GNU2_CFLAGS" \
+       "-fPIC $GNU2_CFLAGS -Wa,-mx86-used-note=yes" \
        { tlsdesc1b.c } \
        {} \
        "libtlsdesc1.so" \
     [list \
        "Build libtlsdesc1n.so" \
        "-Wl,-z,now -shared" \
-       "-fPIC $GNU2_CFLAGS" \
+       "-fPIC $GNU2_CFLAGS -Wa,-mx86-used-note=yes" \
        { tlsdesc1b.c } \
        {} \
        "libtlsdesc1n.so" \
     [list \
        "Run tlsdesc1" \
        "-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { tlsdesc1a.c } \
        "tlsdesc1a" \
        "pass.out" \
     [list \
        "Run tlsdesc1 (-z now)" \
        "-Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { tlsdesc1a.c } \
        "tlsdesc1b" \
        "pass.out" \
     [list \
        "Run tlsdesc1 with PIE" \
        "-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { tlsdesc1a.c } \
        "tlsdesc1c" \
        "pass.out" \
     [list \
        "Run tlsdesc1 with PIE (-z now)" \
        "-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { tlsdesc1a.c } \
        "tlsdesc1d" \
        "pass.out" \
 
-#source: bnd-branch-1.s
+#source: bnd-branch-1.s -mx86-used-note=no
 #as: --64
 #ld: -z now -shared -melf_x86_64 --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 
 #source: bnd-ifunc-1.s
-#as: --64 -madd-bnd-prefix
+#as: --64 -madd-bnd-prefix -mx86-used-note=no
 #ld: -z now -shared -melf_x86_64 -z bndplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 
 
 #source: bnd-ifunc-2.s
-#as: --64 -madd-bnd-prefix
+#as: --64 -madd-bnd-prefix -mx86-used-note=no
 #ld: -z now -shared -melf_x86_64 -z bndplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 
 
-#as: --64 -madd-bnd-prefix
+#as: --64 -madd-bnd-prefix -mx86-used-note=no
 #ld: -shared -melf_x86_64 -z bndplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 
 
 #source: bnd-branch-1.s
-#as: --64
+#as: --64 -mx86-used-note=no
 #ld: -z now -shared -melf_x86_64 -z bndplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 
 
-#source: bnd-branch-1.s
+#source: bnd-branch-1.s -mx86-used-note=no
 #as: --64
 #ld: -shared -melf_x86_64 -z bndplt --hash-style=sysv -z max-page-size=0x200000 -z noseparate-code
 #objdump: -dw
 
     {"Build mpx4"
      "-m elf_x86_64 -z bndplt --hash-style=sysv tmpdir/libcall1.so \
       -z max-page-size=0x200000 -z noseparate-code" ""
-     "--64" {mpx4a.s} {{objdump -dw mpx4.dd}} "mpx4"}
+     "--64 -mx86-used-note=no" {mpx4a.s} {{objdump -dw mpx4.dd}} "mpx4"}
     {"Build mpx3 (-z now)"
      "-z now -m elf_x86_64 -z bndplt --hash-style=sysv tmpdir/libcall.so \
       -z max-page-size=0x200000 -z noseparate-code" ""
-     "--64" {mpx3a.s} {{objdump -dw mpx3n.dd}} "mpx3n"}
+     "--64 -mx86-used-note=no" {mpx3a.s} {{objdump -dw mpx3n.dd}} "mpx3n"}
     {"Build mpx4 (-z now)"
      "-z now -m elf_x86_64 -z bndplt --hash-style=sysv tmpdir/libcall1.so \
       -z max-page-size=0x200000 -z noseparate-code" ""
-     "--64" {mpx4a.s} {{objdump -dw mpx4n.dd}} "mpx4n"}
+     "--64 -mx86-used-note=no" {mpx4a.s} {{objdump -dw mpx4n.dd}} "mpx4n"}
 }
 
 run_ld_link_exec_tests $run_tests
 
     [list \
        "Build no-plt-func1.o no-plt-main1.o" \
        "" \
-       "-fPIE" \
+       "-fPIE -Wa,-mx86-used-note=yes" \
        {no-plt-func1.c no-plt-main1.c} \
     ] \
     [list \
        "Build no-plt-check1.o no-plt-extern1.o" \
        "" \
-       "-Wa,-mrelax-relocations=yes" \
+       "-Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
        {no-plt-check1.S no-plt-extern1.S} \
     ] \
     [list \
        "Build libno-plt-1a.so" \
        "-shared tmpdir/no-plt-func1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libno-plt-1a.so" \
     [list \
        "Build libno-plt-1b.so" \
        "-shared tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr libno-plt-1b.rd} \
         {objdump -dwrj.text libno-plt-1b.dd}} \
        "No PLT (dynamic 1a)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1a.rd} {objdump -dwrj.text no-plt-1a.dd}} \
        "no-plt-1a" \
        "No PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1b.rd} {objdump -dwrj.text no-plt-1b.dd}} \
        "no-plt-1b" \
        "No PLT (dynamic 1c)" \
        "$NOPIE_LDFLAGS tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1c.rd} {objdump -dwrj.text no-plt-1c.dd}} \
        "no-plt-1c" \
        "No PLT (static 1d)" \
        "-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1d.rd} {objdump -dwrj.text no-plt-1d.dd}} \
        "no-plt-1d" \
        "No PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {{readelf -Wr no-plt-1e.rd} {nm -gD no-plt-1e.nd} {objdump -dwrj.text no-plt-1e.dd}} \
        "no-plt-1e" \
        "No PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        {{readelf -Wr no-plt-1f.rd} {objdump -dwrj.text no-plt-1f.dd}} \
        "no-plt-1f" \
        "No PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        {{readelf -Wr no-plt-1g.rd} {objdump -dwrj.text no-plt-1g.dd}} \
        "no-plt-1g" \
        "No PLT (dynamic 1a)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1a" \
        "pass.out" \
        "No PLT (dynamic 1b)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1b" \
        "pass.out" \
        "No PLT (dynamic 1c)" \
        "tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1c" \
        "pass.out" \
        "No PLT (static 1d)" \
        "-static tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1d" \
        "pass.out" \
        "No PLT (PIE 1e)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/no-plt-extern1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1e" \
        "pass.out" \
        "No PLT (PIE 1f)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/libno-plt-1a.so tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1f" \
        "pass.out" \
        "No PLT (PIE 1g)" \
        "-pie tmpdir/no-plt-check1.o tmpdir/no-plt-main1.o \
         tmpdir/no-plt-func1.o tmpdir/libno-plt-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "no-plt-1g" \
        "pass.out" \
        [list \
            "Build pr20253-2a.o pr20253-2b.o pr20253-2c.o pr20253-2d.o" \
            "" \
-           "-fPIE -O2 -g" \
+           "-fPIE -O2 -g -Wa,-mx86-used-note=yes" \
            { pr20253-2a.c pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
        ] \
        [list \
            "Build libpr20253-2a.so" \
            "-shared tmpdir/pr20253-2b.o \
             tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {} \
            "libpr20253-2a.so" \
            "Run pr20253-2a" \
            "tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
             tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2a" \
            "pass.out" \
            "Run pr20253-2b" \
            "--static tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
            tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2b" \
            "pass.out" \
            "Run pr20253-2c" \
            "-pie tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \
            tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2c" \
            "pass.out" \
        [list \
            "Run pr20253-2d" \
            "tmpdir/pr20253-2a.o tmpdir/libpr20253-2a.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2d" \
            "pass.out" \
        [list \
            "Run pr20253-2e" \
            "-pie tmpdir/pr20253-2a.o tmpdir/libpr20253-2a.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr20253-2e" \
            "pass.out" \
        [list \
            "Run pr20253-2f" \
            "$NOPIE_LDFLAGS tmpdir/pr20253-2a.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
            "pr20253-2f" \
            "pass.out" \
        [list \
            "Run pr20253-2g" \
            "--static tmpdir/pr20253-2a.o" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \
            "pr20253-2g" \
            "pass.out" \
 
 #source: pr23486a.s
 #source: pr23486b.s
-#as: --x32
+#as: --x32 -mx86-used-note=no
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 
 #source: pr23486a.s
 #source: pr23486b.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=no
 #ld: -r -m elf_x86_64
 #readelf: -n
 
 
 #source: pr23486b.s
 #source: pr23486a.s
-#as: --x32
+#as: --x32 -mx86-used-note=no
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 
 #source: pr23486b.s
 #source: pr23486a.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=no
 #ld: -r -m elf_x86_64
 #readelf: -n
 
 
--- /dev/null
+#...
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
+      Properties: no copy on protected 
+       x86 ISA used: <None>
+       x86 feature used: x86
+
+#pass
 
--- /dev/null
+#...
+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 used: <None>
+       x86 feature used: x86
+
+#pass
 
--- /dev/null
+#...
+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: CMOV, SSE
+       x86 ISA used: SSE, SSE3
+       x86 feature used: x86
+#pass
 
--- /dev/null
+#...
+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: CMOV, SSE, SSE3
+       x86 ISA used: CMOV, SSE, SSE3
+       x86 feature used: x86
+#pass
 
--- /dev/null
+#...
+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: CMOV, SSE, SSE3
+       x86 ISA used: CMOV, SSE, SSE3
+       x86 feature used: x86
+#pass
 
--- /dev/null
+#...
+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
+       no copy on protected 
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-3.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -shared -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -shared -m elf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
        x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-4a.s
 #source: property-x86-4b.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -m elf32_x86_64 --gc-sections --entry=main
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000008      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x0000002c      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
+       x86 feature needed: x86
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-4a.s
 #source: property-x86-4b.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -m elf_x86_64 --gc-sections --entry=main
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000008      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000038      NT_GNU_PROPERTY_TYPE_0
       Properties: no copy on protected 
+       x86 feature needed: x86
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
 #source: property-x86-ibt.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
 #source: property-x86-ibt.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
 #source: property-x86-empty.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
 #source: property-x86-empty.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-3.s
 #source: property-x86-ibt.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-3.s
 #source: property-x86-ibt.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
 #source: property-x86-3.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-ibt.s
 #source: property-x86-3.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-empty.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64 -z ibt
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64 -z ibt
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: start.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64 -z ibt
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: start.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64 -z ibt
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: IBT
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
 #source: property-x86-shstk.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
 #source: property-x86-shstk.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
 #source: property-x86-empty.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000018      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
 #source: property-x86-empty.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size      Description
+  GNU                  0x00000020      NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-3.s
 #source: property-x86-shstk.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-3.s
 #source: property-x86-shstk.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
 #source: property-x86-3.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-shstk.s
 #source: property-x86-3.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 ISA needed: CMOV, SSE, SSSE3, SSE4_1
+       x86 ISA used: SSE, SSE3, SSE4_1, AVX
+       x86 feature used: x86
 
 #source: property-x86-empty.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64 -z shstk
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: property-x86-empty.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64 -z shstk
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: start.s
-#as: --x32
+#as: --x32 -mx86-used-note=yes
 #ld: -r -m elf32_x86_64 -z shstk
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x0000000c      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000024      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
 #source: start.s
-#as: --64 -defsym __64_bit__=1
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
 #ld: -r -melf_x86_64 -z shstk
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
   Owner                 Data size      Description
-  GNU                  0x00000010      NT_GNU_PROPERTY_TYPE_0
+  GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
       Properties: x86 feature: SHSTK
+       x86 ISA used: <None>
+       x86 feature used: x86
 
     [list \
        "Build tls-def1.o tls-main1.o" \
        "" \
-       "-fPIE" \
+       "-fPIE -Wa,-mx86-used-note=yes" \
        {tls-def1.c tls-main1.c} \
     ] \
     [list \
        "Build tls-gd1.o tls-ld1.o" \
        "" \
-       "-fPIC -Wa,-mrelax-relocations=yes" \
+       "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
        {tls-gd1.S tls-ld1.S} \
     ] \
     [list \
        "Build libtls-1a.so" \
        "-shared tmpdir/tls-def1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libtls-1a.so" \
     [list \
        "Build libtls-1b.so" \
        "-shared tmpdir/tls-gd1.o tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libtls-1b.so" \
     [list \
        "Build libtls-1bn.so" \
        "-Wl,-z,now -shared tmpdir/tls-gd1.o tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        {dummy.s} \
        {} \
        "libtls-1bn.so" \
        "TLS GD/LD -> LE transition without PLT (dynamic)" \
        "tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1a" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (dynamic, -z now)" \
        "-Wl,-z,now tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1an" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (PIE)" \
        "-pie tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1b" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (PIE, -z now)" \
        "-pie -Wl,-z,now tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1bn" \
        "pass.out" \
        "TLS GD/LD -> LE transition without PLT (static)" \
        "-static tmpdir/tls-def1.o tmpdir/tls-main1.o tmpdir/tls-gd1.o \
         tmpdir/tls-ld1.o" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1c" \
        "pass.out" \
        "TLS GD/LD -> IE transition without PLT" \
        "-Wl,--no-as-needed,-R,tmpdir tmpdir/tls-main1.o \
         tmpdir/tls-gd1.o tmpdir/tls-ld1.o tmpdir/libtls-1a.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1d" \
        "pass.out" \
        "TLS GD/LD -> IE transition without PLT (-z now)" \
        "-Wl,-z,now tmpdir/tls-main1.o tmpdir/tls-gd1.o tmpdir/tls-ld1.o \
         tmpdir/libtls-1a.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1dn" \
        "pass.out" \
        "TLS without PLT (1)" \
        "-Wl,--no-as-needed,-R,tmpdir tmpdir/tls-main1.o \
         tmpdir/libtls-1a.so tmpdir/libtls-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1e" \
        "pass.out" \
        "TLS without PLT (2)" \
        "-Wl,--no-as-needed,-R,tmpdir tmpdir/tls-main1.o \
         tmpdir/tls-def1.o tmpdir/libtls-1b.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1f" \
        "pass.out" \
        "TLS without PLT (3)" \
        "-Wl,--no-as-needed -Wl,-z,now tmpdir/tls-main1.o \
         tmpdir/libtls-1a.so tmpdir/libtls-1bn.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1en" \
        "pass.out" \
        "TLS without PLT (4)" \
        "-Wl,-z,now tmpdir/tls-main1.o tmpdir/tls-def1.o \
         tmpdir/libtls-1bn.so -Wl,-R,tmpdir" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { dummy.s } \
        "tls-1fn" \
        "pass.out" \
     [list \
        "Build libtlsdesc1.so" \
        "-shared" \
-       "-fPIC $GNU2_CFLAGS" \
+       "-fPIC $GNU2_CFLAGS -Wa,-mx86-used-note=yes" \
        { tlsdesc1b.c } \
        {} \
        "libtlsdesc1.so" \
     [list \
        "Build libtlsdesc1n.so" \
        "-Wl,-z,now -shared" \
-       "-fPIC $GNU2_CFLAGS" \
+       "-fPIC $GNU2_CFLAGS -Wa,-mx86-used-note=yes" \
        { tlsdesc1b.c } \
        {} \
        "libtlsdesc1n.so" \
        [list \
            "Run tlsdesc1" \
            "-Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { tlsdesc1a.c } \
            "tlsdesc1a" \
            "pass.out" \
        [list \
            "Run tlsdesc1 with PIE" \
            "-pie -Wl,--no-as-needed tmpdir/libtlsdesc1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { tlsdesc1a.c } \
            "tlsdesc1c" \
            "pass.out" \
     [list \
        "Run tlsdesc1 (-z now)" \
        "-Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { tlsdesc1a.c } \
        "tlsdesc1b" \
        "pass.out" \
     [list \
        "Run tlsdesc1 with PIE (-z now)" \
        "-pie -Wl,-z,now -Wl,--no-as-needed tmpdir/libtlsdesc1n.so" \
-       "" \
+       "-Wa,-mx86-used-note=yes" \
        { tlsdesc1a.c } \
        "tlsdesc1d" \
        "pass.out" \
 
     set emul "elf_x86_64"
 }
 
+global ASFLAGS
+set saved_ASFLAGS "$ASFLAGS"
+set ASFLAGS "$ASFLAGS -mx86-used-note=no"
+
 # List contains test-items with 3 items followed by 2 lists:
 # 0:name 1:ld early options 2:ld late options 3:assembler options
 # 4:filenames of assembler files 5: action and options. 6: name of output file
 
     run_ld_link_tests {
        {"X32 DSO from x86-64 object"
-        "-shared -melf32_x86_64 tmpdir/simple-x32.o" "" "--x32"
+        "-shared -melf32_x86_64 tmpdir/simple-x32.o" ""
+        "--x32 -mx86-used-note=yes"
        {dummy.s} {{readelf {-s --wide} x86-64-x32.rd}} "x86-64-x32"}
     }
 
        [list \
            "Build plt-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { plt-lib.c } \
            {} \
            "libplt-lib.so" \
        [list \
            "Build libplt-main1.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
            { plt-main1.c } \
            {{readelf {-Wr} plt-main1.rd}} \
            "libplt-main1.a" \
        [list \
            "Build libplt-main2.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
            { plt-main2.c } \
            {{readelf {-Wr} plt-main2.rd}} \
            "libplt-main2.a" \
        [list \
            "Build libplt-main3.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes $PLT_CFLAGS" \
            { plt-main3.c } \
            {{readelf {-Wr} plt-main3.rd}} \
            "libplt-main3.a" \
        [list \
            "Build libplt-main4.a" \
            "" \
-           "-fPIC -Wa,-mrelax-relocations=yes $PLT_CFLAGS" \
+           "-fPIC -Wa,-mrelax-relocations=yes,-mx86-used-note=yes $PLT_CFLAGS" \
            { plt-main4.c } \
            {{readelf {-Wr} plt-main4.rd}} \
            "libplt-main4.a" \
            "Build plt-main with PIE" \
            "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
             tmpdir/plt-main4.o tmpdir/libplt-lib.so -pie" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            {{readelf {-Wr} plt-main.rd}} \
            "plt-main" \
        [list \
            "Build copyreloc-lib.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { copyreloc-lib.c } \
            {} \
            "copyreloc-lib.so" \
        [list \
            "Build libcopyreloc-main.a" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { copyreloc-main.S } \
            {} \
            "libcopyreloc-main.a" \
        [list \
            "Build copyreloc-main with PIE without -fPIE (1)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main1.rd}} \
            "copyreloc-main" \
        [list \
            "Build copyreloc-main with PIE without -fPIE (2)" \
            "tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} copyreloc-main2.rd}} \
            "copyreloc-main" \
        [list \
            "Build pr17689.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr17689a.c } \
            {} \
            "pr17689.so" \
        [list \
            "Build pr17689now.so with -z now" \
            "-shared -Wl,-z,now" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr17689a.c } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now.so" \
        [list \
            "Build pr17689b.o" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr17689b.S } \
            {} \
        ] \
        [list \
            "Build pr17689 with PIE without -fPIE" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} pr17689.rd}} \
            "pr17689" \
        [list \
            "Build pr17689 with PIE -z now without -fPIE" \
            "tmpdir/pr17689b.o tmpdir/pr17689.so -pie -Wl,-z,now" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} pr17689now.rd}} \
            "pr17689now" \
        [list \
            "Build pr17827 with PIE without -fPIE" \
            "-Wl,--as-needed tmpdir/pr17689b.o tmpdir/pr17689.so -pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wr} pr17827.rd}} \
            "pr17827" \
        [list \
            "Build pr18900.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr18900a.c } \
            "" \
            "pr18900.so" \
        [list \
            "Build pr18900.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr18900b.c pr18900c.c } \
            "" \
            "pr18900.o" \
        [list \
            "Build pr18900a" \
            "tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900a.rd}} \
            "pr18900a" \
        [list \
            "Build pr18900b" \
            "-Wl,--as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            {{readelf {-Wrd} pr18900b.rd}} \
            "pr18900b" \
        [list \
            "Build pr19031.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr19031a.c } \
            "" \
            "pr19031.so" \
        [list \
            "Build gotpcrel1d.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { gotpcrel1d.S } \
            "" \
            "gotpcrel1d.so" \
        [list \
            "Build gotpcrel1a.o gotpcrel1b.o gotpcrel1c.o" \
            "" \
-           "-Wa,-mrelax-relocations=yes" \
+           "-Wa,-mrelax-relocations=yes,-mx86-used-note=yes" \
            { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
        ] \
        [list \
            "$NOPIE_LDFLAGS -Wl,--as-needed tmpdir/gotpcrel1a.o \
             tmpdir/gotpcrel1b.o tmpdir/gotpcrel1c.o \
             tmpdir/gotpcrel1d.so" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
-           "" \
            {{objdump {-dw} gotpcrel1.dd}} \
            "gotpcrel1" \
        ] \
        [list \
            "Build pr19319.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19319a.S } \
            "" \
            "pr19319.so" \
        [list \
            "Build pr19319" \
            "-pie -nostdlib -nostartfiles tmpdir/pr19319.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19319b.S } \
            {{objdump {-dw} pr19319.dd}} \
            "pr19319" \
        [list \
            "Build property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1" \
        [list \
            "Build property 1 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
-           {{readelf {-n} property-1.r}} \
+           {{readelf {-n} property-1a.r}} \
            "property-1.o" \
        ] \
        [list \
            "Build property 1 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=no" \
            {pass.c property-no-copy.S} \
            {{readelf {-n} property-1.r}} \
            "property-1.so" \
        [list \
            "Build property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=no" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2" \
        [list \
            "Build property 2 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
-           {{readelf {-n} property-2.r}} \
+           {{readelf {-n} property-2a.r}} \
            "property-2.o" \
        ] \
        [list \
            "Build property 2 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            {{readelf {-n} property-2.r}} \
            "property-2.so" \
        [list \
            "Build property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S} \
            {{readelf {-n} property-3.r}} \
            "property-3" \
        [list \
            "Build property 3 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-3.r}} \
+           {{readelf {-n} property-3a.r}} \
            "property-3.o" \
        ] \
        [list \
            "Build property 3 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-3.r}} \
            "property-3.so" \
        [list \
            "Build property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
        [list \
            "Build property 4 (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-4.r}} \
+           {{readelf {-n} property-4a.r}} \
            "property-4.o" \
        ] \
        [list \
            "Build property 4 (.so)" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-4.r}} \
            "property-4.so" \
        [list \
            "Build property 4 (-Wl,-z,stack-size=0)" \
            "-Wl,-z,stack-size=0" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-4.r}} \
            "property-4" \
        [list \
            "Build property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            {{readelf {-n} property-5.r}} \
            "property-5" \
        [list \
            "Build property 5 (.o)" \
            "-r -nostdlib -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
-           {{readelf {-n} property-5.r}} \
+           {{readelf {-n} property-5a.r}} \
            "property-5.o" \
        ] \
        [list \
            "Build property 5 (.so)" \
            "-shared -Wl,-z,stack-size=0x900000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            {{readelf {-n} property-5.r}} \
            "property-5.so" \
        [list \
            "Build property-6.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {property-6a.c property-6c.S} \
            {{readelf {-n} property-6.r}} \
            "property-6.so" \
        [list \
            "Build property-6.o" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-6b.c property-stack.S} \
-           {{readelf {-n} property-2.r}} \
+           {{readelf {-n} property-2a.r}} \
            "property-6.o" \
        ] \
        [list \
            "Build property-6" \
            "-Wl,--as-needed tmpdir/property-6.o tmpdir/property-6.so" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
-           "" \
            {{readelf {-n} property-2.r}} \
            "property-6" \
        ] \
        [list \
            "Build property 7a (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-unsorted-1.S} \
-           {{readelf {-n} property-7.r}} \
+           {{readelf {-n} property-7a.r}} \
            "property-7a.o" \
        ] \
        [list \
            "Build property 7b (.o)" \
            "-r -nostdlib" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-unsorted-2.S} \
-           {{readelf {-n} property-7.r}} \
+           {{readelf {-n} property-7a.r}} \
            "property-7b.o" \
        ] \
        [list \
            "Build pr22001-1.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22001-1a.c } \
            {} \
            "pr22001-1.so" \
        [list \
            "Build pr22001-1a" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            {{error_output "pr22001-1a.err"}} \
            "pr22001-1a" \
        [list \
            "Build pr21997-1.so" \
            "-shared" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { property-stack.S property-no-copy.S pr21997-1a.S } \
            {} \
            "pr21997-1.so" \
        [list \
            "Build pr21997-1a" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            {{error_output "pr21997-1a.err"}} \
            "pr21997-1a" \
        [list \
            "Build pr22064a.o" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22064a.S } \
        ] \
        [list \
            "Build pr22064.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22064b.c } \
            {} \
            "pr22064.so" \
        [list \
            "Build pr22393-3a.so" \
            "-shared -Wl,-z,separate-code,-z,max-page-size=0x1000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {pr22393-3a.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
        [list \
            "Build pr22393-3a-now.so" \
            "-shared -Wl,-z,separate-code,-z,now,-z,max-page-size=0x1000" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            {pr22393-3a.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
        [list \
            "Build pr22393-3" \
            "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
        [list \
            "Build pr22393-3 (PIE)" \
            "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \
-           "-fPIE" \
+           "-fPIE -Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
        [list \
            "Build pr22393-3 (static)" \
            "-static -Wl,-z,separate-code,-z,max-page-size=0x1000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3a.c pr22393-3b.c} \
            {{readelf -lW pr22393-3a.rd} \
             {readelf -lW pr22393-3b.rd}} \
        [list \
            "Build pr22791-1.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22791-1a.c } \
            {} \
            "pr22791-1.so" \
        [list \
            "Build pr22791-1" \
            "-pie -Wl,--no-as-needed tmpdir/pr22791-1.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-1b.s } \
            {{error_output "pr22791-1.err"}} \
            "pr22791-1" \
        [list \
            "Build pr22791-2a.o" \
            "" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-2a.s } \
        ] \
        [list \
            "Build pr22791-2.so" \
            "-shared tmpdir/pr22791-2a.o" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22791-2b.c } \
            {{readelf -drW pr22791-2.rd}} \
            "pr22791-2.so" \
        [list \
            "Build pr22791-2" \
            "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \
-           "$NOPIE_CFLAGS" \
+           "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
            { pr22791-2c.s } \
            {{readelf -drW pr22791-2.rd}} \
            "pr22791-2" \
        [list \
            "Build pr22842.so" \
            "-shared" \
-           "-fPIC" \
+           "-fPIC -Wa,-mx86-used-note=yes" \
            { pr22842a.c } \
            {} \
            "pr22842.so" \
        [list \
            "Build pr22842" \
            "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22842b.S } \
            {{readelf -rW pr22842a.rd} \
             {readelf -rW pr22842b.rd}} \
            [list \
                "Run pr22001-1b" \
                "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr22001-1c.c } \
                "pr22001-1b" \
                "pass.out" \
            [list \
                "Run pr21997-1b" \
                "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr21997-1c.c } \
                "pr21997-1b" \
                "pass.out" \
            [list \
                "Build pr22001-1b" \
                "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-               "$NOPIE_CFLAGS" \
+               "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
                { pr22001-1c.c } \
                {{error_output "pr22001-1b.err"}} \
                "pr22001-1b" \
            [list \
                "Build pr21997-1b" \
                "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-               "$NOPIE_CFLAGS" \
+               "$NOPIE_CFLAGS -Wa,-mx86-used-note=yes" \
                { pr21997-1c.c } \
                {{error_output "pr21997-1b.err"}} \
                "pr21997-1b" \
            "Run plt-main" \
            "-Wl,--no-as-needed tmpdir/plt-main1.o tmpdir/plt-main2.o \
             tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main" \
            "plt-main.out" \
            "Run plt-main with PIE" \
            "-Wl,--no-as-needed -pie tmpdir/plt-main1.o tmpdir/plt-main2.o \
             tmpdir/plt-main3.o tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { plt-main5.c } \
            "plt-main-pie" \
            "plt-main.out" \
        [list \
            "Run copyreloc-main with PIE without -fPIE" \
            "-Wl,--as-needed -pie tmpdir/copyreloc-main.o tmpdir/copyreloc-lib.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "copyreloc-main" \
            "copyreloc-main.out" \
        [list \
            "Run pr17689 with PIE without -fPIE" \
            "-Wl,--no-as-needed -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr17689" \
            "pr17689.out" \
        [list \
            "Run pr17689 with PIE -z now without -fPIE" \
            "-Wl,--as-needed,-z,now -pie tmpdir/pr17689b.o tmpdir/pr17689.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr17689now" \
            "pr17689.out" \
        [list \
            "Run pr18900" \
            "-Wl,--no-as-needed tmpdir/pr18900.o tmpdir/pr18900.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr18900" \
            "pr18900.out" \
        [list \
            "Run pr19031" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr19031.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr19031b.S pr19031c.c } \
            "pr19031" \
            "pr19031.out" \
        [list \
            "Run gotpcrel1" \
            "-Wl,--no-as-needed tmpdir/gotpcrel1d.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { gotpcrel1a.S gotpcrel1b.c gotpcrel1c.c } \
            "gotpcrel1" \
            "gotpcrel1.out" \
        [list \
            "Run property 1" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1" "pass.out" \
        ] \
        [list \
            "Run property 1 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 1 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-no-copy.S} \
            "property-1-static" "pass.out" \
        ] \
        [list \
            "Run property 2" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-2" "pass.out" \
        ] \
        [list \
            "Run property 2 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-2-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 2 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
        [list \
            "Run property 3" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S} \
            "property-3" "pass.out" \
        ] \
        [list \
            "Run property 3 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-1.S property-stack.S} \
            "property-3-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 3 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-1.S pass.c property-stack.S} \
            "property-3-static" "pass.out" \
        ] \
        [list \
            "Run property 4" \
            "" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            "property-4" "pass.out" \
        ] \
        [list \
            "Run property 4 (PIE)" \
            "-pie" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
            "property-4-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 4 (static)" \
            "-static" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            "property-4-static" "pass.out" \
        ] \
        [list \
            "Run property 5" \
            "-Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-stack.S property-x86-1.S property-x86-2.S} \
            "property-5" "pass.out" \
        ] \
        [list \
            "Run property 5 (PIE)" \
            "-pie -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pass.c property-x86-2.S property-x86-1.S property-stack.S} \
            "property-5-pie" "pass.out" "-fPIE" \
        ] \
        [list \
            "Run property 5 (static)" \
            "-static -Wl,-z,stack-size=0x900000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {property-x86-2.S property-x86-1.S pass.c property-stack.S} \
            "property-5-static" "pass.out" \
        ] \
        [list \
            "Run pr22001-1a (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1a-pic-1" \
            "pass.out" \
        [list \
            "Run pr22001-1a (PIC 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1b.c } \
            "pr22001-1a-pic-2" \
            "pass.out" \
        [list \
            "Run pr22001-1b (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.c } \
            "pr22001-1b-pic-1" \
            "pass.out" \
        [list \
            "Run pr22001-1b (PIC 2)" \
            "-pie -Wl,-z,nocopyreloc,--no-as-needed tmpdir/pr22001-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22001-1c.c } \
            "pr22001-1b-pic-2" \
            "pass.out" \
        [list \
            "Run pr21997-1a (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1a-pic-1" \
            "pass.out" \
        [list \
            "Run pr21997-1a (PIC 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1b.c } \
            "pr21997-1a-pic-2" \
            "pass.out" \
        [list \
            "Run pr21997-1b (PIC 1)" \
            "$NOPIE_LDFLAGS -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.c } \
            "pr21997-1b-pic-1" \
            "pass.out" \
        [list \
            "Run pr21997-1b (PIC 2)" \
            "-pie -Wl,--no-as-needed tmpdir/pr21997-1.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr21997-1c.c } \
            "pr21997-1b-pic-2" \
            "pass.out" \
        [list \
            "Run pr22064" \
            "-pie -Wl,--no-as-needed tmpdir/pr22064a.o tmpdir/pr22064.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { dummy.s } \
            "pr22064-pie" \
            "pass.out" \
        [list \
            "Run pr22393-3" \
            "$NOPIE_LDFLAGS -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            "pr22393-3" \
            "pass.out" \
        [list \
            "Run pr22393-3 (PIE)" \
            "-pie -Wl,-z,separate-code,-z,max-page-size=0x1000,--no-as-needed tmpdir/pr22393-3a-now.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3b.c} \
            "pr22393-3-pie" \
            "pass.out" \
        [list \
            "Run pr22393-3 (static)" \
            "-static -Wl,-z,separate-code,-z,max-page-size=0x1000" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            {pr22393-3a.c pr22393-3b.c} \
            "pr22393-3-static" \
            "pass.out" \
        [list \
            "Run pr22791-2" \
            "-pie -Wl,--no-as-needed tmpdir/pr22791-2.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22791-2c.s } \
            "pr22791-2" \
            "pass.out" \
        [list \
            "Build pr22842" \
            "-pie -Wl,--no-as-needed tmpdir/pr22842.so" \
-           "" \
+           "-Wa,-mx86-used-note=yes" \
            { pr22842b.S } \
            "pr22842" \
            "pass.out" \
            [list \
                "Build libpr19784a.so" \
                "-shared -Wl,-Bsymbolic-functions" \
-               "-fPIC -O2 -g" \
+               "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
                { pr19784b.c pr19784c.c } \
                {} \
                "libpr19784a.so" \
            [list \
                "Build libpr19784b.so" \
                "-shared -Wl,-Bsymbolic-functions" \
-               "-fPIC -O2 -g" \
+               "-fPIC -O2 -g -Wa,-mx86-used-note=yes" \
                { pr19784c.c pr19784b.c } \
                {} \
                "libpr19784b.so" \
            [list \
                "Build pr19784a.o" \
                "" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr19784a.c } \
            ] \
        ]
            [list \
                "Run pr19784a" \
                "-Wl,--no-as-needed tmpdir/pr19784a.o tmpdir/libpr19784a.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.s } \
                "pr19784a" \
                "pass.out" \
            [list \
                "Run pr19784b" \
                "-Wl,--as-needed tmpdir/pr19784a.o tmpdir/libpr19784b.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { dummy.s } \
                "pr19784b" \
                "pass.out" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-bnd" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-bnd-now" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z bndplt -z now -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                {{readelf {-SW} plt-main-bnd-now.rd} {objdump {-drw} plt-main-bnd.dd}} \
                "plt-main-pie-bnd-now" \
                "-Wl,--no-as-needed,-z,bndplt tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-bnd" \
                "plt-main.out" \
                "-Wl,--no-as-needed,-z,bndplt -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-bnd" \
                "plt-main.out" \
                "-Wl,--no-as-needed,-z,bndplt,-z,now tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-bnd-now" \
                "plt-main.out" \
                "-Wl,--no-as-needed,-z,bndplt,-z,now -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-bnd-now" \
                "plt-main.out" \
            [list \
                "Run pr20800" \
                "-Wl,-z,now -pie" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { pr20800a.S pr20800b.S } \
                "pr20800" \
                "pass.out" \
                [list \
                    "Run pr21481a" \
                    "$NOPIE_LDFLAGS -Wl,-z,bndplt" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481a" \
                    "pass.out" \
                [list \
                    "Run pr21481b" \
                    "$NOPIE_LDFLAGS -Wl,-z,bndplt,-z,now" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481b" \
                    "pass.out" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltdump \
                "plt-main-ibt" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltdump \
                "plt-main-pie-ibt" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltsecdump \
                "plt-main-ibt-now" \
                "tmpdir/plt-main1.o tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so -z ibtplt -z now -pie \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                $pltsecdump \
                "plt-main-pie-ibt-now" \
                "Build libibtplt-lib.so with -z ibtplt" \
                "-shared -z ibtplt \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
                $pltdump \
                "libibtplt-lib.so" \
                "Build libibtplt--now-lib.so with -z ibtplt -z now" \
                "-shared -z ibtplt -z now \
                 -z noseparate-code -z max-page-size=0x200000" \
-               "-fPIC" \
+               "-fPIC -Wa,-mx86-used-note=yes" \
                { plt-main1.c plt-main2.c plt-main3.c plt-main4.c} \
                $pltdump \
                "libibtplt-now-lib.so" \
                "-Wl,--no-as-needed,-z,ibtplt tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt" \
                "plt-main.out" \
                "-Wl,--no-as-needed,-z,ibtplt -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-ibt" \
                "plt-main.out" \
                "-Wl,--no-as-needed,-z,ibtplt,-z,now tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt-now" \
                "plt-main.out" \
                "-Wl,--no-as-needed,-z,ibtplt,-z,now -pie tmpdir/plt-main1.o \
                 tmpdir/plt-main2.o tmpdir/plt-main3.o \
                 tmpdir/plt-main4.o tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-pie-ibt-now" \
                "plt-main.out" \
                "Run plt-main with libibtplt-lib.so -z ibtplt" \
                "-Wl,--no-as-needed,-z,ibtplt tmpdir/libibtplt-lib.so \
                 tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt-lib" \
                "plt-main.out" \
                "Run plt-main with libibtplt-lib.so -z ibtplt -z now" \
                "-Wl,--no-as-needed,-z,ibtplt,-z,now \
                 tmpdir/libibtplt-now-lib.so tmpdir/libplt-lib.so" \
-               "" \
+               "-Wa,-mx86-used-note=yes" \
                { plt-main5.c } \
                "plt-main-ibt-now-lib" \
                "plt-main.out" \
                [list \
                    "Run pr21481a" \
                    "$NOPIE_LDFLAGS -Wl,-z,ibtplt" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481a" \
                    "pass.out" \
                [list \
                    "Run pr21481b" \
                    "$NOPIE_LDFLAGS -Wl,-z,ibtplt,-z,now" \
-                   "" \
+                   "-Wa,-mx86-used-note=yes" \
                    { pr21481a.c pr21481b.S } \
                    "pr21481b" \
                    "pass.out" \
 }
 
 if { ![istarget "x86_64-*-linux*"]} {
+    set ASFLAGS "$saved_ASFLAGS"
     return
 }
 
        "Build pr21626.so" \
        "-shared -melf_x86_64" \
        "" \
-       "--64 -defsym __64_bit__=1" \
+       "--64 -defsym __64_bit__=1 -mx86-used-note=yes" \
        {property-x86-3.s} \
        "" \
        "pr21626.so" \
        "Build pr21626" \
        "-melf_x86_64 tmpdir/pr21626.so" \
        "" \
-       "--64" \
+       "--64 -mx86-used-note=yes" \
        {start.s foo.s} \
        "" \
        "pr21626" \
 run_dump_test "ibt-plt-3b-x32"
 run_dump_test "ibt-plt-3c-x32"
 run_dump_test "ibt-plt-3d-x32"
+
+set ASFLAGS "$saved_ASFLAGS"