* gdb.base/dump.exp: Remove arch-specific tests and do a

	generic data address check to set is64bitonly correctly.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9e0658d1e8d64582496df98d1cc253485cf06808..599dd7f729f63a7a40dbe87dcf0aa7ea98cd824f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-05  Luis Machado  <lgustavo@codesourcery.com>
+
+       * gdb.base/dump.exp: Remove arch-specific tests and do a
+       generic data address check to set is64bitonly correctly.
+
 2013-07-05  Luis Machado  <lgustavo@codesourcery.com>
 
        * gdb.mi/gdb2549.exp (register_tests): Expect any decimal for

diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp
index ea93b89a5ad8ec0816f73952d98e284b42e4b91c..eb9be9093248ec78cfdfb0d662a3b2944ab983fe 100644 (file)
--- a/gdb/testsuite/gdb.base/dump.exp
+++ b/gdb/testsuite/gdb.base/dump.exp
@@ -30,10 +30,6 @@ if [istarget "alpha*-*-*"] then {
     lappend options "additional_flags=-Wl,-taso"
 }
 
-if {[istarget "ia64*-*-*"] || [istarget "hppa64-*-*"]} then {
-    set is64bitonly "yes"
-}
-
 if {[istarget "spu*-*-*"]} then {
     # The internal address format used for the combined Cell/B.E.
     # debugger requires 64-bit.
@@ -56,6 +52,15 @@ gdb_test "dump mem /dev/null 0x10 0x20" "Cannot access memory at address 0x10" \
 
 gdb_load ${binfile}
 
+# Check the address of a variable.  If it is bigger than 32-bit,
+# assume our target has 64-bit addresses that are not supported by SREC,
+# IHEX and TEKHEX.  We skip those tests then.
+set max_32bit_address "0xffffffff"
+set data_address [get_hexadecimal_valueof "&intarray" 0x100000000]
+if {${data_address} > ${max_32bit_address}} then {
+    set is64bitonly "yes"
+}
+
 # Clean up any stale output files from previous test runs
 
 remote_exec build "rm -f intarr1.bin intarr1b.bin intarr1.ihex intarr1.srec intarr1.tekhex intarr2.bin intarr2b.bin intarr2.ihex intarr2.srec intarr2.tekhex intstr1.bin intstr1b.bin intstr1.ihex intstr1.srec intstr1.tekhex intstr2.bin intstr2b.bin intstr2.ihex intstr2.srec intstr2.tekhex intarr3.srec"