* gdb.hp/gdb.base-hp/so-thresh.exp: Update text in expect strings

        to match current gdb output.  Update due to using auto-solib-limit
        for limiting instead of overloading auto-solib-add.
        * gdb.hp/gdb.base-hp/so-thresh.mk: Always use "cc" to build the
        test program.

        * gdb.c++/templates.exp: Use "hppa64-*-*", not "hppa2.0w-*-*"
        * gdb.hp/gdb.base-hp/dollar.exp: Likewise
        * gdb.hp/gdb.base-hp/pxdb.exp: Likewise.
        * gdb.hp/gdb.base-hp/reg-pa64.exp: Likewise.
        * gdb.hp/gdb.base-hp/reg.exp: Likewise.
        * gdb.hp/gdb.compat/xdb3.exp: Likewise.
        * gdb.hp/gdb.defects/bs15503.exp: Likewise.
        * gdb.hp/gdb.objdbg/objdbg01.exp: Likewise
        * gdb.hp/gdb.objdbg/objdbg02.exp: Likewise
        * gdb.hp/gdb.objdbg/objdbg03.exp: Likewise
        * gdb.hp/gdb.threads-hp/usrthbasic.exp: Likewise.
        * gdb.hp/gdb.threads-hp/usrthcore.exp: Likewise.
        * gdb.hp/gdb.threads-hp/usrthfork.exp: Likewise.

14 files changed, 58 insertions, 61 deletions

diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
index 8f372d8..b3a6335 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/dollar.exp
@@ -65,8 +65,8 @@ if ![runto_main] then {
 }
 
 # Test for millicode routines
