aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2011-04-25 18:28:53 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2011-04-25 18:28:53 +0000
commit1ae0d051e5e31ea120a9f96d916c8cd9e505e4fc (patch)
tree21968acc538eb1eec61510eefe9b8744ecfe3478
parent664f90a33173273f8b2d43508b48150ade0a1694 (diff)
downloadgdb-1ae0d051e5e31ea120a9f96d916c8cd9e505e4fc.zip
gdb-1ae0d051e5e31ea120a9f96d916c8cd9e505e4fc.tar.gz
gdb-1ae0d051e5e31ea120a9f96d916c8cd9e505e4fc.tar.bz2
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.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/defs.h9
-rw-r--r--include/ChangeLog8
-rw-r--r--include/ansidecl.h9
-rw-r--r--include/bfdlink.h6
5 files changed, 21 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 09681fd..5d594bd 100644
--- 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 2849429..089631c 100644
--- 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 634b21c..dfdc191 100644
--- 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 8b76647..c39ce2f 100644
--- 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 4c649d9..50a1423 100644
--- 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
{