* binutils-all/objdump.exp (cpus): Add MicroBlaze.

	(objdump -WL): Skip this test on MCore, Moxie and OpenRisc
	targets.

	* binutils-all/objcopy.exp (localize-hidden-1): Expect this test
	to fail on MIPS based targets.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index bafa956..5126053 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-25  Nick Clifton  <nickc@redhat.com>
+
+       * binutils-all/objdump.exp (cpus): Add MicroBlaze.
+       (objdump -WL): Skip this test on MCore, Moxie and OpenRisc
+       targets.
+
+       * binutils-all/objcopy.exp (localize-hidden-1): Expect this test
+       to fail on MIPS based targets.
+
 2011-10-25  Kai Tietz  <ktietz@redhat.com>
 
        * binutils-all/windres/strtab4.rc: New test.

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index a22e98c..94362b7 100644 (file)
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -980,6 +980,9 @@ if [is_elf_format] {
        }
     }
 
+    # The symbol table for MIPS targets is not sorted by ascending value,
+    # so the regexps in localize-hidden-1.d fail to match.
+    setup_xfail "mips-*-*"
     run_dump_test "localize-hidden-1"
     run_dump_test "testranges"
     run_dump_test "testranges-ia64"

diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp
index 3236bc4..1e2afa6 100644 (file)
--- a/binutils/testsuite/binutils-all/objdump.exp
+++ b/binutils/testsuite/binutils-all/objdump.exp
@@ -38,7 +38,7 @@ set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -i"]
 set cpus_expected [list]
 lappend cpus_expected alpha arc arm cris
 lappend cpus_expected d10v d30v fr30 fr500 fr550 h8 hppa i386 i860 i960 ip2022
-lappend cpus_expected m16c m32c m32r m68hc11 m68hc12 m68k m88k MCore
+lappend cpus_expected m16c m32c m32r m68hc11 m68hc12 m68k m88k MCore MicroBlaze
 lappend cpus_expected mips mn10200 mn10300 ms1 msp ns32k pj powerpc pyramid
 lappend cpus_expected romp rs6000 s390 sh sparc
 lappend cpus_expected tahoe tic54x tic80 tms320c30 tms320c4x tms320c54x v850
@@ -203,8 +203,16 @@ if { ![is_elf_format] } then {
 }
 
 # Test objdump -WL on a file that contains line information for multiple files and search directories.
-
-if { ![is_elf_format] || [istarget "ia64*-*-*"]} then {
+# Not supported on mcore, moxie and openrisc targets because they do not (yet) support the generation
+# of DWARF2 line debug information.
+
+if { ![is_elf_format]
+     || [istarget "ia64*-*-*"]
+     || [istarget "mcore-*-*"]
+     || [istarget "moxie-*-*"]
+     || [istarget "openrisc-*-*"]
+     || [istarget "or32-*-*"]
+} then {
     unsupported "objump decode line"
 } else {
     if { ![binutils_assemble $srcdir/$subdir/dw2-decodedline.S tmpdir/dw2-decodedline.o] } then {