diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/structs.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/lib/compiler.c | 7 | ||||
| -rw-r--r-- | gdb/testsuite/lib/compiler.cc | 7 |
4 files changed, 23 insertions, 6 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1698757..db5f017 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2004-06-10 Andrew Cagney <cagney@gnu.org> + + * lib/compiler.cc, lib/compiler.c: Append either + __GNUC_PATCHLEVEL__, or "unknown" to the compiler_info. + * gdb.base/structs.exp (test_struct_calls): Check for gcc-3-3-* + instead of gcc-3-3. + 2004-06-09 Andrew Cagney <cagney@gnu.org> * gdb.base/structs.exp (test_struct_calls): Fix KFAIL for diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp index e1f256f..84435df 100644 --- a/gdb/testsuite/gdb.base/structs.exp +++ b/gdb/testsuite/gdb.base/structs.exp @@ -218,8 +218,8 @@ proc test_struct_calls { n } { set tests "call $n ${testfile}" # Call fun${n}, checking the printed return-value. - setup_compiler_kfails structs-tc-tll gcc-3-3 "DWARF 2" i*86-*-* gdb/1455 - setup_compiler_kfails structs-tc-td gcc-3-3 "DWARF 2" i*86-*-* gdb/1455 + setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455 + setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455 gdb_test "p/c fun${n}()" "[foo ${n}]" "p/c fun<n>(); ${tests}" # Check that GDB can always pass a structure to an inferior function. @@ -230,8 +230,8 @@ proc test_struct_calls { n } { # examining that global to confirm that the value is as expected. gdb_test "call Fun${n}(foo${n})" "" "call Fun<n>(foo<n>); ${tests}" - setup_compiler_kfails structs-tc-tll gcc-3-3 "DWARF 2" i*86-*-* gdb/1455 - setup_compiler_kfails structs-tc-td gcc-3-3 "DWARF 2" i*86-*-* gdb/1455 + setup_compiler_kfails structs-tc-tll gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455 + setup_compiler_kfails structs-tc-td gcc-3-3-* "DWARF 2" i*86-*-* gdb/1455 gdb_test "p/c L${n}" [foo ${n}] "p/c L<n>; ${tests}" } diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c index b1f1f5d..dbce43e 100644 --- a/gdb/testsuite/lib/compiler.c +++ b/gdb/testsuite/lib/compiler.c @@ -37,7 +37,12 @@ set compiler_info "" #if defined (__GNUC__) -set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ } -] +#if defined (__GNUC_PATCHLEVEL__) +/* Only GCC versions >= 3.0 define the __GNUC_PATCHLEVEL__ macro. */ +set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__} -] +#else +set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ "unknown"} -] +#endif set gcc_compiled __GNUC__ #else set gcc_compiled 0 diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc index 0c5eb66..8059e97 100644 --- a/gdb/testsuite/lib/compiler.cc +++ b/gdb/testsuite/lib/compiler.cc @@ -25,7 +25,12 @@ set compiler_info "" #if defined (__GNUC__) -set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ } -] +#if defined (__GNUC_PATCHLEVEL__) +/* Only GCC versions >= 3.0 define the __GNUC_PATCHLEVEL__ macro. */ +set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__} -] +#else +set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ "unknown"} -] +#endif set gcc_compiled __GNUC__ #else set gcc_compiled 0 |