diff options
| author | Andrew Cagney <cagney@redhat.com> | 2000-05-01 05:45:32 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2000-05-01 05:45:32 +0000 |
| commit | d5f2e59252aa97bbdb610c410f05ab06e484ebac (patch) | |
| tree | 5e5d682b2fb577c44b16db17da4487e299ac9a3e | |
| parent | 63f64becd520046c395928ea312e28cd261b93b1 (diff) | |
| download | gdb-d5f2e59252aa97bbdb610c410f05ab06e484ebac.tar.gz | |
From 2000-04-28 Andreas Jaeger <aj@suse.de>:
Properly check for GCC version number.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/defs.h | 4 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/templates.cc | 2 | ||||
| -rw-r--r-- | gdb/testsuite/lib/compiler.cc | 2 |
5 files changed, 15 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b68dff6ebd9..7a6e8f40780 100644 --- 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. + Fri Apr 28 15:31:10 2000 Andrew Cagney <cagney@b1.cygnus.com> From "Serge Nikulin" <nikulin@actsw.amat.com>: diff --git a/gdb/defs.h b/gdb/defs.h index ca68d1bbdcc..0bac4059419 100644 --- 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 2617a2dd07c..b6f64e1f132 100644 --- 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-07 J.T. Conklin <jtc@redback.com> * gdb.base/call-ar-st.exp: Relax patterns matching tab characters. diff --git a/gdb/testsuite/gdb.c++/templates.cc b/gdb/testsuite/gdb.c++/templates.cc index e1d6810930d..1ef0100438f 100644 --- 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 aa35c7510ff..5cb00f6685a 100644 --- 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 |