Commit: Update gas tests to work when toolchain is configured to generate build notes

Message ID 87v9wjchyn.fsf@redhat.com
State New
Headers show
Series
  • Commit: Update gas tests to work when toolchain is configured to generate build notes
Related show

Commit Message

Nick Clifton July 3, 2019, 2:26 p.m.
Hi Guys,

  I am applying the attached patch to update the gas testsuite so that
  the tests will continue to work even if the toolchain has been
  configured with --enable-generate-build-notes.

Cheers
  Nick

gas/ChangeLog
2019-07-03  Nick Clifton  <nickc@redhat.com>

	* testsuite/gas/aarch64/codealign.d: Update to work with a
	toolchain configured to generate build notes.
	* testsuite/gas/aarch64/codealign_1.d: Likewise.
	* testsuite/gas/aarch64/dwarf.d: Likewise.
	* testsuite/gas/aarch64/mapmisc.d: Likewise.
	* testsuite/gas/aarch64/mapping.d: Likewise.
	* testsuite/gas/aarch64/mapping2.d: Likewise.
	* testsuite/gas/aarch64/mapping3.d: Likewise.
	* testsuite/gas/aarch64/mapping4.d: Likewise.
	* testsuite/gas/aarch64/mapping_5.d: Likewise.
	* testsuite/gas/aarch64/mapping_6.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_1.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_10.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_11.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_12.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_13.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_14.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_15.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_16.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_17.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_18.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_19.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_2.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_20.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_21.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_22.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_23.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_24.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_25.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_26.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_27.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_3.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_4.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_5.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_6.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_7.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_8.d: Likewise.
	* testsuite/gas/aarch64/sve-movprfx_9.d: Likewise.
	* testsuite/gas/aarch64/symbol-variant_pcs-1.d: Likewise.
	* testsuite/gas/aarch64/symbol-variant_pcs-2.d: Likewise.
	* testsuite/gas/aarch64/symbol-variant_pcs-3.d: Likewise.
	* testsuite/gas/all/assign.d: Likewise.
	* testsuite/gas/all/none.d: Likewise.
	* testsuite/gas/all/weakref1.d: Likewise.
	* testsuite/gas/arm/got_prel.d: Likewise.
	* testsuite/gas/arm/local_function.d: Likewise.
	* testsuite/gas/arm/mapdir.d: Likewise.
	* testsuite/gas/arm/mapmisc.d: Likewise.
	* testsuite/gas/arm/mapping2.d: Likewise.
	* testsuite/gas/arm/mapping3.d: Likewise.
	* testsuite/gas/arm/mapping4.d: Likewise.
	* testsuite/gas/arm/mapsecs.d: Likewise.
	* testsuite/gas/arm/mapshort-eabi.d: Likewise.
	* testsuite/gas/arm/thumbrel.d: Likewise.
	* testsuite/gas/arm/unwind.d: Likewise.
	* testsuite/gas/cfi/cfi-label.d: Likewise.
	* testsuite/gas/elf/elf.exp: Likewise.
	* testsuite/gas/i386/bss.d: Likewise.
	* testsuite/gas/i386/ifunc-3.d: Likewise.
	* testsuite/gas/i386/ilp32/mixed-mode-reloc64.d: Likewise.
	* 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/mixed-mode-reloc32.d: Likewise.
	* testsuite/gas/i386/mixed-mode-reloc64.d: Likewise.
	* testsuite/gas/i386/nop-6.d: Likewise.
	* testsuite/gas/i386/property-1.d: Likewise.
	* testsuite/gas/i386/property-2.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-nop-6.d: Likewise.
	* testsuite/gas/i386/x86-64-property-1.d: Likewise.
	* testsuite/gas/i386/x86-64-property-2.d: Likewise.
	* testsuite/gas/i386/x86-64-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/macros/irp.d: Likewise.
	* testsuite/gas/macros/repeat.d: Likewise.
	* testsuite/gas/macros/rept.d: Likewise.
	* testsuite/gas/macros/test2.d: Likewise.
	* testsuite/gas/macros/test3.d: Likewise.
	* testsuite/gas/macros/vararg.d: Likewise.
	* testsuite/gas/ppc/astest2.d: Likewise.
	* testsuite/gas/ppc/astest2_64.d: Likewise.
	* testsuite/gas/ppc/astest64.d: Likewise.
	* testsuite/gas/ppc/power4.d: Likewise.
	* testsuite/gas/ppc/test1elf64.d: Likewise.

Patch

diff --git a/gas/testsuite/gas/aarch64/codealign.d b/gas/testsuite/gas/aarch64/codealign.d
index 12da1469b3..a44c1073e0 100644
--- a/gas/testsuite/gas/aarch64/codealign.d
+++ b/gas/testsuite/gas/aarch64/codealign.d
@@ -1,4 +1,5 @@ 
 #objdump: --section-headers
+#as: --generate-missing-build-notes=no
 # Minimum code alignment should be set.
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/aarch64/codealign_1.d b/gas/testsuite/gas/aarch64/codealign_1.d
index 0462cef35c..c4dc527019 100644
--- a/gas/testsuite/gas/aarch64/codealign_1.d
+++ b/gas/testsuite/gas/aarch64/codealign_1.d
@@ -1,4 +1,5 @@ 
 #objdump: --section-headers