-# hppa2.0w does not support dyncall
-if ![istarget "hppa2.0w*-*-*"] {
+# hppa64 does not support dyncall
+if ![istarget "hppa64*-*-*"] {
 send_gdb "print \$\$dyncall\n"   
 gdb_expect {   
    -re "\\$\[0-9\]* = \\{<text variable, no debug info>\\} $hex <>.*$gdb_prompt $" { pass "print \$\$dyncall" }
@@ -114,8 +114,8 @@ gdb_expect {
 }
 
 # Try out some other $ name, not millicode
-if [istarget "hppa2.0w*-*-*"] {
-    #hppa2.0w uses __argv instead of $ARGV.
+if [istarget "hppa64*-*-*"] {
+    #hppa64 uses __argv instead of $ARGV.
     send_gdb "print \__argv\n"   
     gdb_expect {   
         -re "\\$\[0-9\]* = \[0-9\]*.*$gdb_prompt $" { pass "print \__argv" }
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
index 193b719..4e48107 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/pxdb.exp
@@ -66,7 +66,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {debug}]
 #
 #execute_anywhere "ksh -c \"export LD_PXDB=/dev/null\""
 
-if [istarget "hppa2.0w-*-*"] {
+if [istarget "hppa64-*-*"] {
 set cmdline  "ksh -c \"LD_PXDB=/dev/null ld -o ${binfile} ${objfile} /opt/langtools/lib/pa20_64/crt0.o /opt/langtools/lib/pa20_64/end.o -lc\""
 } else {
 set cmdline  "ksh -c \"LD_PXDB=/dev/null ld -o ${binfile} ${objfile} /usr/ccs/lib/crt0.o /opt/langtools/lib/end.o -lc\""
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
index 8ad8a01..ce42c78 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/reg-pa64.exp
@@ -32,8 +32,8 @@ if ![istarget "hppa*-*-*"] {
     return 0
 }
 
-if ![istarget "hppa2.0w-hp-hpux*"] {
-    verbose "reg-pa64.exp is only for PA2.0W."
+if ![istarget "hppa64-hp-hpux*"] {
+    verbose "reg-pa64.exp is only for PA2.0W (aka PA64)."
     return 0
 }
 
@@ -131,13 +131,13 @@ gdb_test "info reg fpe2" ".*fpe2 .*" "fpe2"
 gdb_test "info reg fpe3" ".*fpe3 .*" "fpe3"
 #DTS CLLbs16708
 #info reg should recognize fpe4..fpe7.
-setup_xfail hppa2.0w-hp-hpux* CLLbs16708
+setup_xfail hppa64-hp-hpux* CLLbs16708
 gdb_test "info reg fpe4" ".*fpe4 .*" "fpe4"
-setup_xfail hppa2.0w-hp-hpux* CLLbs16708
+setup_xfail hppa64-hp-hpux* CLLbs16708
 gdb_test "info reg fpe5" ".*fpe5 .*" "fpe5"
-setup_xfail hppa2.0w-hp-hpux* CLLbs16708
+setup_xfail hppa64-hp-hpux* CLLbs16708
 gdb_test "info reg fpe6" ".*fpe6 .*" "fpe6"
-setup_xfail hppa2.0w-hp-hpux* CLLbs16708
+setup_xfail hppa64-hp-hpux* CLLbs16708
 gdb_test "info reg fpe7" ".*fpe7 .*" "fpe7"
 
 gdb_test "info reg fr4"  ".*fr4.*(double precision).* 1.*"
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
index 3d57e9f..797dc85 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/reg.exp
@@ -30,7 +30,7 @@ if { [skip_hp_tests] } then { continue }
 
 set testfile "reg"
 
-if [istarget "hppa2.0w-hp-hpux*"] {
+if [istarget "hppa64-hp-hpux*"] {
     verbose "reg.exp is not for PA2.0W."
     return 0
 }
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
index ca60282..82e020f 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.exp
@@ -67,7 +67,7 @@ send_user "Making with '${srcdir}/${subdir}/${testfile}.sh $subdir ...\n"
 remote_exec build "${srcdir}/${subdir}/${testfile}.sh $subdir"
 
 # Only HP-UX (and any other platforms using SOM shared libraries, I
-# guess) interprets the auto-solib-add variable as a threshhold,
+# guess) interprets the auto-solib-limit variable as a threshhold,
 # rather than a boolean that strictly enables or disables automatic
 # loading of shlib symbol tables.
 #
@@ -90,44 +90,40 @@ gdb_load ${binfile}
 # debugger's symbol table reaches a specified threshhold.
 #
 
-# On HP-UX, the help text for auto-solib-add mentions that it
+# On HP-UX, the help text for auto-solib-limit mentions that it
 # serves as a threshhold.
 #
-send_gdb "help set auto-solib-add\n"
+send_gdb "help set auto-solib-limit\n"
 gdb_expect {
-  -re "Set autoloading size threshold .in megabytes. of shared library symbols.*
-If nonzero, symbols from all shared object libraries will be loaded.*
-automatically when the inferior begins execution or when the dynamic linker.*
-informs gdb that a new library has been loaded, until the symbol table.*
-of the program and libraries exceeds this threshold.*
-Otherwise, symbols must be loaded manually, using `sharedlibrary'.*$gdb_prompt $"\
-          {pass "help set auto-solib-add"}
+  -re "Set threshold .in Mb. for autoloading shared library symbols.*
+When shared library autoloading is enabled, new libraries will be loaded.*
+only until the total size of shared library symbols exceeds this.*
+threshold in megabytes.  Is ignored when using .sharedlibrary.*$gdb_prompt $"\
+          {pass "help set auto-solib-limit"}
   -re "$gdb_prompt $"\
-          {fail "help set auto-solib-add"}
-  timeout {fail "(timeout) help set auto-solib-add"}
+          {fail "help set auto-solib-limit"}
+  timeout {fail "(timeout) help set auto-solib-limit"}
 }
 
 # On HP-UX, the threshhold is by default set to 50, which means
 # 50 megabytes.
 #
-send_gdb "show auto-solib-add\n"
+send_gdb "show auto-solib-limit\n"
 gdb_expect {
-  -re "Autoloading size threshold .in megabytes. of shared library symbols is $decimal.*$gdb_prompt $"\
-          {pass "show auto-solib-add "}
-  -re "Autoloading size threshold \(in megabytes\) of shared library symbols is $decimal.$gdb_prompt $"\
-          {pass "show auto-solib-add "}
+  -re "Threshold .in Mb. for autoloading shared library symbols is $decimal.*$gdb_prompt $"\
+          {pass "show auto-solib-limit "}
   -re "$gdb_prompt $"\
-          {fail "show auto-solib-add "}
-  timeout {fail "(timeout) show auto-solib-add "}
+          {fail "show auto-solib-limit "}
+  timeout {fail "(timeout) show auto-solib-limit "}
 }
 
-send_gdb "set auto-solib-add 1\n"
+send_gdb "set auto-solib-limit 1\n"
 gdb_expect {
    -re ".*$gdb_prompt $"
-            {pass "set auto-solib-add to 1"}
+            {pass "set auto-solib-limit to 1"}
    -re ".*$gdb_prompt $"
-            {fail "set auto-solib-add to 1"}
-   timeout {fail "(timeout) set auto-solib-add to 1"}
+            {fail "set auto-solib-limit to 1"}
+   timeout {fail "(timeout) set auto-solib-limit to 1"}
 }
 
 
@@ -152,14 +148,14 @@ gdb_expect {
 send_gdb "run\n"
 gdb_expect {
   -re ".*warning. Symbols for some libraries have not been loaded, because.*
-doing so would exceed the size threshold specified by auto-solib-add.*
+doing so would exceed the size threshold specified by auto-solib-limit.*
 To manually load symbols, use the 'sharedlibrary' command.*
-To raise the threshold, set auto-solib-add to a larger value and rerun.*
+To raise the threshold, set auto-solib-limit to a larger value and rerun.*
 the program.*$gdb_prompt $"\
-          {pass "run to main hit auto-solib-add threshold"}
+          {pass "run to main hit auto-solib-limit threshold"}
   -re "$gdb_prompt $"\
-          {fail "run to main hit auto-solib-add threshold"}
-  timeout {fail "(timeout) run to main hit auto-solib-add threshold"}
+          {fail "run to main hit auto-solib-limit threshold"}
+  timeout {fail "(timeout) run to main hit auto-solib-limit threshold"}
 }
 
 # Verify that "info share" mentions something about libraries whose
@@ -251,18 +247,18 @@ gdb_expect {
   timeout {fail "(timeout) 2 set break at main"}
 }
 
-send_gdb "set auto-solib-add 9999\n"
+send_gdb "set auto-solib-limit 9999\n"
 gdb_expect {
   -re "$gdb_prompt $"\
-          {pass "set auto-solib-add threshold to practical infinity"}
-  timeout {fail "(timeout) set auto-solib-add threshold to practical infinity"}
+          {pass "set auto-solib-limit threshold to practical infinity"}
+  timeout {fail "(timeout) set auto-solib-limit threshold to practical infinity"}
 }
 send_gdb "run\n"
 gdb_expect {
   -re ".*warning. Symbols for some libraries have not been loaded, because.*
-doing so would exceed the size threshold specified by auto-solib-add.*
+doing so would exceed the size threshold specified by auto-solib-limit.*
 To manually load symbols, use the 'sharedlibrary' command.*
-To raise the threshold, set auto-solib-add to a larger value and rerun.*
+To raise the threshold, set auto-solib-limit to a larger value and rerun.*
 the program.*$gdb_prompt $"\
           {fail "rerun threshold at practical infinity (still hit threshold)"}
   -re "$gdb_prompt $"\
@@ -297,18 +293,18 @@ gdb_expect {
   timeout {fail "(timeout) 3 set break at main"}
 }
 
-send_gdb "set auto-solib-add 0\n"
+send_gdb "set auto-solib-limit 0\n"
 gdb_expect {
   -re "$gdb_prompt $"\
-          {pass "set auto-solib-add threshold to 0"}
-  timeout {fail "(timeout) set auto-solib-add threshold to 0"}
+          {pass "set auto-solib-limit threshold to 0"}
+  timeout {fail "(timeout) set auto-solib-limit threshold to 0"}
 }
 send_gdb "run\n"
 gdb_expect {
   -re ".*warning. Symbols for some libraries have not been loaded, because.*
-doing so would exceed the size threshold specified by auto-solib-add.*
+doing so would exceed the size threshold specified by auto-solib-limit.*
 To manually load symbols, use the 'sharedlibrary' command.*
-To raise the threshold, set auto-solib-add to a larger value and rerun.*
+To raise the threshold, set auto-solib-limit to a larger value and rerun.*
 the program.*$gdb_prompt $"\
           {fail "rerun threshold at 0 (still hit threshold)"}
   -re "$gdb_prompt $"\
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk
index 13b9a91..f71e921 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/so-thresh.mk
@@ -3,6 +3,7 @@
 OBJDIR=.
 SRCDIR=.
 CFLAGS = +DA1.1 -g
+CC=cc
 
 # This is how to build this generator.
 genso-thresh.o: ${SRCDIR}/genso-thresh.c
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
index 6d66cfc..de983d3 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
+++ b/gdb/testsuite/gdb.hp/gdb.compat/xdb3.exp
@@ -113,7 +113,7 @@ proc test_dir_list { } {
 #test_list_sources
 #
 proc test_list_sources { } {
-    if [istarget "hppa2.0w-*-*"] {
+    if [istarget "hppa64-*-*"] {
 	gdb_test "lf" "Source files for which symbols have been read in:\r\n\r\n.*average\\.c.*Source files for which symbols will be read in on demand:\r\n\r\nglobals,.*\[se\]\[un\]\[md\]\\.c.*\[se\]\[un\]\[md\]\\.c"
     } else {
 	gdb_test "lf" "Source files for which symbols have been read in:\r\n\r\n.*average\\.c.*\r\n\r\nSource files for which symbols will be read in on demand:\r\n\r\nglobals, end\\.c,.*sum\\.c"
@@ -130,7 +130,7 @@ proc test_vlist { } {
 #test_va
 #
 proc test_va { } {
-    if [istarget "hppa2.0w-*-*"] {
+    if [istarget "hppa64-*-*"] {
 	gdb_test "va main" "Dump of assembler code for function main:\r\n.*0x.* <main>:\[ \t\]+std %rp,-0x10\\(%sp\\)\r\n0x.* <main\\+4>:\[ \t\]+std,ma %r3,0xd0\\(%sp\\)\r\n.*0x.* <main\\+8>:\[ \t\]+std %r4,-0xc8\\(%sp\\)\r\n.*0x.* <main\\+12>:\[ \t\]+copy %ret1,%r3\r\n.*"
     } else {
 	gdb_test "va main" "Dump of assembler code for function main:\r\n.*0x.* <main>:\[ \t\]+stw %rp,-0x14\\(%sr0,%sp\\)\r\n0x.* <main\\+4>:\[ \t\]+ldo 0x\[48\]0\\(%sp\\),%sp\r\n.*0x.* <main\\+8>:\[ \t\]+stw %r0,-0x.*\\(%sr0,%sp\\)\r\n.*0x.* <main\\+12>:\[ \t\]+stw %r0,-0x.*\\(%sr0,%sp\\)\r\n.*"
@@ -149,7 +149,7 @@ proc test_list_globals { } {
 #test_list_registers
 #
 proc test_list_registers { } {
-    if [istarget "hppa2.0w-*-*"] {
+    if [istarget "hppa64-*-*"] {
 	gdb_test "lr" "\[ \t\]+flags:.*r17:.*pcsqh:.*cr0:.*\r\n\[ \t\]+r1:.*r18:.*pcoqt:.*cr8:.*"
     } else {
 	gdb_test "lr" "\[ \t\]+flags:.*r18:.*pcsqt:.*ccr:.*\r\n\[ \t\]+r1:.*r19:.*eiem:.*cr12:.*"
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/bs15503.exp b/gdb/testsuite/gdb.hp/gdb.defects/bs15503.exp
index 4fafbbb..cb496a2 100644
--- a/gdb/testsuite/gdb.hp/gdb.defects/bs15503.exp
+++ b/gdb/testsuite/gdb.hp/gdb.defects/bs15503.exp
@@ -42,7 +42,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 #  file or module boundaries", "No symbols in psymtab for file ..." or 
 #  "File ... has ending address after starting address of next file..."
 
-if [istarget "hppa2.0w-hp-hpux*" ] {
+if [istarget "hppa64-hp-hpux*" ] {
     gdb_test "file $binfile" \
         "Detected 64-bit executable..*Invoking .*gdb64..*Use \"run\" to continue execution." \
         "loading $binfile"
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
index 64b49f7..2feed4b 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg01.exp
@@ -117,7 +117,7 @@ for {set filenum 0} {$filenum < 2} {incr filenum 1} {
         gdb_test "s 1" "foo .*/x3.cc:7.*"
         gdb_test "s 1" "main .*/x1.cc:24.*"
         gdb_test "s 1" ".*25.*"
-        if [istarget "hppa2.0w-*-*"] {
+        if [istarget "hppa64-*-*"] {
             gdb_test "s 1" "0x\[0-9a-f\]+ in .*"
             gdb_test "c" ".*Program exited normally.*"
         } else {
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
index 288a9c2..7a7e57a 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg02.exp
@@ -65,7 +65,7 @@ gdb_test "s 1" "foo3 .*/x3.cc:5.*"
 gdb_test "s 1" ".*6.*"
 gdb_test "s 1" "main .*/x1.cc:15.*"
 gdb_test "s 1" ".*16.*"
-if [istarget "hppa2.0w-*-*"] {
+if [istarget "hppa64-*-*"] {
     gdb_test "s 1" "0x\[0-9a-f\]+ in .*START.*"
     gdb_test "c" ".*Program exited normally.*"
 } else {
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
index d0993a5..baaa02a 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/objdbg03.exp
@@ -12,7 +12,7 @@ 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
@@ -129,7 +129,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}"
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp
index c77f1f1..ee9da58 100644
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp
+++ b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp
@@ -28,7 +28,7 @@ if $tracelevel {
 
 if { [skip_hp_tests] } { continue }
 
-if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa2.0w-*-*"] } {
+if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa64-*-*"] } {
     verbose "HPUX thread test ignored for non-hppa or PA64 targets."
     return 0
 }
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp
index 55df043..132bdbe 100644
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp
+++ b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp
@@ -28,7 +28,7 @@ if $tracelevel {
 
 if { [skip_hp_tests] } { continue }
 
-if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa2.0w-*-*"] } {
+if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa64-*-*"] } {
     verbose "HPUX thread test ignored for non-hppa or PA64 targets."
     return 0
 }
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp
index 1303fba..8ffe65c 100644
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp
+++ b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp
@@ -22,7 +22,7 @@ if $tracelevel {
     strace $tracelevel
 }
 
-if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa2.0w-*-*"] } {
+if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa64-*-*"] } {
     verbose "HPUX thread test ignored for non-hppa or PA64 targets."
     return 0
 }