From 8a28fa1b4beb3b4c77c9b3963f1e32235591470d Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 2 Aug 2018 16:37:12 +0100
Subject: [PATCH] Disable the PR12982 test for HPPA targets.

	PR 23463
	* testsuite/ld-plugin/pr12982.d: Revert previous delta.
	* testsuite/ld-plugin/lto.exp: Skip the pr12982 test for HPPA
	targets.
---
 ld/ChangeLog                     |  9 ++++++++-
 ld/testsuite/ld-plugin/lto.exp   | 15 ++++++++++++---
 ld/testsuite/ld-plugin/pr12982.d |  2 --
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e1e67d5ab5..1173c03dac 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2018-08-02  Nick Clifton  <nickc@redhat.com>
+
+	PR 23463
+	* testsuite/ld-plugin/pr12982.d: Revert previous delta.
+	* testsuite/ld-plugin/lto.exp: Skip the pr12982 test for HPPA
+	targets.
+
 2018-08-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ld-ifunc/ifunc.exp: Always build static_nonifunc_prog.
@@ -26,7 +33,7 @@
 2018-08-01  Nick Clifton  <nickc@redhat.com>
 
 	PR 23463
-	* testsuite/ld-plugin/pr12982.d: Skip thios test for the HPPA
+	* testsuite/ld-plugin/pr12982.d: Skip this test for the HPPA
 	target.
 
 2018-08-01  Alan Modra  <amodra@gmail.com>
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 5d354bfa9e..5c581e498a 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -262,9 +262,6 @@ set lto_link_elf_tests [list \
   [list "Build liblto-17b.so 2" \
    "-shared -O2 -fpic -flto -fuse-linker-plugin tmpdir/lto-17a.o" "-O2 -fpic -flto" \
    {lto-17b.c} {{"nm" {} "lto-17b-2.d"}} "liblto-17b.so"] \
-  [list "PR ld/12982" \
-   "-O2 -flto -fuse-linker-plugin" "-O2 -flto" \
-   {pr12982.c} {{"readelf" {-l --wide} "pr12982.d"}} "pr12982.exe"] \
   [list "PR ld/12975" \
    "-shared -O2 -fPIC -flto -fuse-linker-plugin -nostdlib -Wl,-version-script,pr12975.t" "-O2 -flto" \
    {pr12975.c} {{"readelf" {-s --wide} "pr12975.d"}} "pr12975.so" "c"] \
@@ -328,6 +325,18 @@ if { ! [istarget "arm*-*-*"] } {
   ]]
 }
 
+# PR 12982 checks that an executable stack is not created by default
+# when using the LTO plugin.  The HPPA target however requires an
+# executable stack for syscall restarts and signal returns, so we
+# skip this test for that target.
+if { ! [istarget "hppa*-*-*"] } {
+    set lto_link_elf_tests [concat $lto_link_elf_tests [list \
+  [list "PR ld/12982" \
+   "-O2 -flto -fuse-linker-plugin" "-O2 -flto" \
+   {pr12982.c} {{"readelf" {-l --wide} "pr12982.d"}} "pr12982.exe"] \
+  ]]
+}
+
 # Check final symbols in executables.
 set lto_link_symbol_tests [list \
   [list "LTO 3 symbol" \
diff --git a/ld/testsuite/ld-plugin/pr12982.d b/ld/testsuite/ld-plugin/pr12982.d
index 8e79c2f94c..0313ef12d6 100644
--- a/ld/testsuite/ld-plugin/pr12982.d
+++ b/ld/testsuite/ld-plugin/pr12982.d
@@ -1,7 +1,5 @@
-#skip: hppa*-*-*
 #failif
 #...
  +GNU_STACK .* RWE .*
 #pass
 
-# The skip for HPPA is because this target always needs an executable stack.
-- 
2.34.1