PR27221, 058430b4a1 warnings while assembling the Linux kernel

	PR 27221
	* dwarf2dbg.c (dwarf2_gen_line_info_1): Don't warn about ignored
	line number info when gas is generating it.
	* testsuite/gas/elf/dwarf2-20.d: Adjust to not expect warnings.
	* testsuite/gas/m68hc11/indexed12.d: Likewise.
	* testsuite/gas/elf/elf.exp: Don't run warn-2.
	* gas/testsuite/gas/elf/warn-2.s: Delete.

(cherry picked from commit be07043ea8ea9b22a8db1ff46b557321a7714e9a)

6 files changed, 13 insertions, 22 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f91e2b17f6a..0c0c1e673ee 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,15 @@
 2021-01-21  Alan Modra  <amodra@gmail.com>
 
+	PR 27221
+	* dwarf2dbg.c (dwarf2_gen_line_info_1): Don't warn about ignored
+	line number info when gas is generating it.
+	* testsuite/gas/elf/dwarf2-20.d: Adjust to not expect warnings.
+	* testsuite/gas/m68hc11/indexed12.d: Likewise.
+	* testsuite/gas/elf/elf.exp: Don't run warn-2.
+	* gas/testsuite/gas/elf/warn-2.s: Delete.
+
+2021-01-21  Alan Modra  <amodra@gmail.com>
+
 	PR 27218
 	* dwarf2dbg.c (dwarf2_gen_line_info): Correct setting of dwarf_level.
 	(dwarf2_directive_filename, dwarf2_directive_loc): Likewise, and
diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 635a31cb48f..4fbd1e38ec2 100644
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -514,8 +514,9 @@ dwarf2_gen_line_info_1 (symbolS *label, struct dwarf2_line_info *loc)
   if ((now_seg->flags & need_flags) != need_flags)
     {
       /* FIXME: Add code to suppress multiple warnings ?  */
-      as_warn ("dwarf line number information for %s ignored",
-	       segment_name (now_seg));
+      if (debug_type != DEBUG_DWARF2)
+	as_warn ("dwarf line number information for %s ignored",
+		 segment_name (now_seg));
       return;
     }
 
diff --git a/gas/testsuite/gas/elf/dwarf2-20.d b/gas/testsuite/gas/elf/dwarf2-20.d
index 7f3d21cec99..e0c6c8d0a71 100644
--- a/gas/testsuite/gas/elf/dwarf2-20.d
+++ b/gas/testsuite/gas/elf/dwarf2-20.d
@@ -5,10 +5,6 @@
 #xfail: mn102*-*
 # score-elf, tic6x-elf and xtensa-elf need special handling to support .nop 16
 #xfail: score-* tic6x-* xtensa-*
-#warning: .* \.alloc0 ignored
-#warning: .* \.alloc1 ignored
-#warning: .* \.nonalloc ignored
-#warning: .* \.nonallocexec ignored
 
 Contents of the .debug_aranges section:
 
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index a0f98eddd67..4f7ff6a2e01 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -328,9 +328,4 @@ if { [is_elf_format] } then {
 
     run_dump_test "bignums"
     run_dump_test "section-symbol-redef"
-    
-    load_lib gas-dg.exp
-    dg-init
-    dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/err-*.s $srcdir/$subdir/warn-*.s]] "" ""
-    dg-finish
 }
diff --git a/gas/testsuite/gas/elf/warn-2.s b/gas/testsuite/gas/elf/warn-2.s
deleted file mode 100644
index 8a128a197e5..00000000000
--- a/gas/testsuite/gas/elf/warn-2.s
+++ /dev/null
@@ -1,7 +0,0 @@
-;# { dg-do assemble }
-;# { dg-options "--gdwarf2" }
-
-	.offset 40
-	.nop
-
-;# { dg-warning "Warning: dwarf line number information for .* ignored" "" { xfail v850*-*-* } 0 }
diff --git a/gas/testsuite/gas/m68hc11/indexed12.d b/gas/testsuite/gas/m68hc11/indexed12.d
index 08279d73941..1862b6ac074 100644
--- a/gas/testsuite/gas/m68hc11/indexed12.d
+++ b/gas/testsuite/gas/m68hc11/indexed12.d
@@ -2,10 +2,6 @@
 #as: -m68hc12 -gdwarf2
 #name: 68HC12 indexed addressing mode with 5, 9 and 16-bit offsets (indexed12)
 #source: indexed12.s
-#warning: .* line number information for \.data ignored
-#warning: .* line number information for \.data ignored
-#warning: .* line number information for \.data ignored
-#warning: .* line number information for \.data ignored
 
 .*: +file format elf32\-m68hc12