From d11c7afad34bd2ff8cc5e0a38c32d3ec82a2664f Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 6 May 2022 20:30:06 +0100
Subject: Fix new linker testsuite failures due to rwx segment test problems

---
 ld/testsuite/ld-elf/elf.exp    | 3 ++-
 ld/testsuite/ld-elf/nobits-1.s | 2 ++
 ld/testsuite/ld-elf/size-2.s   | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'ld/testsuite')

diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 1b30011..6d51d12 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -182,6 +182,7 @@ if { [check_gc_sections_available] && ![istarget "v850-*-*"] } {
 
 proc target_defaults_to_execstack {} {
     if {   [istarget "aarch64*-*-*"]
+	|| [istarget "arm-*-*"]
 	|| [istarget "*-*-nacl"]
 	|| [istarget "arc*-*-*"]
 	|| [istarget "ia64*-*-*"]
@@ -274,7 +275,7 @@ if {   [istarget *-*-*linux*]
 	    {size-2.s} \
 	     {{ld rwx-segments-2.l}} \
 	    "rwx-segments-2.exe"] \
-	[list "Ensure that the warning can be suppressed" \
+	[list "Ensure that the RWX warning can be suppressed" \
 	    "-e 0 -Tnobits-1.t --no-warn-rwx-segments" \
 	    "" \
 	    "" \
diff --git a/ld/testsuite/ld-elf/nobits-1.s b/ld/testsuite/ld-elf/nobits-1.s
index 8fb1365..fe81f62 100644
--- a/ld/testsuite/ld-elf/nobits-1.s
+++ b/ld/testsuite/ld-elf/nobits-1.s
@@ -4,3 +4,5 @@ _entry:
 	.byte 0
 	.section .bar,"ax",%nobits
 	.byte 0
+
+	.section	.note.GNU-stack,"",%progbits
diff --git a/ld/testsuite/ld-elf/size-2.s b/ld/testsuite/ld-elf/size-2.s
index 310efde..5826b5c 100644
--- a/ld/testsuite/ld-elf/size-2.s
+++ b/ld/testsuite/ld-elf/size-2.s
@@ -7,3 +7,5 @@
 
 	.section .tbss
 	.long 0,0,0,0,0,0,0,0,0,0,0,0
+
+	.section	.note.GNU-stack,"",%progbits
-- 
cgit v1.1