Merge GDB 7.5.1

gdb/python/lib/gdb/types.py

 # Type utilities.
 # Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 68 matching lines @@
         The dictionary of the enum.
 
     Raises:
         TypeError: The type is not an enum.
     """
 
     if enum_type.code != gdb.TYPE_CODE_ENUM:
         raise TypeError("not an enum type")
     enum_dict = {}
     for field in enum_type.fields():
-        # The enum's value is stored in "bitpos".
-        enum_dict[field.name] = field.bitpos
+        # The enum's value is stored in "enumval".
+        enum_dict[field.name] = field.enumval
     return enum_dict
 
 
 def deep_items (type_):
     """Return an iterator that recursively traverses anonymous fields.
 
     Arguments:
         type_: The type to traverse.  It should be one of
         gdb.TYPE_CODE_STRUCT or gdb.TYPE_CODE_UNION.
 
     Returns:
         an iterator similar to gdb.Type.iteritems(), i.e., it returns
         pairs of key, value, but for any anonymous struct or union
         field that field is traversed recursively, depth-first.
     """
     for k, v in type_.iteritems ():
         if k:
             yield k, v
         else:
             for i in deep_items (v.type):
                 yield i