From 5daeae9b9787af3a9407ccd2aac73a9effceb1b0 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Tue, 14 Jun 2011 02:55:29 +0000
Subject: [PATCH] 	* ld-elf/elf.exp: Don't attempt to build symbol3.a for
 hppa64-hpux. 	* ld-elf/warn3.d: Correct target selection and comment.

---
 ld/testsuite/ChangeLog      |  3 +++
 ld/testsuite/ld-elf/elf.exp | 19 +++++++++++--------
 ld/testsuite/ld-elf/warn3.d |  7 +++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1cabfa3b1d..ec819d183b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-14  Alan Modra  <amodra@gmail.com>
 
+	* ld-elf/elf.exp: Don't attempt to build symbol3.a for hppa64-hpux.
+	* ld-elf/warn3.d: Correct target selection and comment.
+
 	* ld-elf/pr12851.d: Correct target selection and comment.
 
 2011-06-13  Walter Lee  <walt@tilera.com>
diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index 61efc4a140..ff0f03e288 100644
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -1,5 +1,6 @@
 # Expect script for various ELF tests.
-#   Copyright 2002, 2003, 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
+#   Copyright 2002, 2003, 2005, 2007, 2009, 2010, 2011
+#   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -40,13 +41,15 @@ if { [is_remote host] } then {
     remote_download host merge.ld
 }
 
-run_ld_link_tests {
-    {"Build symbol3.a"
-     "" ""
-     {symbol3.s} {} "symbol3.a"}
-    {"Build symbol3w.a"
-     "" ""
-     {symbol3w.s} {} "symbol3w.a"}
+if { ![istarget hppa64*-hpux*] } {
+    run_ld_link_tests {
+	{"Build symbol3.a"
+	    "" ""
+	    {symbol3.s} {} "symbol3.a"}
+	{"Build symbol3w.a"
+	    "" ""
+	    {symbol3w.s} {} "symbol3w.a"}
+    }
 }
 
 # Run a test to check linking a shared library with a broken linker
diff --git a/ld/testsuite/ld-elf/warn3.d b/ld/testsuite/ld-elf/warn3.d
index c99618d028..53dee1896a 100644
--- a/ld/testsuite/ld-elf/warn3.d
+++ b/ld/testsuite/ld-elf/warn3.d
@@ -2,10 +2,9 @@
 #ld: tmpdir/symbol3w.o tmpdir/symbol3.a 
 #warning: .*: warning: badsym warning$
 #readelf: -s
-#notarget: "sparc64-*-solaris2*" "sparcv9-*-solaris2*"
-#xfail: arc-*-* d30v-*-* dlx-*-* fr30-*-* frv-*-elf i860-*-* i960-*-*
-#xfail: iq*-*-* mn10200-*-* moxie-*-* msp*-*-* mt-*-* or32-*-* pj*-*-*
-# if not using elf32.em, you don't get fancy section handling
+#notarget: hppa64*-hpux*
+#xfail: arc-*-* d30v-*-* dlx-*-* i960-*-* or32-*-* pj*-*-*
+# generic linker targets don't support .gnu.warning sections.
 
 # Check that warnings are generated for the symbols in .gnu.warning
 # construct and that the symbol still appears as expected.