+#as: --generate-missing-build-notes=no
 # Minimum code alignment should be set.
 
 .*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/dwarf.d b/gas/testsuite/gas/aarch64/dwarf.d
index 2a75e0badb..12ad367580 100644
--- a/gas/testsuite/gas/aarch64/dwarf.d
+++ b/gas/testsuite/gas/aarch64/dwarf.d
@@ -1,5 +1,5 @@ 
 #readelf: -s --debug-dump=aranges
-#as: -g
+#as: -g --generate-missing-build-notes=no
 
 Symbol table '.symtab' contains 11 entries:
    Num:[ ]+Value[ ]+Size[ ]+Type[ ]+Bind[ ]+Vis[ ]+Ndx[ ]+Name
diff --git a/gas/testsuite/gas/aarch64/mapmisc.d b/gas/testsuite/gas/aarch64/mapmisc.d
index fb30f1431e..1f2df6ea0d 100644
--- a/gas/testsuite/gas/aarch64/mapmisc.d
+++ b/gas/testsuite/gas/aarch64/mapmisc.d
@@ -1,4 +1,4 @@ 
-#as: -EL -I$srcdir/$subdir 
+#as: -EL -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: --syms --special-syms -d
 #name: AArch64 Mapping Symbols for miscellaneous directives
 #source: mapmisc.s
diff --git a/gas/testsuite/gas/aarch64/mapping.d b/gas/testsuite/gas/aarch64/mapping.d
index 46c730fee3..d23c0fdbd5 100644
--- a/gas/testsuite/gas/aarch64/mapping.d
+++ b/gas/testsuite/gas/aarch64/mapping.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as: --generate-missing-build-notes=no
 #name: AArch64 Mapping Symbols
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/aarch64/mapping2.d b/gas/testsuite/gas/aarch64/mapping2.d
index aafc9b0762..4ad1a079aa 100644
--- a/gas/testsuite/gas/aarch64/mapping2.d
+++ b/gas/testsuite/gas/aarch64/mapping2.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as: --generate-missing-build-notes=no
 #name: AArch64 Mapping Symbols Test 2
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/aarch64/mapping3.d b/gas/testsuite/gas/aarch64/mapping3.d
index e4b7246c95..ece7de1cb7 100644
--- a/gas/testsuite/gas/aarch64/mapping3.d
+++ b/gas/testsuite/gas/aarch64/mapping3.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as: --generate-missing-build-notes=no
 #name: AArch64 Mapping Symbols Test 3
 # This test is only valid on ELF based ports.
 #notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
diff --git a/gas/testsuite/gas/aarch64/mapping4.d b/gas/testsuite/gas/aarch64/mapping4.d
index d81a77e847..d0495dafed 100644
--- a/gas/testsuite/gas/aarch64/mapping4.d
+++ b/gas/testsuite/gas/aarch64/mapping4.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as: --generate-missing-build-notes=no
 #name: AArch64 Mapping Symbols Test 4
 # This test is only valid on ELF based ports.
 #notarget: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
diff --git a/gas/testsuite/gas/aarch64/mapping_5.d b/gas/testsuite/gas/aarch64/mapping_5.d
index 4778b3d951..04263484ae 100644
--- a/gas/testsuite/gas/aarch64/mapping_5.d
+++ b/gas/testsuite/gas/aarch64/mapping_5.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as: --generate-missing-build-notes=no
 #name: AArch64 Mapping Symbols Test 5
 
 .*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/mapping_6.d b/gas/testsuite/gas/aarch64/mapping_6.d
index 3a5dfb86a8..96d0ed663c 100644
--- a/gas/testsuite/gas/aarch64/mapping_6.d
+++ b/gas/testsuite/gas/aarch64/mapping_6.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as: --generate-missing-build-notes=no
 #name: AArch64 Mapping Symbols Test 6
 
 .*: +file format.*aarch64.*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_1.d b/gas/testsuite/gas/aarch64/sve-movprfx_1.d
index 6bf892ffce..13035db1d8 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_1.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_1.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_1.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_10.d b/gas/testsuite/gas/aarch64/sve-movprfx_10.d
index 8458738b78..575632f9a4 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_10.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_10.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_10.s
 #warning_output: sve-movprfx_10.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_11.d b/gas/testsuite/gas/aarch64/sve-movprfx_11.d
index 91b5ebba83..71bab8abd5 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_11.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_11.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_11.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_12.d b/gas/testsuite/gas/aarch64/sve-movprfx_12.d
index 78d928b7da..dde3a92696 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_12.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_12.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_12.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_13.d b/gas/testsuite/gas/aarch64/sve-movprfx_13.d
index a74aba20f2..46b0bb0a18 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_13.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_13.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_13.s
 #warning_output: sve-movprfx_13.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_14.d b/gas/testsuite/gas/aarch64/sve-movprfx_14.d
index eaa9200379..1024339a7c 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_14.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_14.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_14.s
 #warning_output: sve-movprfx_14.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_15.d b/gas/testsuite/gas/aarch64/sve-movprfx_15.d
