1 files changed, 52 insertions, 46 deletions
diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index a2a2b59..7796ed5 100644
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -49,7 +49,13 @@ set testfile "constvars"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+if [istarget "hppa*-*-*"] {
+    set lang "c++"
+} else {
+    set lang ""
+}
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug $lang]] != "" } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
@@ -100,142 +106,142 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
 # these tests are all expected to fail if GCC is the compiler. -sts
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vox" "type = volatile char"
+gdb_test "ptype vox" "type = volatile char.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype victuals" "type = volatile unsigned char"
+gdb_test "ptype victuals" "type = volatile unsigned char.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vixen" "type = volatile short"
+gdb_test "ptype vixen" "type = volatile short.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vitriol" "type = volatile unsigned short"
+gdb_test "ptype vitriol" "type = volatile unsigned short.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vellum" "type = volatile long"
+gdb_test "ptype vellum" "type = volatile long.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype valve" "type = volatile unsigned long"
+gdb_test "ptype valve" "type = volatile unsigned long.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vacuity" "type = volatile float"
+gdb_test "ptype vacuity" "type = volatile float.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vertigo" "type = volatile double"
+gdb_test "ptype vertigo" "type = volatile double.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vampire" "type = volatile char *"
+gdb_test "ptype vampire" "type = volatile char \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype viper" "type = volatile unsigned char *"
+gdb_test "ptype viper" "type = volatile unsigned char \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vigour" "type = volatile short *"
+gdb_test "ptype vigour" "type = volatile short \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vapour" "type = volatile unsigned short *"
+gdb_test "ptype vapour" "type = volatile unsigned short \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype ventricle" "type = volatile long *"
+gdb_test "ptype ventricle" "type = volatile long \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vigintillion" "type = volatile unsigned long *"
+gdb_test "ptype vigintillion" "type = volatile unsigned long \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vocation" "type = volatile float *"
+gdb_test "ptype vocation" "type = volatile float \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype veracity" "type = volatile double *"
+gdb_test "ptype veracity" "type = volatile double \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vapidity" "type = volatile char * volatile"
+gdb_test "ptype vapidity" "type = volatile char \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype velocity" "type = volatile unsigned char * volatile"
+gdb_test "ptype velocity" "type = volatile unsigned char \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype veneer" "type = volatile short * volatile"
+gdb_test "ptype veneer" "type = volatile short \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype video" "type = volatile unsigned short * volatile"
+gdb_test "ptype video" "type = volatile unsigned short \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vacuum" "type = volatile long * volatile"
+gdb_test "ptype vacuum" "type = volatile long \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype veniality" "type = volatile unsigned long * volatile"
+gdb_test "ptype veniality" "type = volatile unsigned long \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vitality" "type = volatile float * volatile"
+gdb_test "ptype vitality" "type = volatile float \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype voracity" "type = volatile double * volatile"
+gdb_test "ptype voracity" "type = volatile double \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype victor" "type = const volatile char"
+gdb_test "ptype victor" "type = const volatile char.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vicar" "type = const volatile unsigned char"
+gdb_test "ptype vicar" "type = const volatile unsigned char.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype victory" "type = const volatile char *"
+gdb_test "ptype victory" "type = const volatile char \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vicarage" "type = const volatile unsigned char *"
+gdb_test "ptype vicarage" "type = const volatile unsigned char \\*.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vein" "type = volatile char * const"
+gdb_test "ptype vein" "type = volatile char \\* const.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vogue" "type = volatile unsigned char * const"
+gdb_test "ptype vogue" "type = volatile unsigned char \\* const.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype cavern" "type = const volatile char * const"
+gdb_test "ptype cavern" "type = const volatile char \\* const.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype coverlet" "type = const volatile unsigned char * const"
+gdb_test "ptype coverlet" "type = const volatile unsigned char \\* const.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype caveat" "type = const char * volatile"
+gdb_test "ptype caveat" "type = const char \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype covenant" "type = const unsigned char * volatile"
+gdb_test "ptype covenant" "type = const unsigned char \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vizier" "type = const volatile char * volatile"
+gdb_test "ptype vizier" "type = const volatile char \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vanadium" "type = const volatile unsigned char * volatile"
+gdb_test "ptype vanadium" "type = const volatile unsigned char \\* volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vane" "type = char * const volatile"
+gdb_test "ptype vane" "type = char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype veldt" "type = unsigned char * const volatile"
+gdb_test "ptype veldt" "type = unsigned char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype cove" "type = const char * const volatile"
+gdb_test "ptype cove" "type = const char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype cavity" "type = const unsigned char * const volatile"
+gdb_test "ptype cavity" "type = const unsigned char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vagus" "type = volatile char * const volatile"
+gdb_test "ptype vagus" "type = volatile char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vagrancy" "type = volatile unsigned char * const volatile"
+gdb_test "ptype vagrancy" "type = volatile unsigned char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vagary" "type = const volatile char * const volatile"
+gdb_test "ptype vagary" "type = const volatile char \\* const volatile.*"
 
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vendor" "type = const volatile unsigned char * const volatile"
+gdb_test "ptype vendor" "type = const volatile unsigned char \\* const volatile.*"
 
 # test function parameters
 if {$gcc_compiled} then { setup_xfail "*-*-*" }
 send_gdb "ptype qux2\n"
 gdb_expect {
-    -re "type = int \\(volatile unsigned char, const volatile int, volatile short &, volatile long \\*, float \\* volatile, const volatile signed char \\* const volatile\\)" {
+    -re "type = int \\(volatile unsigned char, const volatile int, volatile short, volatile long \\*, float \\* volatile, const volatile signed char \\* const volatile\\).*$gdb_prompt $" {
         pass "ptype qux2"
     }
     -re ".*$gdb_prompt $" { fail "ptype qux2" }