X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Ftestsuite%2Fbinutils-all%2Fhppa%2Fobjdump.exp;h=bdc9642b8037f1834120cf2082250403f4d7e0e8;hb=b3adc24a0713411ab38a21dc894dd40dbc5c8f4f;hp=001e6dfd8f139b8406149201f034ef4141cc58c6;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/testsuite/binutils-all/hppa/objdump.exp b/binutils/testsuite/binutils-all/hppa/objdump.exp
index 001e6dfd8f..bdc9642b80 100644
--- a/binutils/testsuite/binutils-all/hppa/objdump.exp
+++ b/binutils/testsuite/binutils-all/hppa/objdump.exp
@@ -1,9 +1,8 @@
-#   Copyright 1993, 1994, 1995, 1997, 1999, 2000
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1993-2020 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,
@@ -13,7 +12,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-dejagnu@prep.ai.mit.edu
@@ -43,30 +42,31 @@ if {[which $OBJDUMP] == 0} then {
 send_user "Version [binutil_version $OBJDUMP]"
 
 if {![binutils_assemble $srcdir/$subdir/addendbug.s tmpdir/addendbug.o]} then {
-    return
-}
-
-if [is_remote host] {
-    set objfile [remote_download host tmpdir/addendbug.o]
+    fail "addendbug test (assembling)"
 } else {
-    set objfile tmpdir/addendbug.o
-}
 
-# Make sure the SOM BFD code sign extends constants in R_DATA_OVERRIDE fixups.
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/addendbug.o]
+    } else {
+	set objfile tmpdir/addendbug.o
+    }
 
-set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -r $objfile"]
+    # Make sure the SOM BFD code sign extends constants in
+    # R_DATA_OVERRIDE fixups.
 
-if [istarget hppa*-*-*elf*] then {
-  set want "00000000 R_PARISC_DPREL21L\[ 	\]+is_idchar\\+0xffffffe0.*"
-} else {
-  set want "00000000 R_DP_RELATIVE\[ 	\]+is_idchar\\+0xffffffe0.*"
-}
+    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -r $objfile"]
 
+    if [istarget hppa*-*-*elf*] then {
+	set want "00000000 R_PARISC_DPREL21L\[ 	\]+is_idchar-0x00000020.*"
+    } else {
+	set want "00000000 R_DP_RELATIVE\[ 	\]+is_idchar-0x00000020.*"
+    }
 
-if [regexp $want $got] then {
-    pass "addendbug test"
-} else {
-    fail "addendbug test"
+    if [regexp $want $got] then {
+	pass "addendbug test"
+    } else {
+	fail "addendbug test"
+    }
 }
 
 ###########################
@@ -74,23 +74,24 @@ if [regexp $want $got] then {
 ###########################
 
 if {![binutils_assemble $srcdir/$subdir/freg.s tmpdir/freg.o]} then {
-    return
-}
-
-if [is_remote host] {
-    set objfile [remote_download host tmpdir/freg.o]
+    fail "freg test (assembling)"
 } else {
-    set objfile tmpdir/freg.o
-}
 
-# Make sure that we get R float regs like we're supposed to
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/freg.o]
+    } else {
+	set objfile tmpdir/freg.o
+    }
 
-set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble $objfile"]
+    # Make sure that we get R float regs like we're supposed to
 
-set want "fmpyfadd,sgl fr4,fr4R,fr5R,fr5"
+    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble $objfile"]
 
-if [regexp $want $got] then {
-    pass "freg test"
-} else {
-    fail "freg test"
+    set want "fmpyfadd,sgl fr4,fr4R,fr5R,fr5"
+
+    if [regexp $want $got] then {
+	pass "freg test"
+    } else {
+	fail "freg test"
+    }
 }