index 8020c7ce06..436e59f826 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_15.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_15.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_15.s
 #warning_output: sve-movprfx_15.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_16.d b/gas/testsuite/gas/aarch64/sve-movprfx_16.d
index 0c760cc055..a6550b7899 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_16.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_16.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_16.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_17.d b/gas/testsuite/gas/aarch64/sve-movprfx_17.d
index 0101300444..ce96138339 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_17.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_17.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_17.s
 #warning_output: sve-movprfx_17.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_18.d b/gas/testsuite/gas/aarch64/sve-movprfx_18.d
index 09d6fa6b10..e158131331 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_18.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_18.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_18.s
 #warning_output: sve-movprfx_18.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_19.d b/gas/testsuite/gas/aarch64/sve-movprfx_19.d
index 8d13b46d1f..bf3b0631ef 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_19.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_19.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_19.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_2.d b/gas/testsuite/gas/aarch64/sve-movprfx_2.d
index 7558a4289c..905c1f4c12 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_2.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_2.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_2.s
 #warning_output: sve-movprfx_2.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_20.d b/gas/testsuite/gas/aarch64/sve-movprfx_20.d
index ae7dda64fd..80621d64ad 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_20.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_20.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_20.s
 #warning_output: sve-movprfx_20.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_21.d b/gas/testsuite/gas/aarch64/sve-movprfx_21.d
index ea53dbea92..20eb85b337 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_21.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_21.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_21.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_22.d b/gas/testsuite/gas/aarch64/sve-movprfx_22.d
index 431d5b6911..de4d1a3693 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_22.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_22.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_22.s
 #warning_output: sve-movprfx_22.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_23.d b/gas/testsuite/gas/aarch64/sve-movprfx_23.d
index af3c5ed1df..6044870417 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_23.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_23.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_23.s
 #warning_output: sve-movprfx_23.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_24.d b/gas/testsuite/gas/aarch64/sve-movprfx_24.d
index b70d59e5ef..ff1bdbe710 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_24.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_24.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_24.s
 #warning_output: sve-movprfx_24.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_25.d b/gas/testsuite/gas/aarch64/sve-movprfx_25.d
index 2b4f654823..83a6500710 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_25.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_25.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_25.s
 #warning_output: sve-movprfx_25.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_26.d b/gas/testsuite/gas/aarch64/sve-movprfx_26.d
index 1f7a85d4e8..f0830cc718 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_26.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_26.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_26.s
 #warning_output: sve-movprfx_26.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_27.d b/gas/testsuite/gas/aarch64/sve-movprfx_27.d
index ef0bc9ad00..e71d1715b6 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_27.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_27.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_27.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_3.d b/gas/testsuite/gas/aarch64/sve-movprfx_3.d
index d56ad28abe..03909dbc62 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_3.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_3.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_3.s
 #warning_output: sve-movprfx_3.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_4.d b/gas/testsuite/gas/aarch64/sve-movprfx_4.d
index 056d67d744..fd71a4bac2 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_4.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_4.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_4.s
 #warning_output: sve-movprfx_4.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_5.d b/gas/testsuite/gas/aarch64/sve-movprfx_5.d
index 99f5a01e59..511cf66c66 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_5.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_5.d
@@ -1,5 +1,5 @@ 
 #source: sve-movprfx_5.s
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_6.d b/gas/testsuite/gas/aarch64/sve-movprfx_6.d
index 92e574c46b..4af626993a 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_6.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_6.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_6.s
 #warning_output: sve-movprfx_6.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_7.d b/gas/testsuite/gas/aarch64/sve-movprfx_7.d
index ce35370385..725a8a8604 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_7.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_7.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_7.s
 #warning_output: sve-movprfx_7.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
@@ -14,4 +14,4 @@  Disassembly of section .*:
 Disassembly of section .*:
 
 0+ <.*>:
-[^:]+:	d65f03c0 	ret  // note: previous `movprfx' sequence not closed
\ No newline at end of file
+[^:]+:	d65f03c0 	ret  // note: previous `movprfx' sequence not closed
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_8.d b/gas/testsuite/gas/aarch64/sve-movprfx_8.d
index d7f8bbaa7a..f853e218b9 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_8.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_8.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_8.s
 #warning_output: sve-movprfx_8.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/sve-movprfx_9.d b/gas/testsuite/gas/aarch64/sve-movprfx_9.d
index 0a316de8d2..54a1733937 100644
--- a/gas/testsuite/gas/aarch64/sve-movprfx_9.d
+++ b/gas/testsuite/gas/aarch64/sve-movprfx_9.d
@@ -1,6 +1,6 @@ 
 #source: sve-movprfx_9.s
 #warning_output: sve-movprfx_9.l
-#as: -march=armv8-a+sve -I$srcdir/$subdir
+#as: -march=armv8-a+sve -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: -Dr -M notes
 
 .* file format .*
diff --git a/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.d b/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.d
index 6257ce1687..ce99514b3d 100644
--- a/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.d
+++ b/gas/testsuite/gas/aarch64/symbol-variant_pcs-1.d
@@ -1,4 +1,5 @@ 
 #objdump: -t
+#as:  --generate-missing-build-notes=no
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.d b/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.d
index d9b60ac8e7..5f46f27236 100644
--- a/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.d
+++ b/gas/testsuite/gas/aarch64/symbol-variant_pcs-2.d
@@ -1,4 +1,5 @@ 
 #objdump: -t
