gdb/

	* defs.h (ENUM_BITFIELD): Remove.

include/
	* bfdlink.h (ENUM_BITFIELD): Remove.

merge from gcc:
include/
	* ansidecl.h (ENUM_BITFIELD): New, from gcc/system.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 09681fd6898c161bcbf03957736cc3943a7222d7..5d594bd2b40b2cda86fd30366b0fd5eea63b5071 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * defs.h (ENUM_BITFIELD): Remove.
+
 2011-04-24  Jan Kratochvil  <jan.kratochvil@redhat.com>
            Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/gdb/defs.h b/gdb/defs.h
index 284942924641bc77d7433dd000b63437c7d7716d..089631cf3e52963cb497209279eeec3c520f1ee9 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -271,15 +271,6 @@ struct cleanup
     void *arg;
   };
 
-/* Be conservative and use enum bitfields only with GCC.
-   This is copied from gcc 3.3.1, system.h.  */
-
-#if defined(__GNUC__) && (__GNUC__ >= 2)
-#define ENUM_BITFIELD(TYPE) enum TYPE
-#else
-#define ENUM_BITFIELD(TYPE) unsigned int
-#endif
-
 /* vec.h-style vectors of strings want a typedef for char * .  */
 
 typedef char * char_ptr;

diff --git a/include/ChangeLog b/include/ChangeLog
index 634b21ceb900d10e5149ea3e543e9adbdc18a44c..dfdc19126cb79bcb8ed9cfa3fb5b5f368c7f7269 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * bfdlink.h (ENUM_BITFIELD): Remove.
+
+2011-04-25  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * ansidecl.h (ENUM_BITFIELD): New, from gcc/system.h.
+
 2011-04-24  Alan Modra  <amodra@gmail.com>
 
        PR ld/12365

diff --git a/include/ansidecl.h b/include/ansidecl.h
index 8b76647426bf9641c0b0c969efa23d2886831b8c..c39ce2f5d709ed3c5dc92f01bb0a5e5f7e996617 100644 (file)
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -416,6 +416,15 @@ So instead we use the macro below and test it against specific values.  */
 #define EXPORTED_CONST const
 #endif
 
+/* Be conservative and only use enum bitfields with GCC.
+   FIXME: provide a complete autoconf test for buggy enum bitfields.  */
+
+#if (GCC_VERSION > 2000)
+#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
+#else
+#define ENUM_BITFIELD(TYPE) unsigned int
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/bfdlink.h b/include/bfdlink.h
index 4c649d9395b196cf9d1970aff1bf97a8be47c2c3..50a14236791016a757e971a32ecdfc4ec51cfbea 100644 (file)
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -24,12 +24,6 @@
 #ifndef BFDLINK_H
 #define BFDLINK_H
 
-#if (__GNUC__ * 1000 + __GNUC_MINOR__ > 2000)
-#define ENUM_BITFIELD(TYPE) __extension__ enum TYPE
-#else
-#define ENUM_BITFIELD(TYPE) unsigned int
-#endif
-
 /* Which symbols to strip during a link.  */
 enum bfd_link_strip
 {