* binutils-all/ar.exp: Don't run unique_symbol on msp or hpux.

	* binutils-all/copy-2.d: Update not-target list.
	* binutils-all/note-1.d: Don't run on h8300.
	* binutils-all/objcopy.exp: Don't run strip-10 on msp or hpux.
	(objcopy_test): Remove h8300-rtems from xfails.

5 files changed, 18 insertions, 4 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index be62880454..5dcd6c8803 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-23  Alan Modra  <amodra@gmail.com>
+
+	* binutils-all/ar.exp: Don't run unique_symbol on msp or hpux.
+	* binutils-all/copy-2.d: Update not-target list.
+	* binutils-all/note-1.d: Don't run on h8300.
+	* binutils-all/objcopy.exp: Don't run strip-10 on msp or hpux.
+	(objcopy_test): Remove h8300-rtems from xfails.
+
 2010-09-16  Alan Modra  <amodra@gmail.com>
 
 	* binutils-all/i386/i386.exp: Don't run on linuxaout.
diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
index ab1afdcb92..4b8a2dabad 100644
--- a/binutils/testsuite/binutils-all/ar.exp
+++ b/binutils/testsuite/binutils-all/ar.exp
@@ -446,6 +446,8 @@ thin_archive
 thin_archive_with_nested
 argument_parsing
 deterministic_archive
-if [is_elf_format] {
+if { [is_elf_format]
+     && ![istarget "*-*-hpux*"]
+     && ![istarget "msp*-*-*"] } {
     unique_symbol
 }
diff --git a/binutils/testsuite/binutils-all/copy-2.d b/binutils/testsuite/binutils-all/copy-2.d
index c4d00b4d41..2640824470 100644
--- a/binutils/testsuite/binutils-all/copy-2.d
+++ b/binutils/testsuite/binutils-all/copy-2.d
@@ -3,7 +3,7 @@
 #objcopy: --set-section-flags foo=contents,alloc,load,code
 #name: copy with setting section flags 2
 #source: copytest.s
-#not-target: *-*-*aout m68k-*-netbsd m68k-*-openbsd* ns32k-*-netbsd
+#not-target: *-*-*aout *-*-aix* h8300-*-* hppa-*-hpux* m68k-*-netbsd m68k-*-openbsd* mips-sony-bsd* mips-*-ultrix* mips-*-osf* mips-*-ecoff* mips-*-irix mips-*-irix[2-4] mips-*-riscos* ns32k-*-netbsd
 # Note - we use copytest.s and a section named "foo" rather
 # than .text because for some file formats (eg PE) the .text
 # section has a fixed set of flags and these cannot be changed.
diff --git a/binutils/testsuite/binutils-all/note-1.d b/binutils/testsuite/binutils-all/note-1.d
index 1a4294983a..17a7d59a71 100644
--- a/binutils/testsuite/binutils-all/note-1.d
+++ b/binutils/testsuite/binutils-all/note-1.d
@@ -3,6 +3,7 @@
 #objcopy: --add-section .note=$srcdir/note-1.d
 #name: add notes section
 #source: copytest.s
+#not-target: h8300-*-*
 
 There are .*
 
diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 6bfd164b65..c93372c2f4 100644
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -79,7 +79,7 @@ proc objcopy_test {testname srcfile} {
 	# files in the first place, and may order things a little
 	# differently. Those systems should use setup_xfail here.
 
-	setup_xfail "h8300-*-rtems*" "h8300-*-coff"
+	setup_xfail "h8300-*-coff"
 	setup_xfail "h8500-*-rtems*" "h8500-*-coff"
 	setup_xfail "hppa*-*-*"
 	setup_xfail "i960-*"
@@ -890,7 +890,10 @@ if [is_elf_format] {
     run_dump_test "strip-7"
     run_dump_test "strip-8"
     run_dump_test "strip-9"
-    run_dump_test "strip-10"
+    if { ![istarget "*-*-hpux*"]
+	 && ![istarget "msp*-*-*"] } {
+	run_dump_test "strip-10"
+    }
 
     if { [istarget "i*86-*"] || [istarget "x86_64-*-*"] } {
 	# Check to make sure we don't strip a symbol named in relocations.