+#as:  --generate-missing-build-notes=no
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.d b/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.d
index 204914efbd..8d05c1a636 100644
--- a/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.d
+++ b/gas/testsuite/gas/aarch64/symbol-variant_pcs-3.d
@@ -1,4 +1,5 @@ 
 #objdump: -t
+#as:  --generate-missing-build-notes=no
 
 .*:     file format .*
 
diff --git a/gas/testsuite/gas/all/assign.d b/gas/testsuite/gas/all/assign.d
index fce7466159..64b39976ec 100644
--- a/gas/testsuite/gas/all/assign.d
+++ b/gas/testsuite/gas/all/assign.d
@@ -4,3 +4,4 @@ 
 #...
 .*zzz.*
 .*zzz.*
+#pass
diff --git a/gas/testsuite/gas/all/none.d b/gas/testsuite/gas/all/none.d
index 2b2f1cbb29..deebab8b49 100644
--- a/gas/testsuite/gas/all/none.d
+++ b/gas/testsuite/gas/all/none.d
@@ -1,4 +1,5 @@ 
 #objdump: -r -w
+#as: --generate-missing-build-notes=no
 # The HPPA maps R_PARISC_PCREL64 onto BFD_RELOC_NONE.
 #skip: ft32-*-* hppa*-*-*
 
diff --git a/gas/testsuite/gas/all/weakref1.d b/gas/testsuite/gas/all/weakref1.d
index 67dea13bab..4c2516409e 100644
--- a/gas/testsuite/gas/all/weakref1.d
+++ b/gas/testsuite/gas/all/weakref1.d
@@ -96,3 +96,4 @@  OFFSET +TYPE +VALUE *
 [0-9a-f]+ [^ ]*  +(ld8|\.text|\$CODE\$)(\+0x[0-9a-f]+)?
 [0-9a-f]+ [^ ]*  +(ld9|\.text|\$CODE\$)(\+0x[0-9a-f]+)?
 [0-9a-f]+ [^ ]*  +(ld9|\.text|\$CODE\$)(\+0x[0-9a-f]+)?
+#pass
diff --git a/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d
index 8068b1fad8..666e9bfec0 100644
--- a/gas/testsuite/gas/arm/got_prel.d
+++ b/gas/testsuite/gas/arm/got_prel.d
@@ -1,6 +1,6 @@ 
 # name: R_ARM_GOT_PREL relocation
 # source: got_prel.s
-# as: -march=armv5te -meabi=5
+# as: -march=armv5te -meabi=5 --generate-missing-build-notes=no
 # readelf: -x 4 -r
 # target: *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
 
diff --git a/gas/testsuite/gas/arm/local_function.d b/gas/testsuite/gas/arm/local_function.d
index ea633a6306..2c473c0c51 100644
--- a/gas/testsuite/gas/arm/local_function.d
+++ b/gas/testsuite/gas/arm/local_function.d
@@ -1,4 +1,5 @@ 
 #objdump: -r
+#as:  --generate-missing-build-notes=no
 #name: Relocations against local function symbols
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince *-*-vxworks
diff --git a/gas/testsuite/gas/arm/mapdir.d b/gas/testsuite/gas/arm/mapdir.d
index a8538440b0..f0e898c2ef 100644
--- a/gas/testsuite/gas/arm/mapdir.d
+++ b/gas/testsuite/gas/arm/mapdir.d
@@ -1,4 +1,4 @@ 
-#as: -EL -I$srcdir/$subdir
+#as: -EL -I$srcdir/$subdir --generate-missing-build-notes=no
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for .arm/.thumb
 # This test is only valid on EABI based ports.
diff --git a/gas/testsuite/gas/arm/mapmisc.d b/gas/testsuite/gas/arm/mapmisc.d
index 0e1d046851..ca984efb67 100644
--- a/gas/testsuite/gas/arm/mapmisc.d
+++ b/gas/testsuite/gas/arm/mapmisc.d
@@ -1,4 +1,4 @@ 
-#as: -EL -I$srcdir/$subdir -mfpu=neon
+#as: -EL -I$srcdir/$subdir -mfpu=neon --generate-missing-build-notes=no
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols for miscellaneous directives
 # This test is only valid on EABI based ports.
diff --git a/gas/testsuite/gas/arm/mapping2.d b/gas/testsuite/gas/arm/mapping2.d
index d275510abd..c2f75c9da7 100644
--- a/gas/testsuite/gas/arm/mapping2.d
+++ b/gas/testsuite/gas/arm/mapping2.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as:  --generate-missing-build-notes=no
 #name: ARM Mapping Symbols Test 2
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/mapping3.d b/gas/testsuite/gas/arm/mapping3.d
index 849f513512..d2aa5860be 100644
--- a/gas/testsuite/gas/arm/mapping3.d
+++ b/gas/testsuite/gas/arm/mapping3.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as:  --generate-missing-build-notes=no
 #name: ARM Mapping Symbols Test 3
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/mapping4.d b/gas/testsuite/gas/arm/mapping4.d
index abd2d50b67..d542eac3bc 100644
--- a/gas/testsuite/gas/arm/mapping4.d
+++ b/gas/testsuite/gas/arm/mapping4.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms
+#as:  --generate-missing-build-notes=no
 #name: ARM Mapping Symbols Test 4
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/arm/mapsecs.d b/gas/testsuite/gas/arm/mapsecs.d
index b2a0e602df..be52636931 100644
--- a/gas/testsuite/gas/arm/mapsecs.d
+++ b/gas/testsuite/gas/arm/mapsecs.d
@@ -1,4 +1,4 @@ 
-#as: -EL
+#as: -EL --generate-missing-build-notes=no
 #objdump: --syms --special-syms -d
 #name: ARM Mapping Symbols with multiple sections
 # This test is only valid on EABI based ports.
