From: Alan Modra Date: Sat, 29 Apr 2000 01:45:49 +0000 (+0000) Subject: Correctly check GCC version. X-Git-Tag: binutils-2_10~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38536423e4faaa963aabd8e15530b66df016e006;p=thirdparty%2Fbinutils-gdb.git Correctly check GCC version. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 19aef0253f1..742ebfd3079 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2000-04-29 Andreas Jaeger + + * libbfd-in.h: Correctly check GCC version. + * bfd-in.h: Likewise. + * libhppa.h: Likewise. + * libbfd.h: Regenerate. + * bfd-in2.h: Regenerate. + 2000-04-19 Michael Sokolov K&R compiler fixes. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 1f67c0c3a25..09753c27535 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -89,7 +89,7 @@ typedef struct _bfd bfd; /* Yup, SVR4 has a "typedef enum boolean" in -fnf */ /* It gets worse if the host also defines a true/false enum... -sts */ /* And even worse if your compiler has built-in boolean types... -law */ -#if defined (__GNUG__) && (__GNUC_MINOR__ > 5) +#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) #define TRUE_FALSE_ALREADY_DEFINED #endif #ifdef MPW diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index fa1c5b971e8..4c3eea02af4 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -89,7 +89,7 @@ typedef struct _bfd bfd; /* Yup, SVR4 has a "typedef enum boolean" in -fnf */ /* It gets worse if the host also defines a true/false enum... -sts */ /* And even worse if your compiler has built-in boolean types... -law */ -#if defined (__GNUG__) && (__GNUC_MINOR__ > 5) +#if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) #define TRUE_FALSE_ALREADY_DEFINED #endif #ifdef MPW diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 79a176d063c..aece1e15a51 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -1,6 +1,6 @@ /* libbfd.h -- Declarations used by bfd library *implementation*. (This include file is not for users of the library.) - Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Written by Cygnus Support. @@ -506,8 +506,8 @@ void bfd_assert PARAMS ((const char*,int)); extern void _bfd_abort PARAMS ((const char *, int, const char *)) ATTRIBUTE_NORETURN; -/* if gcc, we can give a function name, too */ -#if !defined (__GNUC__) || __GNUC_MINOR__ <= 5 +/* if gcc >= 2.6, we can give a function name, too */ +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) #define __PRETTY_FUNCTION__ ((char *) NULL) #endif diff --git a/bfd/libbfd.h b/bfd/libbfd.h index f9baf5a8a52..d8b5c248bf9 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -1,6 +1,6 @@ /* libbfd.h -- Declarations used by bfd library *implementation*. (This include file is not for users of the library.) - Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. Written by Cygnus Support. @@ -506,8 +506,8 @@ void bfd_assert PARAMS ((const char*,int)); extern void _bfd_abort PARAMS ((const char *, int, const char *)) ATTRIBUTE_NORETURN; -/* if gcc, we can give a function name, too */ -#if !defined (__GNUC__) || __GNUC_MINOR__ <= 5 +/* if gcc >= 2.6, we can give a function name, too */ +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) #define __PRETTY_FUNCTION__ ((char *) NULL) #endif diff --git a/bfd/libhppa.h b/bfd/libhppa.h index c32eabe4457..1392742876f 100644 --- a/bfd/libhppa.h +++ b/bfd/libhppa.h @@ -1,5 +1,5 @@ /* HP PA-RISC SOM object file format: definitions internal to BFD. - Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 98, 1999 + Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 98, 99, 2000 Free Software Foundation, Inc. Contributed by the Center for Software Science at the @@ -35,7 +35,7 @@ #endif /* GNU C? */ #endif /* INLINE */ -#if __GNUC__ >= 2 && __GNUC_MINOR__ >= 7 +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) /* Declare the functions with the unused attribute to avoid warnings. */ static INLINE unsigned int assemble_3 (unsigned int) __attribute__ ((__unused__)); diff --git a/gas/ChangeLog b/gas/ChangeLog index 8aa7a7d69f8..f27d9848f24 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2000-04-29 Andreas Jaeger + + * as.h: Correctly check GCC version. + 2000-04-20 Alexandre Oliva * config/tc-mn10300.c (HAVE_AM30): Define. diff --git a/gas/as.h b/gas/as.h index c8d37879d40..33a400a4c95 100644 --- a/gas/as.h +++ b/gas/as.h @@ -112,7 +112,7 @@ extern void *alloca (); #ifdef DEBUG #undef NDEBUG #endif -#if !defined (__GNUC__) || __GNUC_MINOR__ <= 5 +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) #define __PRETTY_FUNCTION__ ((char*)0) #endif #if 0 @@ -512,7 +512,7 @@ typedef struct _pseudo_type pseudo_typeS; #if (__GNUC__ >= 2) && !defined(VMS) /* for use with -Wformat */ -#if __GNUC_MINOR__ < 6 +#if __GNUC__ == 2 && __GNUC_MINOR__ < 6 /* Support for double underscores in attribute names was added in gcc 2.6, so avoid them if we are using an earlier version. */ #define __printf__ printf diff --git a/ld/ChangeLog b/ld/ChangeLog index 1ed94ce5f87..d5bc4ccd638 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2000-04-29 Andreas Jaeger + + * ld.h: Correctly check GCC version. + 2000-04-19 Alan Modra * ld.texinfo (Simple Example): Remove extraneous paragraph. diff --git a/ld/ld.h b/ld/ld.h index 2c7e55dbe20..e2052a0b445 100644 --- a/ld/ld.h +++ b/ld/ld.h @@ -235,8 +235,8 @@ extern void check_nocrossrefs PARAMS ((void)); extern void ld_abort PARAMS ((const char *, int, const char *)) ATTRIBUTE_NORETURN; -/* If gcc, we can give a function name, too. */ -#if !defined (__GNUC__) || __GNUC_MINOR__ <= 5 +/* If gcc >= 2.6, we can give a function name, too. */ +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) #define __PRETTY_FUNCTION__ ((char*) NULL) #endif