+2021-06-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/ld-elf/property-and-1.d: Skip am33_2.0, hppa-hpux
+       and mn10300.
+       Pass --generate-missing-build-notes=no to assembler.  Allow
+       other note sections for xtensa.
+       * testsuite/ld-elf/property-and-2.d: Likewise.
+       * testsuite/ld-elf/property-and-3.d: Likewise.
+       * testsuite/ld-elf/property-and-4.d: Likewise.
+       * testsuite/ld-elf/property-or-1.d: Likewise.
+       * testsuite/ld-elf/property-or-2.d: Likewise.
+       * testsuite/ld-elf/property-or-3.d: Likewise.
+       * testsuite/ld-elf/property-or-4.d: Likewise.
+
 2021-06-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        * ld.texi: Move -z unique-symbol after -z undefs.
 
 #source: empty.s
 #source: property-and-1.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
+
+#failif
+#...
+Displaying notes found in: .note.gnu.property
+#pass
 
 #source: property-and-1.s
 #source: empty.s
 #source: property-and-2.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
+
+#failif
+#...
+Displaying notes found in: .note.gnu.property
+#pass
 
 #source: property-and-1.s
 #source: property-and-empty.s
 #source: property-and-2.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
+
+#failif
+#...
+Displaying notes found in: .note.gnu.property
+#pass
 
 #source: property-and-1.s
 #source: property-and-2.s
 #source: property-and-3.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
 
+#...
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: UINT32_AND \(0xb0007fff\): 0x1
+#pass
 
 #source: empty.s
 #source: property-or-1.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
 
+#...
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: UINT32_OR \(0xb000ffff\): 0x3
+#pass
 
 #source: property-or-1.s
 #source: empty.s
 #source: property-or-2.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
 
+#...
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: UINT32_OR \(0xb000ffff\): 0x103
+#pass
 
 #source: property-or-1.s
 #source: property-and-empty.s
 #source: property-or-2.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
 
+#...
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: UINT32_OR \(0xb000ffff\): 0x103
+#pass
 
 #source: property-or-1.s
 #source: property-or-2.s
 #source: property-or-3.s
-#as:
+#as: --generate-missing-build-notes=no
 #ld: -shared
 #readelf: -n
 #xfail: ![check_shared_lib_support]
+#notarget: am33_2.0-*-* hppa*-*-hpux* mn10300-*-*
+# Assembly source file for the HPPA assembler is renamed and modifed by
+# sed.  mn10300 has relocations in .note.gnu.property section which
+# elf_parse_notes doesn't support.
 
+#...
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x[0-9a-f]+     NT_GNU_PROPERTY_TYPE_0
       Properties: UINT32_OR \(0xb000ffff\): 0x1103
+#pass