diff --git a/gas/testsuite/gas/arm/mapshort-eabi.d b/gas/testsuite/gas/arm/mapshort-eabi.d
index fd6cf91f0d..f46fe9a1b4 100644
--- a/gas/testsuite/gas/arm/mapshort-eabi.d
+++ b/gas/testsuite/gas/arm/mapshort-eabi.d
@@ -1,4 +1,5 @@ 
 #objdump: --syms --special-syms -d
+#as:  --generate-missing-build-notes=no
 #name: ARM Mapping Symbols for .short (EABI version)
 # This test is only valid on EABI based ports.
 #target: *-*-*eabi* *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
diff --git a/gas/testsuite/gas/arm/thumbrel.d b/gas/testsuite/gas/arm/thumbrel.d
index 21839c9266..23d0cd4476 100644
--- a/gas/testsuite/gas/arm/thumbrel.d
+++ b/gas/testsuite/gas/arm/thumbrel.d
@@ -1,4 +1,5 @@ 
 #objdump: -sr
+#as:  --generate-missing-build-notes=no
 # This test is only valid on EABI based ports.
 #target: *-*-*eabi* *-*-symbianelf *-*-nacl*
 
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index e6a5c6d652..3588a278b6 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -1,4 +1,5 @@ 
 #objdump: -sr
+#as:  --generate-missing-build-notes=no
 #name: Unwind table generation
 # This test is only valid on ELF based ports.
 #notarget: *-*-pe *-*-wince
