From 5a91f93b983184c64b3a9332f5f4339d17941d76 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Sat, 7 May 2022 13:36:15 +0930
Subject: [PATCH] Re: Fix new linker testsuite failures due to rwx segment test
 problems

Fix it some more.

bfd/
	* elfnn-loongarch.c: Remove commented out elf_backend_* defines.
ld/
	* testsuite/ld-elf/elf.exp (target_defaults_to_execstack): Match
	arm*.  Delete loongarch.
---
 bfd/elfnn-loongarch.c       | 3 ---
 ld/testsuite/ld-elf/elf.exp | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
index 307757f5dd5..5b44901b9e0 100644
--- a/bfd/elfnn-loongarch.c
+++ b/bfd/elfnn-loongarch.c
@@ -125,14 +125,11 @@ struct loongarch_elf_link_hash_table
 #define elf_backend_want_plt_sym 0
 #define elf_backend_plt_alignment 4
 #define elf_backend_can_gc_sections 1
-/* #define elf_backend_can_refcount 1 */
 #define elf_backend_want_got_sym 1
 
 #define elf_backend_got_header_size (GOT_ENTRY_SIZE * 1)
 
 #define elf_backend_want_dynrelro 1
-/* #define elf_backend_rela_normal 1
-#define elf_backend_default_execstack 0 */
 
 /* Generate a PLT header.  */
 
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 6d51d12a655..ebb5ba090bf 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -182,11 +182,10 @@ if { [check_gc_sections_available] && ![istarget "v850-*-*"] } {
 
 proc target_defaults_to_execstack {} {
     if {   [istarget "aarch64*-*-*"]
-	|| [istarget "arm-*-*"]
+	|| [istarget "arm*-*-*"]
 	|| [istarget "*-*-nacl"]
 	|| [istarget "arc*-*-*"]
 	|| [istarget "ia64*-*-*"]
-	|| [istarget "loongarch*-*-*"]
 	|| [istarget "nios2*-*-*"]
 	|| [istarget "powerpc64*-*-*"]
 	|| [istarget "riscv*-*-*"]
-- 
2.30.2