6 files changed, 18 insertions, 10 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index cf9c8eb9197..fdf330619c7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-29  Andreas Jaeger  <aj@suse.de>
+
+	* 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  <cpopetz@cygnus.com>
 
 	* Makefile.am (BFD64_BACKENDS, BFD64_BACKENDS_CFILES): Add
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 91b7868c58f..127d96136f8 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 <sys/types.h>  -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 f00e8a1869c..8d89199bdf8 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 <sys/types.h>  -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 8aef81b2b85..eed98f706d5 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 649bcabb674..f52a7322c79 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__));