diff --git a/gas/testsuite/gas/cfi/cfi-label.d b/gas/testsuite/gas/cfi/cfi-label.d
index 1c457c88f3..0350b57f13 100644
--- a/gas/testsuite/gas/cfi/cfi-label.d
+++ b/gas/testsuite/gas/cfi/cfi-label.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #objdump: -tWf
 #name: .cfi_label directive
 
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 41abf8706f..eb9bd9c5de 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -179,20 +179,19 @@  if { [is_elf_format] } then {
     run_dump_test "pseudo"
     run_dump_test "section0"
     run_dump_test "section1"
+    # The h8300 port issues a warning message for
+    # new sections created without atrributes.
     if {! [istarget "h8300-*-*"]} then {
-	# The h8300 port issues a warning message for
-	# new sections created without atrributes.
+	set as_flags "-al --generate-missing-build-notes=no"
 	case $target_triplet in {
 	    { i*86-*-* x86_64-*-* } {
-		run_elf_list_test "section2" "$target_machine" "-al -mx86-used-note=no" "-s" ""
+		set as_flags "$as_flags -mx86-used-note=no"
 	    }
 	    { riscv*-*-* } {
-		run_elf_list_test "section2" "$target_machine" "-al -march-attr" "-s" ""
-	    }
-	    default {
-		run_elf_list_test "section2" "$target_machine" "-al" "-s" ""
+		set as_flags "$as_flags -march-attr"
 	    }
 	}
+	run_elf_list_test "section2" "$target_machine" "$as_flags" "-s" ""
     }
     run_dump_test "section3"
     run_dump_test "section4"
diff --git a/gas/testsuite/gas/i386/bss.d b/gas/testsuite/gas/i386/bss.d
index cf52814076..c63097cf78 100644
--- a/gas/testsuite/gas/i386/bss.d
+++ b/gas/testsuite/gas/i386/bss.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #objdump: -s
 #name: i386 .bss
 
diff --git a/gas/testsuite/gas/i386/ifunc-3.d b/gas/testsuite/gas/i386/ifunc-3.d
index 124de37d4e..e29dcabc1a 100644
--- a/gas/testsuite/gas/i386/ifunc-3.d
+++ b/gas/testsuite/gas/i386/ifunc-3.d
@@ -1,5 +1,6 @@ 
 #readelf: --relocs --syms -x .text.1 -x .text.2
 #name: i386 ifunc 3
+#as: --generate-missing-build-notes=no
 
 Relocation section '\.rel\.text\.1' at offset .* contains .* entries:
  Offset     Info    Type            Sym.Value  Sym. Name
diff --git a/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d b/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
index a48c5028d9..f071a2256d 100644
--- a/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
+++ b/gas/testsuite/gas/i386/ilp32/mixed-mode-reloc64.d
@@ -1,6 +1,7 @@ 
 #source: ../mixed-mode-reloc.s
 #objdump: -r
 #name: x86-64 (ILP32) mixed mode relocs
+#as: --generate-missing-build-notes=no
 
 .*: +file format .*x86-64.*
 
diff --git a/gas/testsuite/gas/i386/ilp32/quad.d b/gas/testsuite/gas/i386/ilp32/quad.d
index 94f7b5ae4b..13f5d75013 100644
--- a/gas/testsuite/gas/i386/ilp32/quad.d
+++ b/gas/testsuite/gas/i386/ilp32/quad.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #objdump: -sr
 #name: x86-64 (ILP32) quad
 
diff --git a/gas/testsuite/gas/i386/ilp32/reloc64.d b/gas/testsuite/gas/i386/ilp32/reloc64.d
index 5865ab0ae1..78ca3fd9e3 100644
--- a/gas/testsuite/gas/i386/ilp32/reloc64.d
+++ b/gas/testsuite/gas/i386/ilp32/reloc64.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #objdump: -Drw
 #name: x86-64 (ILP32) relocs
 
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d b/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d
index 874debb17e..e5b74fa5c9 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-size-1.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: x32 size 1
 #source: ../size-1.s
 #readelf: -r
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d b/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d
index 7008e5a187..6f96134f13 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-size-3.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: x32 size 3
 #source: ../size-3.s
 #readelf: -r
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d b/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d
index c47d1df824..8ce06b0f84 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-size-5.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: x32 size 5
 #source: ../x86-64-size-5.s
 #readelf: -r
diff --git a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
index 8fa6c3791b..bd532b73e8 100644
--- a/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
+++ b/gas/testsuite/gas/i386/ilp32/x86-64-unwind.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #source: ../x86-64-unwind.s
 #readelf: -S
 #name: x86-64 (ILP32) unwind
diff --git a/gas/testsuite/gas/i386/mixed-mode-reloc32.d b/gas/testsuite/gas/i386/mixed-mode-reloc32.d
index 59234bc9be..d0d786bc41 100644
--- a/gas/testsuite/gas/i386/mixed-mode-reloc32.d
+++ b/gas/testsuite/gas/i386/mixed-mode-reloc32.d
@@ -1,4 +1,4 @@ 
-#as: -mrelax-relocations=yes
+#as: -mrelax-relocations=yes --generate-missing-build-notes=no
 #objdump: -r
 #source: mixed-mode-reloc.s
 #name: x86 mixed mode relocs (32-bit object)
diff --git a/gas/testsuite/gas/i386/mixed-mode-reloc64.d b/gas/testsuite/gas/i386/mixed-mode-reloc64.d
index 9b82cb5949..f0e62e0ac2 100644
--- a/gas/testsuite/gas/i386/mixed-mode-reloc64.d
+++ b/gas/testsuite/gas/i386/mixed-mode-reloc64.d
@@ -1,6 +1,7 @@ 
 #objdump: -r
 #source: mixed-mode-reloc.s
 #name: x86 mixed mode relocs (64-bit object)
+#as: --generate-missing-build-notes=no
 
 .*: +file format .*x86-64.*
 
diff --git a/gas/testsuite/gas/i386/nop-6.d b/gas/testsuite/gas/i386/nop-6.d
index 6d44f3ec01..dcf019132a 100644
--- a/gas/testsuite/gas/i386/nop-6.d
+++ b/gas/testsuite/gas/i386/nop-6.d
@@ -1,4 +1,4 @@ 
-#as: -march=i686+nop
+#as: -march=i686+nop --generate-missing-build-notes=no
 #objdump: -drw
 #name: i386 .nops 6
 
diff --git a/gas/testsuite/gas/i386/property-1.d b/gas/testsuite/gas/i386/property-1.d
index 5a9bec7219..509ba3dd5f 100644
--- a/gas/testsuite/gas/i386/property-1.d
+++ b/gas/testsuite/gas/i386/property-1.d
@@ -1,5 +1,5 @@ 
 #name: i386 property 1
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
diff --git a/gas/testsuite/gas/i386/property-2.d b/gas/testsuite/gas/i386/property-2.d
index c7e321dd91..e158d974b5 100644
--- a/gas/testsuite/gas/i386/property-2.d
+++ b/gas/testsuite/gas/i386/property-2.d
@@ -1,5 +1,5 @@ 
 #name: i386 property 2
-#as: -mx86-used-note=yes
+#as: -mx86-used-note=yes --generate-missing-build-notes=no
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
diff --git a/gas/testsuite/gas/i386/relax.d b/gas/testsuite/gas/i386/relax.d
index 83b7d894cd..ab4b6de35d 100644
--- a/gas/testsuite/gas/i386/relax.d
+++ b/gas/testsuite/gas/i386/relax.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: i386 relax
 #objdump: -s
 
diff --git a/gas/testsuite/gas/i386/reloc64.d b/gas/testsuite/gas/i386/reloc64.d
index e9e03de86c..540a9b77d3 100644
--- a/gas/testsuite/gas/i386/reloc64.d
+++ b/gas/testsuite/gas/i386/reloc64.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #objdump: -Drw
 #name: x86-64 relocs
 #notarget: *-*-solaris*
diff --git a/gas/testsuite/gas/i386/size-1.d b/gas/testsuite/gas/i386/size-1.d
index 3eb5a7ffb5..d582bbecc9 100644
--- a/gas/testsuite/gas/i386/size-1.d
+++ b/gas/testsuite/gas/i386/size-1.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: i386 size 1
 #readelf: -r
 
diff --git a/gas/testsuite/gas/i386/size-3.d b/gas/testsuite/gas/i386/size-3.d
index d79db27b41..2b08707f43 100644
--- a/gas/testsuite/gas/i386/size-3.d
+++ b/gas/testsuite/gas/i386/size-3.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: i386 size 3
 #readelf: -r
 
diff --git a/gas/testsuite/gas/i386/x86-64-nop-6.d b/gas/testsuite/gas/i386/x86-64-nop-6.d
index 63f3817148..f9b0cf1026 100644
--- a/gas/testsuite/gas/i386/x86-64-nop-6.d
+++ b/gas/testsuite/gas/i386/x86-64-nop-6.d
@@ -1,5 +1,6 @@ 
 #source: nop-6.s
 #objdump: -drw
+#as: --generate-missing-build-notes=no
 #name: x86-64 .nops 6
 
 .*: +file format .*
diff --git a/gas/testsuite/gas/i386/x86-64-property-1.d b/gas/testsuite/gas/i386/x86-64-property-1.d
index 966793ea9d..a6cb3d4501 100644
--- a/gas/testsuite/gas/i386/x86-64-property-1.d
+++ b/gas/testsuite/gas/i386/x86-64-property-1.d
@@ -1,6 +1,6 @@ 
 #name: x86-64 property 1
 #source: property-1.s
-#as: -mx86-used-note=no -defsym __64_bit__=1
+#as: -mx86-used-note=no -defsym __64_bit__=1 --generate-missing-build-notes=no
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
diff --git a/gas/testsuite/gas/i386/x86-64-property-2.d b/gas/testsuite/gas/i386/x86-64-property-2.d
index 72e2131995..b9277aee50 100644
--- a/gas/testsuite/gas/i386/x86-64-property-2.d
+++ b/gas/testsuite/gas/i386/x86-64-property-2.d
@@ -1,6 +1,6 @@ 
 #name: x86-64 property 2
 #source: property-2.s
-#as: -mx86-used-note=yes
+#as: -mx86-used-note=yes --generate-missing-build-notes=no
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property
diff --git a/gas/testsuite/gas/i386/x86-64-size-1.d b/gas/testsuite/gas/i386/x86-64-size-1.d
index 0eb3e5062a..657408cf73 100644
--- a/gas/testsuite/gas/i386/x86-64-size-1.d
+++ b/gas/testsuite/gas/i386/x86-64-size-1.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: x86-64 size 1
 #source: size-1.s
 #readelf: -r
diff --git a/gas/testsuite/gas/i386/x86-64-size-3.d b/gas/testsuite/gas/i386/x86-64-size-3.d
index 16e0936d69..943a64e9ac 100644
--- a/gas/testsuite/gas/i386/x86-64-size-3.d
+++ b/gas/testsuite/gas/i386/x86-64-size-3.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: x86-64 size 3
 #source: size-3.s
 #readelf: -r
diff --git a/gas/testsuite/gas/i386/x86-64-size-5.d b/gas/testsuite/gas/i386/x86-64-size-5.d
index c1e7fcf4ee..c34d0eedaa 100644
--- a/gas/testsuite/gas/i386/x86-64-size-5.d
+++ b/gas/testsuite/gas/i386/x86-64-size-5.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #name: x86-64 size 5
 #readelf: -r
 
diff --git a/gas/testsuite/gas/i386/x86-64-unwind.d b/gas/testsuite/gas/i386/x86-64-unwind.d
index 93b84a88f1..7f8d94fe86 100644
--- a/gas/testsuite/gas/i386/x86-64-unwind.d
+++ b/gas/testsuite/gas/i386/x86-64-unwind.d
@@ -1,4 +1,4 @@ 
-#as: -mx86-used-note=no
+#as: -mx86-used-note=no --generate-missing-build-notes=no
 #readelf: -S
 #name: x86-64 unwind
 
diff --git a/gas/testsuite/gas/macros/irp.d b/gas/testsuite/gas/macros/irp.d
index 6a8d0daaae..4b69658d57 100644
--- a/gas/testsuite/gas/macros/irp.d
+++ b/gas/testsuite/gas/macros/irp.d
@@ -13,3 +13,4 @@  OFFSET[ 	]+TYPE[ 	]+VALUE.*
 0+0c[ 	]+[a-zA-Z0-9_]+[ 	]+bar1
 0+10[ 	]+[a-zA-Z0-9_]+[ 	]+bar2
 0+14[ 	]+[a-zA-Z0-9_]+[ 	]+bar3
+#pass
diff --git a/gas/testsuite/gas/macros/repeat.d b/gas/testsuite/gas/macros/repeat.d
index 568dd8f906..68f2db9ade 100644
--- a/gas/testsuite/gas/macros/repeat.d
+++ b/gas/testsuite/gas/macros/repeat.d
@@ -43,3 +43,4 @@  OFFSET[ 	]+TYPE[ 	]+VALUE.*
 0+84[ 	]+[a-zA-Z0-9_]+[ 	]+rept_rept
 0+88[ 	]+[a-zA-Z0-9_]+[ 	]+rept_rept
 0+8c[ 	]+[a-zA-Z0-9_]+[ 	]+rept_rept
+#pass
diff --git a/gas/testsuite/gas/macros/rept.d b/gas/testsuite/gas/macros/rept.d
index b38c70afea..2fb4465ccb 100644
--- a/gas/testsuite/gas/macros/rept.d
+++ b/gas/testsuite/gas/macros/rept.d
@@ -10,3 +10,4 @@  OFFSET[ 	]+TYPE[ 	]+VALUE.*
 0+00[ 	]+[a-zA-Z0-9_]+[ 	]+foo1
 0+04[ 	]+[a-zA-Z0-9_]+[ 	]+foo1
 0+08[ 	]+[a-zA-Z0-9_]+[ 	]+foo1
+#pass
diff --git a/gas/testsuite/gas/macros/test2.d b/gas/testsuite/gas/macros/test2.d
index bb9652420e..adb0eed810 100644
--- a/gas/testsuite/gas/macros/test2.d
+++ b/gas/testsuite/gas/macros/test2.d
@@ -10,3 +10,4 @@  OFFSET[ 	]+TYPE[ 	]+VALUE.*
 0+00[ 	]+[a-zA-Z0-9_]+[ 	]+foo1
 0+04[ 	]+[a-zA-Z0-9_]+[ 	]+foo2
 0+08[ 	]+[a-zA-Z0-9_]+[ 	]+foo3
+#pass
diff --git a/gas/testsuite/gas/macros/test3.d b/gas/testsuite/gas/macros/test3.d
index 71949234d8..6a1df31efe 100644
--- a/gas/testsuite/gas/macros/test3.d
+++ b/gas/testsuite/gas/macros/test3.d
@@ -7,3 +7,4 @@ 
 RELOCATION RECORDS FOR .*
 OFFSET[ 	]+TYPE[ 	]+VALUE.*
 0+00[ 	]+[a-zA-Z0-9_]+[ 	]+foo1
+#pass
diff --git a/gas/testsuite/gas/macros/vararg.d b/gas/testsuite/gas/macros/vararg.d
index fb5f25d220..ff633bd33e 100644
--- a/gas/testsuite/gas/macros/vararg.d
+++ b/gas/testsuite/gas/macros/vararg.d
@@ -13,3 +13,4 @@  OFFSET[ 	]+TYPE[ 	]+VALUE.*
 0+0c[ 	]+[a-zA-Z0-9_]+[ 	]+foo4
 0+10[ 	]+[a-zA-Z0-9_]+[ 	]+foo5
 0+14[ 	]+[a-zA-Z0-9_]+[ 	]+foo6
+#pass
diff --git a/gas/testsuite/gas/ppc/astest2.d b/gas/testsuite/gas/ppc/astest2.d
index 972b9a5000..dca21e93f9 100644
--- a/gas/testsuite/gas/ppc/astest2.d
+++ b/gas/testsuite/gas/ppc/astest2.d
@@ -1,4 +1,5 @@ 
 #objdump: -Dr -Mppc
+#as:  --generate-missing-build-notes=no
 #name: PowerPC test 2
 
 .*
diff --git a/gas/testsuite/gas/ppc/astest2_64.d b/gas/testsuite/gas/ppc/astest2_64.d
index 516b8bc6d9..157a77b39a 100644
--- a/gas/testsuite/gas/ppc/astest2_64.d
+++ b/gas/testsuite/gas/ppc/astest2_64.d
@@ -1,4 +1,5 @@ 
 #objdump: -Dr
+#as:  --generate-missing-build-notes=no
 #name: PowerPC 64-bit test 2
 
 .*
diff --git a/gas/testsuite/gas/ppc/astest64.d b/gas/testsuite/gas/ppc/astest64.d
index 82ccb90351..8cf0675064 100644
--- a/gas/testsuite/gas/ppc/astest64.d
+++ b/gas/testsuite/gas/ppc/astest64.d
@@ -1,4 +1,5 @@ 
 #objdump: -Dr
+#as:  --generate-missing-build-notes=no
 #name: PowerPC 64-bit test 1
 
 .*
diff --git a/gas/testsuite/gas/ppc/power4.d b/gas/testsuite/gas/ppc/power4.d
index d3e78a6df1..e4d9ea9791 100644
--- a/gas/testsuite/gas/ppc/power4.d
+++ b/gas/testsuite/gas/ppc/power4.d
@@ -1,5 +1,5 @@ 
 #objdump: -drx -Mpower4
-#as: -mpower4
+#as: -mpower4 --generate-missing-build-notes=no
 #name: Power4 instructions
 
 .*
diff --git a/gas/testsuite/gas/ppc/test1elf64.d b/gas/testsuite/gas/ppc/test1elf64.d
index d6383e1d2f..4df9e00a15 100644
--- a/gas/testsuite/gas/ppc/test1elf64.d
+++ b/gas/testsuite/gas/ppc/test1elf64.d
@@ -1,4 +1,5 @@ 
 #objdump: -Drx
+#as:  --generate-missing-build-notes=no
 #name: PowerPC Test 1, 64 bit elf
 
 .*