diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a813027da7..9aa5285c24 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-15  Doug Evans  <dje@google.com>
+
+	* dwarf2read.c (struct abbrev_info): Make members name, form 16 bits.
+	(struct attribute): Ditto.
+
 2008-09-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* hppa-linux-tdep.c (hppa_linux_sigtramp_frame_unwind_cache): Record
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index ee5160c914..b8bd70d16c 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -513,15 +513,15 @@ struct abbrev_info
 
 struct attr_abbrev
   {
-    enum dwarf_attribute name;
-    enum dwarf_form form;
+    ENUM_BITFIELD(dwarf_attribute) name : 16;
+    ENUM_BITFIELD(dwarf_form) form : 16;
   };
 
 /* Attributes have a name and a value */
 struct attribute
   {
-    enum dwarf_attribute name;
-    enum dwarf_form form;
+    ENUM_BITFIELD(dwarf_attribute) name : 16;
+    ENUM_BITFIELD(dwarf_form) form : 16;
     union
       {
 	char *str;