* gas/config/tc-avr.c: Change ISA for devices with USB support to

[external/binutils.git] / binutils / testsuite / binutils-all / arm / objdump.exp

diff --git a/binutils/testsuite/binutils-all/arm/objdump.exp b/binutils/testsuite/binutils-all/arm/objdump.exp
index 8ee3fd1..321e2a9 100644 (file)
--- a/binutils/testsuite/binutils-all/arm/objdump.exp
+++ b/binutils/testsuite/binutils-all/arm/objdump.exp
@@ -1,9 +1,9 @@
-#   Copyright 2004
+#   Copyright 2004, 2007, 2009
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # This program is distributed in the hope that it will be useful,
@@ -19,7 +19,7 @@ if {![istarget "arm*-*-*"]} then {
   return
 }
 
-if {[which $OBJDUMP] == 0} then {
+if {![is_remote host] && [which $OBJDUMP] == 0} then {
     perror "$OBJDUMP does not exist"
     return
 }
@@ -44,7 +44,7 @@ if [is_remote host] {
 
 set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=6 $objfile"]
 
-set want "bcc.w\te12.*bx\tlr"
+set want "bcc.w\[ \t\]*e12.*bx\[ \t\]*lr"
 
 if [regexp $want $got] then {
     pass "thumb2-cond test1"
@@ -54,10 +54,36 @@ if [regexp $want $got] then {
 
 set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=10 $objfile"]
 
-set want "bx\tlr"
+set want "bx\[ \t\]*lr"
 
 if [regexp $want $got] then {
-    pass "thumb2-cond test1"
+    pass "thumb2-cond test2"
 } else {
-    fail "thumb2-cond test1"
+    fail "thumb2-cond test2"
+}
+
+###########################
+# Set up the test of multiple disassemblies
+###########################
+
+if {![binutils_assemble $srcdir/$subdir/simple.s tmpdir/simple.o]} then {
+    return
+}
+
+if [is_remote host] {
+    set objfile [remote_download host tmpdir/simple.o]
+} else {
+    set objfile tmpdir/simple.o
+}
+
+# Make sure multiple disassemblies come out the same
+
+set got [binutils_run $OBJDUMP "-dr $objfile $objfile"]
+
+set want "$objfile:\[ \]*file format.*$objfile:\[ \]*file format.*push.*add.*sub.*str.*add.*ldmfd"
+
+if [regexp $want $got] then {
+    pass "multiple input files"
+} else {
+    fail "multiple input files"
 }