Remove references to HP CC/aCC compiler from testsuite
The HP CC/aCC compiler is exclusive to HP-UX, for which support has been explicitly removed. Therefore, It does not make sense to keep tests for these compilers' quirks. gdb/testsuite/ChangeLog: * gdb.base/break.exp: Remove references to HP CC/aCC compilers. * gdb.base/call-ar-st.exp: Likewise. * gdb.base/callfuncs.exp: Likewise. * gdb.base/condbreak.exp: Likewise. * gdb.base/constvars.exp: Likewise. * gdb.base/hbreak2.exp: Likewise. * gdb.base/langs.exp: Likewise. * gdb.base/list.exp: Likewise. * gdb.base/long_long.exp: Likewise. * gdb.base/ptype.exp: Likewise. * gdb.base/scope.exp: Likewise. * gdb.base/signals.exp: Likewise. * gdb.base/so-impl-ld.exp: Likewise. * gdb.base/varargs.exp: Likewise. * gdb.base/volatile.exp: Likewise. * gdb.base/whatis.exp: Likewise. * gdb.cp/cplusfuncs.exp: Likewise. * gdb.cp/inherit.exp: Likewise. * gdb.cp/local.exp: Likewise. * gdb.cp/member-ptr.exp: Likewise. * gdb.cp/method.exp: Likewise. * gdb.cp/overload.exp: Likewise. * gdb.cp/templates.exp: Likewise. * gdb.stabs/weird.exp: Likewise. * lib/compiler.c: Likewise. * lib/compiler.cc: Likewise. * lib/cp-support.exp: Likewise. * lib/gdb.exp: Likewise.
This commit is contained in:
Simon Marchi
Simon Marchi
parent
35adc03f37
commit
b6304613bf
|
|
@ -1,3 +1,34 @@
|
|||
2015-12-21 Simon Marchi <simon.marchi@polymtl.ca>
|
||||
|
||||
* gdb.base/break.exp: Remove references to HP CC/aCC compilers.
|
||||
* gdb.base/call-ar-st.exp: Likewise.
|
||||
* gdb.base/callfuncs.exp: Likewise.
|
||||
* gdb.base/condbreak.exp: Likewise.
|
||||
* gdb.base/constvars.exp: Likewise.
|
||||
* gdb.base/hbreak2.exp: Likewise.
|
||||
* gdb.base/langs.exp: Likewise.
|
||||
* gdb.base/list.exp: Likewise.
|
||||
* gdb.base/long_long.exp: Likewise.
|
||||
* gdb.base/ptype.exp: Likewise.
|
||||
* gdb.base/scope.exp: Likewise.
|
||||
* gdb.base/signals.exp: Likewise.
|
||||
* gdb.base/so-impl-ld.exp: Likewise.
|
||||
* gdb.base/varargs.exp: Likewise.
|
||||
* gdb.base/volatile.exp: Likewise.
|
||||
* gdb.base/whatis.exp: Likewise.
|
||||
* gdb.cp/cplusfuncs.exp: Likewise.
|
||||
* gdb.cp/inherit.exp: Likewise.
|
||||
* gdb.cp/local.exp: Likewise.
|
||||
* gdb.cp/member-ptr.exp: Likewise.
|
||||
* gdb.cp/method.exp: Likewise.
|
||||
* gdb.cp/overload.exp: Likewise.
|
||||
* gdb.cp/templates.exp: Likewise.
|
||||
* gdb.stabs/weird.exp: Likewise.
|
||||
* lib/compiler.c: Likewise.
|
||||
* lib/compiler.cc: Likewise.
|
||||
* lib/cp-support.exp: Likewise.
|
||||
* lib/gdb.exp: Likewise.
|
||||
|
||||
2015-12-20 Simon Marchi <simon.marchi@polymtl.ca>
|
||||
|
||||
* configure.ac: Remove HP-UX case.
|
||||
|
|
|
|||
|
|
@ -118,12 +118,6 @@ set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
|
|||
|
||||
set main_line $bp_location6
|
||||
|
||||
if {$hp_aCC_compiler} {
|
||||
set proto "\\(int\\)"
|
||||
} else {
|
||||
set proto ""
|
||||
}
|
||||
|
||||
set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
|
||||
set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
|
||||
|
||||
|
|
@ -131,7 +125,7 @@ gdb_test "info break" \
|
|||
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$main_line.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker2 at .*$srcfile1:$bp_location8.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in factorial$proto at .*$srcfile:$bp_location7.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in factorial at .*$srcfile:$bp_location7.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location2.*
|
||||
|
|
@ -459,7 +453,7 @@ gdb_test "tbreak $srcfile:$bp_location11" "Temporary breakpoint.*at.* file .*$s
|
|||
#
|
||||
gdb_test "info break" "Num Type.*Disp Enb Address.*What.*\[\r\n\]
|
||||
\[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$main_line.*\[\r\n\]
|
||||
\[0-9\]+\[\t \]+breakpoint del.*y.*in factorial$proto at .*$srcfile:$bp_location7.*\[\r\n\]
|
||||
\[0-9\]+\[\t \]+breakpoint del.*y.*in factorial at .*$srcfile:$bp_location7.*\[\r\n\]
|
||||
\[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$bp_location1.*\[\r\n\]
|
||||
\[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$bp_location6.*\[\r\n\]
|
||||
\[0-9\]+\[\t \]+breakpoint del.*y.*in main at .*$srcfile:$bp_location2.*\[\r\n\]
|
||||
|
|
@ -647,7 +641,7 @@ gdb_test "break marker2" \
|
|||
"set breakpoint on to-be-called function"
|
||||
|
||||
gdb_test "print marker2(99)" \
|
||||
"The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.marker2$proto. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \
|
||||
"The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.marker2. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \
|
||||
"hit breakpoint on called function"
|
||||
|
||||
# As long as we're stopped (breakpointed) in a called function,
|
||||
|
|
|
|||
|
|
@ -539,12 +539,6 @@ gdb_test continue "Continuing\\..*main \\(\\) at .*$srcfile:$stop_line\[\r\n\t \
|
|||
|
||||
#call print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)
|
||||
|
||||
# FIXME:
|
||||
# HP aCC demangler currently does not handle hp aCC functions with >10 args
|
||||
# DTS CLLbs16994 coulter 990114
|
||||
|
||||
if {$hp_aCC_compiler} {setup_xfail "hppa*-*-*" CLLbs16994}
|
||||
|
||||
if {![gdb_skip_float_test "print print_long_arg_list"] && \
|
||||
![gdb_skip_stdio_test "print print_long_arg_list"] } {
|
||||
|
||||
|
|
|
|||
|
|
@ -301,22 +301,11 @@ proc fetch_all_registers {test} {
|
|||
}
|
||||
|
||||
proc rerun_and_prepare {} {
|
||||
global hp_aCC_compiler
|
||||
|
||||
if { ![runto_main] } {
|
||||
gdb_suppress_tests
|
||||
}
|
||||
if { $hp_aCC_compiler } {
|
||||
# Do not set language explicitly to 'C'. This will cause aCC
|
||||
# tests to fail because promotion rules are different. Just let
|
||||
# the language be set to the default.
|
||||
# However, turn off overload-resolution for aCC. Having it on causes
|
||||
# a lot of failures.
|
||||
|
||||
gdb_test_no_output "set overload-resolution 0"
|
||||
} else {
|
||||
gdb_test_no_output "set language c"
|
||||
}
|
||||
gdb_test_no_output "set language c"
|
||||
|
||||
get_debug_format
|
||||
|
||||
|
|
|
|||
|
|
@ -92,32 +92,18 @@ gdb_test "break marker4" \
|
|||
#
|
||||
# check to see what breakpoints are set
|
||||
#
|
||||
|
||||
if {$hp_aCC_compiler} {
|
||||
set marker1_proto "\\(void\\)"
|
||||
set marker2_proto "\\(int\\)"
|
||||
# Not checked.
|
||||
set marker3_proto "\\(char \\*, char \\*\\)"
|
||||
set marker4_proto "\\(long\\)"
|
||||
} else {
|
||||
set marker1_proto ""
|
||||
set marker2_proto ""
|
||||
set marker3_proto ""
|
||||
set marker4_proto ""
|
||||
}
|
||||
|
||||
gdb_test "info break" \
|
||||
"Num Type\[ \]+Disp Enb Address\[ \]+What.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location6.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker1$marker1_proto at .*$srcfile2:$bp_location15.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker1 at .*$srcfile2:$bp_location15.*
|
||||
\[\t \]+stop only if \\(1==1\\).*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in main at .*$srcfile:$bp_location1.*
|
||||
\[\t \]+stop only if \\(1==1\\).*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker2$marker2_proto at .*$srcfile2:$bp_location8.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker2 at .*$srcfile2:$bp_location8.*
|
||||
\[\t \]+stop only if \\(a==43\\).*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker3$marker3_proto at .*$srcfile2:$bp_location17.*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker3 at .*$srcfile2:$bp_location17.*
|
||||
\[\t \]+stop only if \\(multi_line_if_conditional\\(1,1,1\\)==0\\).*
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker4$marker4_proto at .*$srcfile2:$bp_location14.*" \
|
||||
\[0-9\]+\[\t \]+breakpoint keep y.* in marker4 at .*$srcfile2:$bp_location14.*" \
|
||||
"breakpoint info"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -63,11 +63,6 @@ proc local_compiler_xfail_check { } {
|
|||
setup_xfail "*-*-*"
|
||||
}
|
||||
}
|
||||
|
||||
global hp_cc_compiler
|
||||
if { $hp_cc_compiler } {
|
||||
setup_xfail "hppa*-*-hpux*"
|
||||
}
|
||||
}
|
||||
|
||||
# A few tests still xfail with gcc 3 -gstabs+ and gcc 4 -gstabs+.
|
||||
|
|
|
|||
|
|
@ -133,12 +133,6 @@ set bp_location6 [gdb_get_line_number "set breakpoint 6 here"]
|
|||
|
||||
set main_line $bp_location6
|
||||
|
||||
if {$hp_aCC_compiler} {
|
||||
set proto "\\(int\\)"
|
||||
} else {
|
||||
set proto ""
|
||||
}
|
||||
|
||||
set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
|
||||
set bp_location8 [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
|
||||
|
||||
|
|
@ -397,7 +391,7 @@ gdb_test "hbreak marker2" \
|
|||
"set hardware breakpoint on to-be-called function"
|
||||
|
||||
gdb_test "print marker2(99)" \
|
||||
"The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.marker2$proto. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \
|
||||
"The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.marker2. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \
|
||||
"hit hardware breakpoint on called function"
|
||||
|
||||
# As long as we're stopped (breakpointed) in a called function,
|
||||
|
|
|
|||
|
|
@ -48,37 +48,18 @@ gdb_test_multiple "b langs0" "break on nonexistent function in langs.exp" {
|
|||
}
|
||||
}
|
||||
|
||||
if {$hp_aCC_compiler} {
|
||||
set isfixed 1
|
||||
set lang c\\+\\+
|
||||
set ext cxx
|
||||
set foo_func foo__Fi__Fi
|
||||
set do_func do::langs0
|
||||
} else {
|
||||
if {$hp_cc_compiler} {
|
||||
set isfixed 1
|
||||
set lang c
|
||||
set ext c
|
||||
} else {
|
||||
set isfixed 0
|
||||
}
|
||||
set foo_func foo__Fi
|
||||
set do_func langs0__2do
|
||||
}
|
||||
# TODO: Since there variables are now constants, we can cleanup the test,
|
||||
# remove some dead code.
|
||||
set isfixed 0
|
||||
set foo_func foo__Fi
|
||||
set do_func langs0__2do
|
||||
|
||||
if [runto csub] then {
|
||||
|
||||
if { !$isfixed } { set lang c }
|
||||
gdb_test "show language" "currently $lang\".*" \
|
||||
"show language at csub in langs.exp"
|
||||
# On some machines, foo doesn't get demangled because the N_SOL for
|
||||
# langs2.cxx is seen only after the function stab for foo. So
|
||||
# the following regexps are kludged to accept foo__Fi as well as foo,
|
||||
# even though only the latter is correct. I haven't tried to xfail it
|
||||
# because it depends on details of the compiler.
|
||||
|
||||
# Take out xfail. This test has been passing for some time now.
|
||||
#if {!$gcc_compiled} then { setup_xfail "hppa*-*-hpux*" }
|
||||
|
||||
gdb_test "bt" "#0.*csub.*#1.*(foo|$foo_func) \\(.*#2.*cppsub_ .*#3.*fsub.*#4.*$do_func \\(.*#5 \[0-9a-fx\]* in main.*" "backtrace in langs.exp"
|
||||
|
||||
if { !$isfixed } { set lang c\\+\\+; set ext cxx }
|
||||
|
|
@ -101,8 +82,6 @@ if [runto csub] then {
|
|||
gdb_test "show language" "currently $lang.*" \
|
||||
"show language at fsub in langs.exp"
|
||||
|
||||
# Take out xfail. This test has been passing for sometime now.
|
||||
#if {!$gcc_compiled} then { setup_xfail "hppa*-*-hpux*" }
|
||||
if { !$isfixed } { set lang c }
|
||||
gdb_test "up" ".* in $do_func .* at .*langs0\\.c.*return fsub.*" \
|
||||
"up to langs0__2do in langs.exp"
|
||||
|
|
|
|||
|
|
@ -69,8 +69,6 @@ proc set_listsize { arg } {
|
|||
|
||||
proc test_listsize {} {
|
||||
global gdb_prompt
|
||||
global hp_cc_compiler
|
||||
global hp_aCC_compiler
|
||||
global last_line_re
|
||||
|
||||
# Show default size
|
||||
|
|
|
|||
|
|
@ -30,13 +30,7 @@ if [get_compiler_info] {
|
|||
return -1
|
||||
}
|
||||
|
||||
if {$hp_cc_compiler} {
|
||||
set flag "+e"
|
||||
} else {
|
||||
set flag ""
|
||||
}
|
||||
|
||||
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug additional_flags=$flag nowarnings]] != "" } {
|
||||
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug nowarnings]] != "" } {
|
||||
untested long_long.exp
|
||||
return -1
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ gdb_test "ptype boolean" "type = enum (boolean |)\{FALSE, TRUE\}.*" "ptype unnam
|
|||
# GDB's behavior is correct; the type which the variable is defined
|
||||
# as (51) doesn't have a name. Only 55 has a name.
|
||||
|
||||
if {!$gcc_compiled && !$hp_aCC_compiler} {
|
||||
if {!$gcc_compiled} {
|
||||
setup_xfail "rs6000-*-*" "i*86-*-sysv4*"
|
||||
setup_xfail "hppa*-*-*" CLLbs14773
|
||||
}
|
||||
|
|
@ -350,7 +350,6 @@ gdb_test "ptype v_int" "type = int.*" "ptype int"
|
|||
#
|
||||
|
||||
if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" "i*86-*-sysv4*" }
|
||||
if {$hp_aCC_compiler} {setup_xfail "hppa*-*-*"}
|
||||
gdb_test "ptype t_char_array" "type = (|unsigned )char \\\[0?\\\]"
|
||||
|
||||
gdb_test "ptype pv_char_array" "type = (|unsigned )char \\(\\*\\)\\\[0?\\\]"
|
||||
|
|
@ -476,34 +475,25 @@ gdb_test "ptype pv_char_array" "type = (|unsigned )char \\(\\*\\)\\\[0?\\\]"
|
|||
#
|
||||
# test ptype command with nested structure and union
|
||||
#
|
||||
if {$hp_aCC_compiler} {
|
||||
set outer "outer_struct::"
|
||||
set struct ""
|
||||
set union ""
|
||||
} else {
|
||||
set outer ""
|
||||
set struct "struct"
|
||||
set union "union"
|
||||
}
|
||||
gdb_test "ptype struct outer_struct" "type = struct outer_struct \{.*\[\r\n\]+\
|
||||
.*int outer_int;.*\[\r\n\]+\
|
||||
.*(struct|) ${outer}inner_struct inner_struct_instance;.*\[\r\n\]+\
|
||||
.*(union|) ${outer}inner_union inner_union_instance;.*\[\r\n\]+\
|
||||
.*(long|long int|int) outer_long;.*\[\r\n\]\}.*" "ptype outer structure"
|
||||
.*(struct|) inner_struct inner_struct_instance;.*\[\r\n\]+\
|
||||
.*(union|) inner_union inner_union_instance;.*\[\r\n\]+\
|
||||
.*(long|long int|int) outer_long;.*\[\r\n\]\}.*" "ptype outer structure"
|
||||
|
||||
gdb_test "ptype ${struct} ${outer}inner_struct" "type = struct ${outer}inner_struct \{.*\[\r\n\] int inner_int;.*\[\r\n\] (long|long int|int) inner_long;.*\[\r\n\]\}.*" "ptype inner structure"
|
||||
gdb_test "ptype struct inner_struct" "type = struct inner_struct \{.*\[\r\n\] int inner_int;.*\[\r\n\] (long|long int|int) inner_long;.*\[\r\n\]\}.*" "ptype inner structure"
|
||||
|
||||
gdb_test "ptype ${union} ${outer}inner_union" "type = union ${outer}inner_union \{.*\[\r\n\] int inner_union_int;.*\[\r\n\] (long|long int|int) inner_union_long;.*\[\r\n\]\}.*" "ptype inner union"
|
||||
gdb_test "ptype union inner_union" "type = union inner_union \{.*\[\r\n\] int inner_union_int;.*\[\r\n\] (long|long int|int) inner_union_long;.*\[\r\n\]\}.*" "ptype inner union"
|
||||
|
||||
gdb_test "ptype nested_su" "type = struct outer_struct \{.*\[\r\n\] int outer_int;.*\[\r\n\] (struct |)${outer}inner_struct inner_struct_instance;.*\[\r\n\] (union |)${outer}inner_union inner_union_instance;.*\[\r\n\] (long|long int|int) outer_long;.*\[\r\n\]\}.*" "ptype nested structure"
|
||||
gdb_test "ptype nested_su" "type = struct outer_struct \{.*\[\r\n\] int outer_int;.*\[\r\n\] (struct |)inner_struct inner_struct_instance;.*\[\r\n\] (union |)inner_union inner_union_instance;.*\[\r\n\] (long|long int|int) outer_long;.*\[\r\n\]\}.*" "ptype nested structure"
|
||||
|
||||
gdb_test "ptype nested_su.outer_int" "type = int.*" "ptype outer int"
|
||||
gdb_test "ptype nested_su.outer_int" "type = int.*" "ptype outer int"
|
||||
|
||||
gdb_test "ptype nested_su.inner_struct_instance" "type = struct ${outer}inner_struct \{.*\[\r\n\] int inner_int;.*\[\r\n\] (long|long int|int) inner_long;.*\[\r\n\]\}.*" "ptype nested structure #2"
|
||||
gdb_test "ptype nested_su.inner_struct_instance" "type = struct inner_struct \{.*\[\r\n\] int inner_int;.*\[\r\n\] (long|long int|int) inner_long;.*\[\r\n\]\}.*" "ptype nested structure #2"
|
||||
|
||||
gdb_test "ptype nested_su.inner_struct_instance.inner_int" "type = int.*" "ptype inner int"
|
||||
gdb_test "ptype nested_su.inner_struct_instance.inner_int" "type = int.*" "ptype inner int"
|
||||
|
||||
gdb_test "ptype nested_su.inner_union_instance" "type = union ${outer}inner_union \{.*\[\r\n\] int inner_union_int;.*\[\r\n\] (long|long int|int) inner_union_long;.*\[\r\n\]\}.*" "ptype nested union"
|
||||
gdb_test "ptype nested_su.inner_union_instance" "type = union inner_union \{.*\[\r\n\] int inner_union_int;.*\[\r\n\] (long|long int|int) inner_union_long;.*\[\r\n\]\}.*" "ptype nested union"
|
||||
|
||||
# Print the type description of variable the_highest, and verify that
|
||||
# the type description for the fields whose type is anonymous are
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ proc test_at_main {} {
|
|||
global det_file
|
||||
global srcdir
|
||||
global subdir
|
||||
global hp_cc_compiler
|
||||
|
||||
# skip past init0.
|
||||
# This used to do an extra "next" if the first one didn't get us
|
||||
|
|
@ -106,7 +105,6 @@ proc test_at_main {} {
|
|||
# Print scope1.c::filelocal_ro, which is 202
|
||||
|
||||
if { [test_compiler_info gcc-*-*] } then { setup_xfail "rs6000-*-*" }
|
||||
if {$hp_cc_compiler} then { setup_xfail "hppa2.0w-*-*" 11747CLLbs}
|
||||
if [gdb_test "print 'scope1.c'::filelocal_ro" "\\\$$decimal = 202" "print 'scope1.c'::filelocal_ro" "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::filelocal_ro"] {
|
||||
gdb_suppress_tests
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,12 +32,6 @@ if [get_compiler_info] {
|
|||
return -1
|
||||
}
|
||||
|
||||
if {$hp_cc_compiler} {
|
||||
set void 0
|
||||
} else {
|
||||
set void void
|
||||
}
|
||||
|
||||
gdb_exit
|
||||
gdb_start
|
||||
|
||||
|
|
@ -103,7 +97,7 @@ if [runto_main] then {
|
|||
|
||||
# ...call the function
|
||||
|
||||
gdb_test "p func1 ()" "^p func1 \\(\\)\r\n.\[0-9\]* = $void" \
|
||||
gdb_test "p func1 ()" "^p func1 \\(\\)\r\n.\[0-9\]* = void" \
|
||||
"p func1 () #1"
|
||||
|
||||
# ...veryfiy that the cout was updated
|
||||
|
|
|
|||
|
|
@ -30,14 +30,6 @@ if [get_compiler_info] {
|
|||
return -1
|
||||
}
|
||||
|
||||
if [get_compiler_info] {
|
||||
return -1
|
||||
}
|
||||
|
||||
if [test_compiler_info "hpcc-*"] {
|
||||
lappend exec_opts "additional_flags=-Ae"
|
||||
}
|
||||
|
||||
if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
|
||||
|| [gdb_compile $srcdir/$subdir/$srcfile $binfile \
|
||||
executable $exec_opts] != ""} {
|
||||
|
|
|
|||
|
|
@ -42,10 +42,6 @@ if [support_complex_tests] {
|
|||
lappend additional_flags "additional_flags=-DTEST_COMPLEX"
|
||||
}
|
||||
|
||||
if {$hp_cc_compiler} {
|
||||
lappend additional_flags "additional_flags=-Ae"
|
||||
}
|
||||
|
||||
# build the first test case
|
||||
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
|
||||
executable ${additional_flags}] != "" } {
|
||||
|
|
@ -71,19 +67,6 @@ if ![runto test] then {
|
|||
continue
|
||||
}
|
||||
|
||||
if { $hp_aCC_compiler } {
|
||||
# When compiled w/ aCC we need to disable overload resolution
|
||||
# for command line calls.
|
||||
# We need it for vararg calls since the aCC compiler gives us no
|
||||
# information about the undeclared arguments, or even that there
|
||||
# _are_ undeclared arguments. As far as gdb is concerned it only
|
||||
# knows about the declared arguments. So we need to force the call
|
||||
# even though the overload resolution mechanism says that the types
|
||||
# don't match.
|
||||
# - guo
|
||||
gdb_test_no_output "set overload-resolution 0"
|
||||
}
|
||||
|
||||
gdb_test_stdio "print find_max1(5,1,2,3,4,5)" \
|
||||
"find_max\\(5, 1, 2, 3, 4, 5\\) returns 5\[ \r\n\]+" \
|
||||
".\[0-9\]+ = 5" \
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ if ![runto_main] then {
|
|||
get_debug_format
|
||||
|
||||
# Many tests xfail with gcc 2 -gstabs+.
|
||||
# TODO: check out the hp side of this.
|
||||
|
||||
proc local_compiler_xfail_check { } {
|
||||
if { [test_compiler_info gcc-2-*] } then {
|
||||
|
|
@ -65,11 +64,6 @@ proc local_compiler_xfail_check { } {
|
|||
setup_xfail "*-*-*"
|
||||
}
|
||||
}
|
||||
|
||||
global hp_cc_compiler
|
||||
if { $hp_cc_compiler } {
|
||||
setup_xfail "hppa*-*-hpux*"
|
||||
}
|
||||
}
|
||||
|
||||
# A few tests still xfail with gcc 3 -gstabs+ and gcc 4 -gstabs+.
|
||||
|
|
|
|||
|
|
@ -281,14 +281,6 @@ gdb_test "whatis v_double_pointer" \
|
|||
"whatis double pointer"
|
||||
|
||||
|
||||
if { $hp_aCC_compiler } {
|
||||
set unstruct "unnamed\.struct\..*"
|
||||
set ununion "unnamed\.union\..*"
|
||||
} else {
|
||||
set unstruct "\.\.\."
|
||||
set ununion "\.\.\."
|
||||
}
|
||||
|
||||
# test whatis command with structure types
|
||||
gdb_test "whatis v_struct1" \
|
||||
"type = struct t_struct" \
|
||||
|
|
@ -299,7 +291,7 @@ gdb_test "whatis struct t_struct" \
|
|||
"whatis named structure using type name"
|
||||
|
||||
gdb_test "whatis v_struct2" \
|
||||
"type = struct \{$unstruct\}" \
|
||||
"type = struct \{\.\.\.\}" \
|
||||
"whatis unnamed structure"
|
||||
|
||||
|
||||
|
|
@ -313,15 +305,11 @@ gdb_test "whatis union t_union" \
|
|||
"whatis named union using type name"
|
||||
|
||||
gdb_test "whatis v_union2" \
|
||||
"type = union \{$ununion\}" \
|
||||
"type = union \{\.\.\.\}" \
|
||||
"whatis unnamed union"
|
||||
|
||||
|
||||
# HP-UX: HP aCC compiler w/ +objdebug option detects language as
|
||||
# c++, so we need the 'void' pattern here.
|
||||
# Without +objdebug compilation option we still need to match ''.
|
||||
# - guo
|
||||
# Also, using stabs we will mark these functions as prototyped. This
|
||||
# Using stabs we will mark these functions as prototyped. This
|
||||
# is harmless but causes an extra VOID to be printed.
|
||||
set void "(void|)"
|
||||
|
||||
|
|
@ -428,14 +416,8 @@ gdb_test "whatis nested_su.outer_int" \
|
|||
"type = int" \
|
||||
"whatis outer structure member"
|
||||
|
||||
if {$hp_aCC_compiler} {
|
||||
set outer "outer_struct::"
|
||||
} else {
|
||||
set outer ""
|
||||
}
|
||||
|
||||
gdb_test "whatis nested_su.inner_struct_instance" \
|
||||
"type = struct ${outer}inner_struct" \
|
||||
"type = struct inner_struct" \
|
||||
"whatis inner structure"
|
||||
|
||||
gdb_test "whatis nested_su.inner_struct_instance.inner_int" \
|
||||
|
|
@ -443,7 +425,7 @@ gdb_test "whatis nested_su.inner_struct_instance.inner_int" \
|
|||
"whatis inner structure member"
|
||||
|
||||
gdb_test "whatis nested_su.inner_union_instance" \
|
||||
"type = union ${outer}inner_union" \
|
||||
"type = union inner_union" \
|
||||
"whatis inner union"
|
||||
|
||||
gdb_test "whatis nested_su.inner_union_instance.inner_union_int" \
|
||||
|
|
|
|||
|
|
@ -443,7 +443,6 @@ proc test_lookup_operator_functions {} {
|
|||
|
||||
proc test_paddr_operator_functions {} {
|
||||
global hex
|
||||
global hp_aCC_compiler
|
||||
global dm_operator_comma
|
||||
global dm_type_char_star
|
||||
global dm_type_foo_ref
|
||||
|
|
@ -496,13 +495,9 @@ proc test_paddr_operator_functions {} {
|
|||
" = .* $hex <foo::operator new\\(.*\\)(| static)>"
|
||||
gdb_test "print &foo::operator new\[\]" \
|
||||
" = .* $hex <foo::operator new\\\[\\\]\\(.*\\)(| static)>"
|
||||
if { !$hp_aCC_compiler } {
|
||||
print_addr "foo::operator delete($dm_type_void_star)"
|
||||
print_addr "foo::operator delete[]($dm_type_void_star)"
|
||||
} else {
|
||||
gdb_test "print &'foo::operator delete($dm_type_void_star) static'" \
|
||||
" = .*(0x\[0-9a-f\]+|) <foo::operator delete.*>"
|
||||
}
|
||||
|
||||
print_addr "foo::operator delete($dm_type_void_star)"
|
||||
print_addr "foo::operator delete[]($dm_type_void_star)"
|
||||
|
||||
print_addr "foo::operator int($dm_type_void)"
|
||||
print_addr "foo::operator $dm_operator_char_star\($dm_type_void)"
|
||||
|
|
|
|||
|
|
@ -420,9 +420,6 @@ proc test_print_mi_classes { } {
|
|||
# incapable of printing the member of an anonymous union.
|
||||
# We test the printing of the member first, and perform the other tests
|
||||
# only if the test succeeds, to avoid the infinite loop.
|
||||
#
|
||||
# GDB HEAD 2004-01-27 with hp aCC A.03.45 crashes on the first test.
|
||||
# -- chastain 2004-01-27
|
||||
|
||||
proc test_print_anon_union {} {
|
||||
global gdb_prompt
|
||||
|
|
|
|||
|
|
@ -224,12 +224,6 @@ gdb_test_multiple "ptype InnerLocal" "ptype InnerLocal" {
|
|||
-re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" {
|
||||
pass "ptype InnerLocal (pattern 2)"
|
||||
}
|
||||
-re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*InnerLocal::NestedInnerLocal nest1;\r\n\r\n\[\t \]*.int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\}\[\t \]*\\(Local at.*local\\.cc:36\\).*$gdb_prompt $" {
|
||||
pass "ptype InnerLocal (old HP aCC)"
|
||||
}
|
||||
-re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*class InnerLocal4::NestedInnerLocal nest1;\r\n\r\n\[\t \]*int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\\(Local at.*local\.cc:\[0-9\]+\\)\r\n\}.*$gdb_prompt $" {
|
||||
pass "ptype InnerLocal (old HP aCC)"
|
||||
}
|
||||
-re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]* int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*\}.*$gdb_prompt $" {
|
||||
pass "ptype InnerLocal (pattern 5)"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,12 +78,6 @@ gdb_test_multiple "print pmi" $name {
|
|||
# gcc HEAD 2004-01-11 05:33:21 -gstabs+
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "$vhn = \\(int ?\\( A::\\*\\)\\) 536870920\r\n$gdb_prompt $" {
|
||||
# the value is 0x20000008 hex. 0x20000000 is an internal flag.
|
||||
# Use '|' to add in more values as needed.
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
}
|
||||
|
||||
# print dereferenced pointer to data member
|
||||
|
|
@ -157,12 +151,6 @@ gdb_test_multiple "print pmi" $name {
|
|||
# gcc HEAD 2004-01-11 05:33:21 -gstabs+
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "$vhn = \\(int ?\\( A::\\*\\)\\) 536870924\r\n$gdb_prompt $" {
|
||||
# the value is 0x20000008 hex. 0x20000000 is an internal flag.
|
||||
# Use '|' to add in more values as needed.
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
}
|
||||
|
||||
# print dereferenced pointer to data member again
|
||||
|
|
@ -413,10 +401,6 @@ gdb_test_multiple "ptype pmf" $name {
|
|||
-re "type = int \\( ?A::\\*\\)\\(A \\*( const)?, int\\)\r\n$gdb_prompt $" {
|
||||
pass $name
|
||||
}
|
||||
-re "type = int \\( ?A::\\*\\)\\(void\\)\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "type = struct \{.*\}\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# gcc 2.95.3 -gstabs+
|
||||
|
|
@ -435,10 +419,6 @@ gdb_test_multiple "print pmf" $name {
|
|||
-re "$vhn = \\(int \\(A::\\*\\)\\(A \\*( const)?, int\\)\\) $hex <A::bar\\(int\\)>\r\n$gdb_prompt $" {
|
||||
pass $name
|
||||
}
|
||||
-re "$vhn = .*not supported with HP aCC.*\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "$vhn = \{.*\}\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# gcc 2.95.3 -gstabs+
|
||||
|
|
@ -457,10 +437,6 @@ gdb_test_multiple "ptype pmf_p" $name {
|
|||
-re "type = int \\( ?A::\\*\\*\\)\\(A \\*( const)?, int\\)\r\n$gdb_prompt $" {
|
||||
pass $name
|
||||
}
|
||||
-re "type = int \\( ?A::\\*\\*\\)\\(void\\)\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "type = struct \{.*\} \\*\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# gcc 2.95.3 -gstabs+
|
||||
|
|
@ -482,10 +458,6 @@ gdb_test_multiple "print pmf_p" $name {
|
|||
-re "$vhn = \\(PMF \\*\\) $hex\r\n$gdb_prompt $" {
|
||||
pass "gdb/NNNN"
|
||||
}
|
||||
-re "$vhn = \\(int \\( ?A::\\*\\*\\)\\(void\\)\\) $hex\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "$vhn = \\(struct \{.*\} \\*\\) $hex\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
kfail "gdb/NNNN" $name
|
||||
|
|
@ -499,10 +471,6 @@ gdb_test_multiple "print a.*pmf" $name {
|
|||
-re "$vhn = {int \\(A \\*( const)?, int\\)} $hex <A::bar\\(int\\)>\r\n$gdb_prompt $" {
|
||||
pass $name
|
||||
}
|
||||
-re "Pointers to methods not supported with HP aCC\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "Value can't be converted to integer.\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# gcc 2.95.3 -gstabs+
|
||||
|
|
@ -521,10 +489,6 @@ gdb_test_multiple "print a_p->*pmf" $name {
|
|||
-re "$vhn = {int \\(A \\*( const)?, int\\)} $hex <A::bar\\(int\\)>\r\n$gdb_prompt $" {
|
||||
pass $name
|
||||
}
|
||||
-re "Pointers to methods not supported with HP aCC\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "Value can't be converted to integer.\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# gcc 2.95.3 -gstabs+
|
||||
|
|
@ -555,9 +519,6 @@ gdb_test_multiple "set var pmf = &A::foo" $name {
|
|||
# gcc HEAD 2004-01-10 -gstabs+
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "Assignment to pointers to methods not implemented with HP aCC\r\n$gdb_prompt $" {
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
}
|
||||
|
||||
# dereference the pointer to data member without any object
|
||||
|
|
@ -605,10 +566,6 @@ gdb_test_multiple "print (a.*pmf)(3)" $name {
|
|||
-re "$vhn = 50\r\n$gdb_prompt $" {
|
||||
pass $name
|
||||
}
|
||||
-re "Not implemented: function invocation through pointer to method with HP aCC\r\n$gdb_prompt $" {
|
||||
# hpacc A.03.45
|
||||
kfail "gdb/NNNN" $name
|
||||
}
|
||||
-re "Value can't be converted to integer.\r\n$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# gcc 2.95.3 -gstabs+
|
||||
|
|
|
|||
|
|
@ -152,9 +152,6 @@ gdb_test_multiple "ptype A" "ptype A" {
|
|||
-re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\) volatile;\r\n\[ \]*int qux\\(int, float\\) (const volatile|volatile const);\r\n\[ \]*A & operator=\\(A const ?&\\);\r\n\[ \]*A\\(A const ?&\\);\r\n\[ \]*A\\((void|)\\);\r\n\}\r\n$gdb_prompt $" {
|
||||
pass "ptype A"
|
||||
}
|
||||
-re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\);\r\n\[ \]*int qux\\(int, float\\) const;\r\n\}\r\n$gdb_prompt $" {
|
||||
pass "ptype A (HP aCC bug -- volatile not indicated)"
|
||||
}
|
||||
-re "type = class A \{\r\n\[ \]*public:\r\n\[ \]*int x;\r\n\[ \]*int y;\r\n\r\n\[ \]*int foo\\(int\\);\r\n\[ \]*int bar\\(int\\) const;\r\n\[ \]*int baz\\(int, char\\) volatile;\r\n\[ \]*int qux\\(int, float\\) const volatile;\r\n\}\r\n$gdb_prompt $" {
|
||||
pass "ptype A"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,11 +91,6 @@ set re_synth "foo & operator=\\(foo const ?&\\);"
|
|||
gdb_test "print foo_instance1" "\\$\[0-9\]+ = \{ifoo = 111, ccpfoo = 0x0\}"
|
||||
|
||||
gdb_test_multiple "ptype foo_instance1" "ptype foo_instance1" {
|
||||
-re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gdwarf-2
|
||||
# TODO: this is not a quirk!
|
||||
pass "ptype foo_instance1 (HP aCC -- known quirk with ~foo parameter list)"
|
||||
}
|
||||
-re "type = $re_class${ws}$XX_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}$nl$gdb_prompt $" {
|
||||
# gcc 2.95.3 -gstabs+, no "const" on "const char *"
|
||||
# TODO: gdb.base/constvar.exp has XFAILed this kind of problem for a
|
||||
|
|
|
|||
|
|
@ -116,7 +116,6 @@ proc test_template_breakpoints {} {
|
|||
global gdb_prompt
|
||||
global testfile
|
||||
global srcdir
|
||||
global hp_aCC_compiler
|
||||
|
||||
gdb_test_multiple "break T5<int>::T5" "constructor breakpoint" {
|
||||
-re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2.*templates.cc:T5<int>::T5\\((T5<int> const|const T5<int>) ?&\\)\[\r\n\]*.3.*templates.cc:T5<int>::T5\\(int\\)\[\r\n\]*> $" {
|
||||
|
|
@ -137,9 +136,6 @@ proc test_template_breakpoints {} {
|
|||
}
|
||||
}
|
||||
|
||||
# See CLLbs14792
|
||||
if {$hp_aCC_compiler} {setup_xfail hppa*-*-* CLLbs14792}
|
||||
|
||||
gdb_test_multiple "break T5<int>::~T5" "destructor_breakpoint" {
|
||||
-re "Breakpoint.*at.* file .*${testfile}.cc, line.*$gdb_prompt $"
|
||||
{
|
||||
|
|
@ -186,7 +182,6 @@ proc test_template_breakpoints {} {
|
|||
|
||||
proc test_template_calls {} {
|
||||
global gdb_prompt
|
||||
global hp_aCC_compiler
|
||||
|
||||
if [target_info exists gdb,cannot_call_functions] {
|
||||
setup_xfail "*-*-*" 2416
|
||||
|
|
@ -194,7 +189,7 @@ proc test_template_calls {} {
|
|||
return
|
||||
}
|
||||
|
||||
if {!$hp_aCC_compiler} {setup_xfail hppa*-*-*}
|
||||
setup_xfail hppa*-*-*
|
||||
gdb_test_multiple "print t5i.value()" "print t5i.value()" {
|
||||
-re ".* = 2\[\r\n\]*$gdb_prompt $" {
|
||||
pass "print t5i.value()"
|
||||
|
|
|
|||
|
|
@ -25,16 +25,6 @@ if { [ get_compiler_info ] } {
|
|||
return -1
|
||||
}
|
||||
|
||||
if { $hp_cc_compiler || $hp_aCC_compiler } {
|
||||
# The native hp-ux assembler does not support stabs at all.
|
||||
# If the compiler is native hp-ux, of course the assembler is too.
|
||||
# But if someone builds gcc with the native assembler (not recommended)
|
||||
# rather than the gnu assembler, then this logic will not suppress it.
|
||||
# -- chastain 2004-01-07
|
||||
unsupported "stabs with hp-ux assembler"
|
||||
continue
|
||||
}
|
||||
|
||||
proc do_tests {} {
|
||||
global binfile
|
||||
global gdb_prompt
|
||||
|
|
|
|||
|
|
@ -28,18 +28,11 @@
|
|||
test_compiler_info.
|
||||
|
||||
TODO: all clients should use test_compiler_info and should not
|
||||
use gcc_compiled, hp_cc_compiler, or hp_aCC_compiler.
|
||||
use gcc_compiled.
|
||||
|
||||
*/
|
||||
|
||||
/* Note the semicolon at the end of this line. Older versions of
|
||||
hp c++ have a bug in string preprocessing: if the last token on a
|
||||
line is a string, then the preprocessor concatenates the next line
|
||||
onto the current line and eats the newline! That messes up TCL of
|
||||
course. That happens with HP aC++ A.03.13, but it no longer happens
|
||||
with HP aC++ A.03.45. */
|
||||
|
||||
set compiler_info "unknown" ;
|
||||
set compiler_info "unknown"
|
||||
|
||||
#if defined (__GNUC__)
|
||||
#if defined (__GNUC_PATCHLEVEL__)
|
||||
|
|
@ -50,20 +43,6 @@ set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ "unknown"} -]
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#if defined (__HP_CXD_SPP)
|
||||
/* older hp ansi c, such as A.11.01.25171.gp, defines this */
|
||||
set compiler_info [join {hpcc __HP_CXD_SPP} -]
|
||||
#endif
|
||||
|
||||
#if defined (__HP_cc)
|
||||
/* newer hp ansi c, such as B.11.11.28706.gp, defines this */
|
||||
set compiler_info [join {hpcc __HP_cc} -]
|
||||
#endif
|
||||
|
||||
#if defined (__HP_aCC)
|
||||
set compiler_info [join {hpacc __HP_aCC} -]
|
||||
#endif
|
||||
|
||||
#if defined (__xlc__)
|
||||
/* IBM'x xlc compiler. NOTE: __xlc__ expands to a double quoted string of four
|
||||
numbers seperated by '.'s: currently "7.0.0.0" */
|
||||
|
|
|
|||
|
|
@ -20,14 +20,7 @@
|
|||
/* This file is exactly like compiler.c. I could just use compiler.c if
|
||||
I could be sure that every C++ compiler accepted extensions of ".c". */
|
||||
|
||||
/* Note the semicolon at the end of this line. Older versions of
|
||||
hp c++ have a bug in string preprocessing: if the last token on a
|
||||
line is a string, then the preprocessor concatenates the next line
|
||||
onto the current line and eats the newline! That messes up TCL of
|
||||
course. That happens with HP aC++ A.03.13, but it no longer happens
|
||||
with HP aC++ A.03.45. */
|
||||
|
||||
set compiler_info "unknown" ;
|
||||
set compiler_info "unknown"
|
||||
|
||||
#if defined (__GNUC__)
|
||||
#if defined (__GNUC_PATCHLEVEL__)
|
||||
|
|
@ -38,20 +31,6 @@ set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ "unknown"} -]
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#if defined (__HP_CXD_SPP)
|
||||
/* older hp ansi c, such as A.11.01.25171.gp, defines this */
|
||||
set compiler_info [join {hpcc __HP_CXD_SPP} -]
|
||||
#endif
|
||||
|
||||
#if defined (__HP_cc)
|
||||
/* newer hp ansi c, such as B.11.11.28706.gp, defines this */
|
||||
set compiler_info [join {hpcc __HP_cc} -]
|
||||
#endif
|
||||
|
||||
#if defined (__HP_aCC)
|
||||
set compiler_info [join {hpacc __HP_aCC} -]
|
||||
#endif
|
||||
|
||||
#if defined (__xlc__)
|
||||
/* IBM'x xlc compiler. NOTE: __xlc__ expands to a double quoted string of four
|
||||
numbers seperated by '.'s: currently "7.0.0.0" */
|
||||
|
|
|
|||
|
|
@ -176,8 +176,6 @@ proc cp_check_errata { expected_string actual_string errata_table } {
|
|||
#
|
||||
# "A*" versus "A *" and "A&" versus "A &" in user methods.
|
||||
#
|
||||
# Test with hp ACC.
|
||||
#
|
||||
# -- chastain 2004-08-07
|
||||
|
||||
proc cp_test_ptype_class { in_exp in_testname in_key in_tag in_class_table { in_tail "" } { in_errata_table { } } { in_ptype_arg /r } } {
|
||||
|
|
|
|||
|
|
@ -3084,8 +3084,6 @@ if [info exists compiler_info] {
|
|||
}
|
||||
|
||||
set gcc_compiled 0
|
||||
set hp_cc_compiler 0
|
||||
set hp_aCC_compiler 0
|
||||
|
||||
# Figure out what compiler I am using.
|
||||
# The result is cached so only the first invocation runs the compiler.
|
||||
|
|
@ -3152,8 +3150,6 @@ proc get_compiler_info {{arg ""}} {
|
|||
|
||||
# Legacy global data symbols.
|
||||
global gcc_compiled
|
||||
global hp_cc_compiler
|
||||
global hp_aCC_compiler
|
||||
|
||||
if [info exists compiler_info] {
|
||||
# Already computed.
|
||||
|
|
@ -3214,15 +3210,11 @@ proc get_compiler_info {{arg ""}} {
|
|||
|
||||
# Set the legacy symbols.
|
||||
set gcc_compiled 0
|
||||
set hp_cc_compiler 0
|
||||
set hp_aCC_compiler 0
|
||||
if { [regexp "^gcc-1-" "$compiler_info" ] } { set gcc_compiled 1 }
|
||||
if { [regexp "^gcc-2-" "$compiler_info" ] } { set gcc_compiled 2 }
|
||||
if { [regexp "^gcc-3-" "$compiler_info" ] } { set gcc_compiled 3 }
|
||||
if { [regexp "^gcc-4-" "$compiler_info" ] } { set gcc_compiled 4 }
|
||||
if { [regexp "^gcc-5-" "$compiler_info" ] } { set gcc_compiled 5 }
|
||||
if { [regexp "^hpcc-" "$compiler_info" ] } { set hp_cc_compiler 1 }
|
||||
if { [regexp "^hpacc-" "$compiler_info" ] } { set hp_aCC_compiler 1 }
|
||||
|
||||
# Log what happened.
|
||||
verbose -log "get_compiler_info: $compiler_info"
|
||||
|
|
@ -3232,13 +3224,6 @@ proc get_compiler_info {{arg ""}} {
|
|||
uplevel \#0 { set true 1 }
|
||||
uplevel \#0 { set false 0 }
|
||||
|
||||
# Use of aCC results in boolean results being displayed as
|
||||
# "true" or "false"
|
||||
if { $hp_aCC_compiler } {
|
||||
uplevel \#0 { set true true }
|
||||
uplevel \#0 { set false false }
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue