From 333cd559bae5a6be60832c020da479ae23fd2664 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 21 Apr 2022 08:49:30 +0930
Subject: prune .note.GNU-stack warning from testsuite

binutils/
	* testsuite/lib/binutils-common.exp (prune_warnings_extra): Remove
	.note.GNU-stack warning.
	(run_dump_test): Call prune_warnings for ld and objcopy output.
ld/
	* testsuite/ld-elf/elf.exp: Disable prune_warnings_extra temporarily
	around test for absent .note.GNU-stack
	* testsuite/ld-cris/globsymw2.s,
	* testsuite/ld-cris/warn3.d: Modify "is not implemented" message
	to avoid dejagnu prune_warnings.
---
 ld/testsuite/ld-cris/globsymw2.s |  2 +-
 ld/testsuite/ld-cris/warn3.d     |  2 +-
 ld/testsuite/ld-elf/elf.exp      | 14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'ld/testsuite')

diff --git a/ld/testsuite/ld-cris/globsymw2.s b/ld/testsuite/ld-cris/globsymw2.s
index a9e11ff..e05f7b2 100644
--- a/ld/testsuite/ld-cris/globsymw2.s
+++ b/ld/testsuite/ld-cris/globsymw2.s
@@ -2,7 +2,7 @@
 	.stabn	162,0,0,0
 ;# A bit like globsymw1.s but containing a valid, working, stabs
 ;# symbol warning construct.
-	.stabs "isatty is not implemented and will always fail",30,0,0,0
+	.stabs "isatty is not implemented, will always fail",30,0,0,0
 	.stabs "globsym1",1,0,0,0
 	.global globsym1
 	.type	globsym1, @function
diff --git a/ld/testsuite/ld-cris/warn3.d b/ld/testsuite/ld-cris/warn3.d
index c01b6cb..8cd1435 100644
--- a/ld/testsuite/ld-cris/warn3.d
+++ b/ld/testsuite/ld-cris/warn3.d
@@ -4,7 +4,7 @@
 #target: cris-*-*elf* cris-*-*aout*
 #as: --em=crisaout
 #ld: -mcrisaout
-#warning: warning: isatty is not implemented and will always fail$
+#warning: warning: isatty is not implemented, will always fail$
 #objdump: -p
 .*:     file format a\.out-cris
 #pass
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index ec61e65..d561540 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -189,7 +189,7 @@ proc target_defaults_to_execstack {} {
 	|| [istarget "powerpc64*-*-*"]
 	|| [istarget "riscv*-*-*"]
 	|| [istarget "tilegx*-*-*"]
-        || [istarget "tilepro*-*-*"] } {
+	|| [istarget "tilepro*-*-*"] } {
 	  return 0
     }
     return 1
@@ -227,7 +227,7 @@ if {   [istarget *-*-*linux*]
 	    {pr23900-1.s} \
 	    [list [list "readelf" {-Wl} $pr23900_1_exp]] \
 	    "pr23900-1.exe"] \
-	[list "PR ld/29072 (warn about an executable .note-GNU-stack)" \
+	[list "PR ld/29072 (warn about an executable .note.GNU-stack)" \
 	    "-e 0" \
 	    "" \
 	    "" \
@@ -250,8 +250,12 @@ if {   [istarget *-*-*linux*]
 	    "pr29072-d.exe"] \
 	]
     if { [target_defaults_to_execstack] } {
+	rename prune_warnings_extra old_prune_warnings_extra
+	proc prune_warnings_extra { text } {
+	    return $text
+	}
 	run_ld_link_tests [list \
-          [list "PR ld/29072 (warn about absent .note-GNU-stack)" \
+	   [list "PR ld/29072 (warn about absent .note.GNU-stack)" \
 	    "-e 0 -z stack-size=0x123400" \
 	    "" \
 	    "" \
@@ -259,9 +263,11 @@ if {   [istarget *-*-*linux*]
 	    {{ld pr29072.b.warn}} \
 	    "pr29072-b.exe"] \
 	]
+	rename prune_warnings_extra ""
+	rename old_prune_warnings_extra prune_warnings_extra
     } else {
 	run_ld_link_tests [list \
-          [list "PR ld/29072 (ignore absent .note-GNU-stackk)" \
+	   [list "PR ld/29072 (ignore absent .note.GNU-stack)" \
 	    "-e 0 -z stack-size=0x123400" \
 	    "" \
 	    "" \
-- 
cgit v1.1