daily update

[external/binutils.git] / gdb / testsuite / gdb.hp / gdb.objdbg / objdbg03.exp

diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
index d0993a5..c5d12e5 100644 (file)
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
@@ -12,14 +12,25 @@ set srcsubdir ${srcdir}/${subdir}/objdbg03
 set objdbgdir ${objdir}/${subdir}/objdbg03
 set binfile ${objdbgdir}/${testfile}
 set toolssubdir ${srcdir}/${subdir}/tools
-if [istarget "hppa2.0w-*-*"] {
+if [istarget "hppa64-*-*"] {
   set symaddrfile ${toolssubdir}/symaddr.pa64
 } else {
   set symaddrfile ${toolssubdir}/symaddr
 }
 
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+if {!$hp_aCC_compiler && !$hp_cc_compiler} {
+  return 0
+}
+
 if { [gdb_compile "${toolssubdir}/test-objdbg.cc" "${objdbgdir}/test-objdbg.o" object "debug c++ {additional_flags=-I${toolssubdir} +objdebug}"] != "" } {
-    gdb_suppress_entire_file "WARNING: +objdebug option is not supported in this compiler version, test ignored."
+    untested objdbg03.exp
+    return -1
 }
 
 if { [gdb_compile "${srcsubdir}/x1.cc" "${objdbgdir}/x1.o" object "debug c++ {additional_flags=-I${srcsubdir} +objdebug}"] != "" } {
@@ -129,7 +140,7 @@ regsub -all "\[\r\n\]" ${exec_output_common10} "" exec_output_common10
 set exec_output_common11 [lindex [remote_exec build "${symaddrfile} ${binfile} common11"] 1]
 regsub -all "\[\r\n\]" ${exec_output_common11} "" exec_output_common11
 
-if [istarget "hppa2.0w-*-*"] {
+if [istarget "hppa64-*-*"] {
     gdb_test "p &data1" "..* = \\(int \[*\]\\) ${exec_output_data1}"
     gdb_test "p &data2" "..* = \\(int \[*\]\\) ${exec_output_data2}"
     gdb_test "p &data3" "..* = \\(int \[*\]\\) ${exec_output_data3}"