From 2000-04-28 Andreas Jaeger <aj@suse.de>:

Properly check for GCC version number.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 463d9c1..948baf6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Mon May  1 15:37:58 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       From 2000-04-28 Andreas Jaeger <aj@suse.de>:
+       * defs.h: Properly check for GCC version number.
+
 2000-04-30  Mark Kettenis  <kettenis@gnu.org>
 
        Fix single-stepping out of signal trampolines.

diff --git a/gdb/defs.h b/gdb/defs.h
index ff23f60..9e6218a 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -253,7 +253,7 @@ struct cleanup
    works everywhere we use it. */
 
 #ifndef ATTR_NORETURN
-#if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 7
+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
 #define ATTR_NORETURN __attribute__ ((noreturn))
 #else
 #define ATTR_NORETURN          /* nothing */
@@ -261,7 +261,7 @@ struct cleanup
 #endif
 
 #ifndef ATTR_FORMAT
-#if defined(__GNUC__) && __GNUC__ >= 2 && __GNUC_MINOR__ >= 4
+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 4))
 #define ATTR_FORMAT(type, x, y) __attribute__ ((format(type, x, y)))
 #else
 #define ATTR_FORMAT(type, x, y)        /* nothing */

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6423ee2..2d7aaf6 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+Mon May  1 15:37:58 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+       From 2000-04-28 Andreas Jaeger  <aj@suse.de>:
+       * gdb.c++/templates.cc: Properly check for GCC version number.
+       * lib/compiler.cc: Likewise
+
 2000-04-26  Michael Snyder  <msnyder@seadog.cygnus.com>
 
        * gdb.base/call-ar-st.exp: Bail out if target is sparclet.

diff --git a/gdb/testsuite/gdb.c++/templates.cc b/gdb/testsuite/gdb.c++/templates.cc
index e1d6810..1ef0100 100644 (file)
--- a/gdb/testsuite/gdb.c++/templates.cc
+++ b/gdb/testsuite/gdb.c++/templates.cc
@@ -523,7 +523,7 @@ public:
 };
 T5<x> t5x(5);
 
-#if !defined(__GNUC__) || (__GNUC__ >= 2 && __GNUC_MINOR__ >= 6)
+#if !defined(__GNUC__) || (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)
 template class T5<char>;
 template class T5<int>;
 template class T5<int (*)(char, void *)>;

diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc
index aa35c75..5cb00f6 100644 (file)
--- a/gdb/testsuite/lib/compiler.cc
+++ b/gdb/testsuite/lib/compiler.cc
@@ -13,7 +13,7 @@
    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_MINOR__ >= 6
+#if defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6))
 set supports_template_debugging 1
 #else
 set supports_template_debugging 0