2004-01-02 Michael Chastain <mec.gnu@mindspring.com>

	* lib/compiler.cc: Remove supports_template_debugging.
	* gdb.cp/templates.exp: Do not test supports_template_debugging.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ba22bd8..0f1a115 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-02  Michael Chastain  <mec.gnu@mindspring.com>
+
+       * lib/compiler.cc: Remove supports_template_debugging.
+       * gdb.cp/templates.exp: Do not test supports_template_debugging.
+
 2004-01-01  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb.cp/namespace.exp: Accept gcc abi 2.

diff --git a/gdb/testsuite/gdb.cp/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index 68c5cdf..1203536 100644 (file)
--- a/gdb/testsuite/gdb.cp/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
@@ -1,4 +1,4 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003
+# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -197,7 +197,6 @@ proc do_tests {} {
     global srcdir
     global binfile
     global gdb_prompt
-    global supports_template_debugging
 
     set prms_id 0
     set bug_id 0
@@ -209,11 +208,6 @@ proc do_tests {} {
     gdb_reinitialize_dir $srcdir/$subdir
     gdb_load $binfile
 
-    if { !$supports_template_debugging } {
-       warning "compiler lacks debugging info for templates; tests suppressed." 0
-       return
-    }
-
     runto_main
 
     test_ptype_of_templates

diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc
index 719b62b..bbefeaa 100644 (file)
--- a/gdb/testsuite/lib/compiler.cc
+++ b/gdb/testsuite/lib/compiler.cc
@@ -1,6 +1,6 @@
 /* This test file is part of GDB, the GNU debugger.
 
-   Copyright 1995, 1999, 2003 Free Software Foundation, Inc.
+   Copyright 1995, 1999, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,18 +34,6 @@
    definition made with 'set" to see if one already exists, and if so
    warn about conflicts if it is being set to something else.  */
 
-#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
-set supports_template_debugging 1
-#else
-set supports_template_debugging 0
-#endif
-
-#if defined(__cplusplus) 
-set supports_template_debugging 1
-#else
-set supports_template_debugging 0
-#endif
-
 #if defined (__GNUC__)
 set gcc_compiled __GNUC__
 set compiler_info [join {gcc __GNUC__ __GNUC_MINOR__ } -]