Correctly check GCC version.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 19aef0253f112018663d6c99fab9718d61b4867d..742ebfd30793195eec219d0ede7163cbc2d3950f 100644 (file)
--- 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.
+
 2000-04-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
 
        K&R compiler fixes.

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 1f67c0c3a25f45deb3a337b2f3d05b1b4dfaeacc..09753c27535ce78698a562de223d154c20e58dc3 100644 (file)
--- 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 fa1c5b971e82bfcff2e5087ee1aac2b178a819e2..4c3eea02af4cd0373fff5d3700f6774a8d8f66bb 100644 (file)
--- 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 79a176d063c473c4eca8f65fbc7e082980f06525..aece1e15a51e375485553176cec868c9e945c7d2 100644 (file)
--- 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 f9baf5a8a5224d23b625f29ef91c46b13f191dab..d8b5c248bf958eb00c3c413493ee9c39a81a6ae5 100644 (file)
--- 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 c32eabe4457e5776ca58e236b0571e3095eee79d..1392742876f14f92621dc4953309a4b8a2936b3a 100644 (file)
--- 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 8aa7a7d69f887bb8648b2b7c45e1db1db8f1a029..f27d9848f248110d40dd3e6f3bd3545650760886 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-29  Andreas Jaeger  <aj@suse.de>
+
+       * as.h: Correctly check GCC version.
+
 2000-04-20  Alexandre Oliva  <aoliva@cygnus.com>
 
        * config/tc-mn10300.c (HAVE_AM30): Define.

diff --git a/gas/as.h b/gas/as.h
index c8d37879d401baa517919250b274e50bff43a0ac..33a400a4c951270713411a17bcd7b3facdb7dc4c 100644 (file)
--- 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 1ed94ce5f87274b9b90ad9f3eb0e57ca45a56998..d5bc4ccd638adb884952365983047704ab6d2046 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-29  Andreas Jaeger  <aj@suse.de>
+
+       * ld.h: Correctly check GCC version.
+
 2000-04-19  Alan Modra  <alan@linuxcare.com.au>
 
        * ld.texinfo (Simple Example): Remove extraneous paragraph.

diff --git a/ld/ld.h b/ld/ld.h
index 2c7e55dbe2033d63ba9f0832183a2b966afc0c24..e2052a0b445163efbc663796ca24caec79b4ed34 100644 (file)
--- 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