From a1934524a3fc1e93084d3148ddf590eb78eba875 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 29 Apr 2000 00:56:29 +0000 Subject: [PATCH] Correctly check gcc version. --- bfd/ChangeLog | 8 ++++++++ bfd/bfd-in.h | 2 +- bfd/bfd-in2.h | 2 +- bfd/libbfd-in.h | 6 +++--- bfd/libbfd.h | 6 +++--- bfd/libhppa.h | 4 ++-- gas/ChangeLog | 4 ++++ gas/as.h | 4 ++-- ld/ChangeLog | 4 ++++ ld/ld.h | 4 ++-- 10 files changed, 30 insertions(+), 14 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cf9c8eb..fdf3306 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. + Fri Apr 28 14:58:37 2000 Clinton Popetz * Makefile.am (BFD64_BACKENDS, BFD64_BACKENDS_CFILES): Add diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 91b7868..127d961 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 f00e8a1..8d89199 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 79a176d..aece1e1 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 8aef81b..eed98f7 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 649bcab..f52a732 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 7d6e2b9..fcc7ed6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2000-04-29 Andreas Jaeger + + * as.h: Correctly check GCC version. + Mon Apr 24 15:21:11 2000 Clinton Popetz * as.c (parse_args): Allow md_parse_option to override -a listing diff --git a/gas/as.h b/gas/as.h index c8d3787..33a400a 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 cbe5c34..c8d8aa1 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2000-04-29 Andreas Jaeger + + * ld.h: Correctly check GCC version. + Tue Apr 25 11:20:43 2000 Jeffrey A Law (law@cygnus.com) * Makefile.am: Add PA64 support. Add missing dependencies for diff --git a/ld/ld.h b/ld/ld.h index 2c7e55d..e2052a0 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 -- 2.7.4