[binutils-gdb] Revert pr29072 lto test changes

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=16538271c82db0ba5679344c4107564b70a756a1

commit 16538271c82db0ba5679344c4107564b70a756a1
Author: Alan Modra <amodra@gmail.com>
Date:   Wed Apr 27 09:09:41 2022 +0930

    Revert pr29072 lto test changes
    
    Revert commit 65daf5bed6 testsuite changes in ld-plugin/.  -z isn't
    supported for non-ELF targets, and isn't needed since we now prune the
    exec stack warning (commit 333cd559ba).
    
            PR 29072

Diff:
---
 ld/testsuite/ld-plugin/lto-3r.d | 2 +-
 ld/testsuite/ld-plugin/lto-5r.d | 2 +-
 ld/testsuite/ld-plugin/lto.exp  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ld/testsuite/ld-plugin/lto-3r.d b/ld/testsuite/ld-plugin/lto-3r.d
index ce9562393d2..fd1bfd26867 100644
--- a/ld/testsuite/ld-plugin/lto-3r.d
+++ b/ld/testsuite/ld-plugin/lto-3r.d
@@ -1,4 +1,4 @@
-#ld: -r tmpdir/lto-3b.o -z noexecstack
+#ld: -r tmpdir/lto-3b.o
 #source: dummy.s
 #nm: -p
 
diff --git a/ld/testsuite/ld-plugin/lto-5r.d b/ld/testsuite/ld-plugin/lto-5r.d
index dba30bfd334..c35e2bc338d 100644
--- a/ld/testsuite/ld-plugin/lto-5r.d
+++ b/ld/testsuite/ld-plugin/lto-5r.d
@@ -1,4 +1,4 @@
-#ld: -r tmpdir/lto-5a.o tmpdir/lto-5b.o -z noexecstack
+#ld: -r tmpdir/lto-5a.o tmpdir/lto-5b.o
 #source: dummy.s
 #nm: -p
 
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 33af6c45a41..f4ea1d48533 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -127,7 +127,7 @@ set lto_link_tests [list \
    "" "-flto -O2 $lto_fat $NOSANITIZE_CFLAGS" \
    {pr12758b.c} {} "libpr12758.a"] \
   [list "PR ld/12758" \
-   "$NOPIE_LDFLAGS $NOSANITIZE_CFLAGS -O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group -z noexecstack" \
+   "$NOPIE_LDFLAGS $NOSANITIZE_CFLAGS -O2 -Wl,-e,foo -nostdlib -flto -fuse-linker-plugin tmpdir/pr12758a.o -Wl,--start-group tmpdir/libpr12758.a -Wl,--end-group" \
    "$NOSANITIZE_CFLAGS" \
    {dummy.c} {} "pr12758.exe"] \
   [list "Build libpr13183.a" \
@@ -901,7 +901,7 @@ run_cc_link_tests $lto_link_symbol_tests
 
 run_ld_link_tests [list \
   [list "PR ld/19317 (2)" \
-   "-r tmpdir/pr19317.o -z noexecstack" "" "" \
+   "-r tmpdir/pr19317.o" "" "" \
    {dummy.s} {} "pr19317-r.o"] \
 ]