From 95417063c14b53b0c0f602a06cd58e8787372aa3 Mon Sep 17 00:00:00 2001 From: cagney Date: Mon, 1 May 2000 05:45:36 +0000 Subject: [PATCH] From 2000-04-28 Andreas Jaeger : Properly check for GCC version number. --- gdb/ChangeLog | 5 +++++ gdb/defs.h | 4 ++-- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.c++/templates.cc | 14 +++++++------- gdb/testsuite/lib/compiler.cc | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 463d9c1f25..948baf679a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +Mon May 1 15:37:58 2000 Andrew Cagney + + From 2000-04-28 Andreas Jaeger : + * defs.h: Properly check for GCC version number. + 2000-04-30 Mark Kettenis Fix single-stepping out of signal trampolines. diff --git a/gdb/defs.h b/gdb/defs.h index ff23f609d8..9e6218ac47 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 6423ee20b3..2d7aaf6afe 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +Mon May 1 15:37:58 2000 Andrew Cagney + + From 2000-04-28 Andreas Jaeger : + * gdb.c++/templates.cc: Properly check for GCC version number. + * lib/compiler.cc: Likewise + 2000-04-26 Michael Snyder * 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 25241dc6db..1ef0100438 100644 --- a/gdb/testsuite/gdb.c++/templates.cc +++ b/gdb/testsuite/gdb.c++/templates.cc @@ -290,7 +290,7 @@ void printf(const char *format, ... ) class T1 { public: - static void* operator new(size_t); + static void* operator new(size_t) throw (); static void operator delete(void *pointer); void operator=(const T1&); @@ -365,7 +365,7 @@ public: }; void* -T1::operator new(size_t) +T1::operator new(size_t) throw () { return 0; } void @@ -456,7 +456,7 @@ public: T5(int); T5(const T5&); ~T5(); - static void* operator new(size_t); + static void* operator new(size_t) throw (); static void operator delete(void *pointer); int value(); @@ -479,7 +479,7 @@ T5::~T5() template void* -T5::operator new(size_t) +T5::operator new(size_t) throw () { return 0; } template @@ -516,14 +516,14 @@ public: int (*manage[5])(double, void *(*malloc)(unsigned size), void (*free)(void *pointer)); - int (*device[5])(int open(const char *, unsigned mode, unsigned perms, int extra = 0), + int (*device[5])(int open(const char *, unsigned mode, unsigned perms, int extra), int *(*read)(int fd, void *place, unsigned size), int *(*write)(int fd, void *place, unsigned size), void (*close)(int fd)); }; T5 t5x(5); -#if !defined(__GNUC__) || (__GNUC__ >= 2 && __GNUC_MINOR__ >= 6) +#if !defined(__GNUC__) || (__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6) template class T5; template class T5; template class T5; @@ -716,7 +716,7 @@ int main() Foo fint; Foo fchar; - Foo fvpchar; + Foo fvpchar = {0, 0}; Bar bint; Bar 3)> bint2; diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc index aa35c7510f..5cb00f6685 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 -- 2.11.0