Merge GDB 7.5.1

gdb/testsuite/gdb.python/py-pp-maint.py

 # 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
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 49 matching lines @@
 def build_pretty_printer():
     pp = gdb.printing.RegexpCollectionPrettyPrinter("pp-test")
 
     pp.add_printer('struct s', '^struct s$', pp_s)
     pp.add_printer('s', '^s$', pp_s)
 
     # Use a lambda this time to exercise doing things this way.
     pp.add_printer('struct ss', '^struct ss$', lambda val: pp_ss(val))
     pp.add_printer('ss', '^ss$', lambda val: pp_ss(val))
 
+    pp.add_printer('enum flag_enum', '^flag_enum$',
+                   gdb.printing.FlagEnumerationPrinter('enum flag_enum'))
+
     return pp
 
 
 gdb.printing.register_pretty_printer(gdb, lookup_function_lookup_test)
 my_pretty_printer = build_pretty_printer()
 gdb.printing.register_pretty_printer(gdb, my_pretty_printer)
 
 # Exercise the "replace" argument to register pretty_printer.
 saw_runtime_error = False
 try:
   gdb.printing.register_pretty_printer(gdb, my_pretty_printer, replace=False)
 except RuntimeError:
   saw_runtime_error = True
   pass
 if not saw_runtime_error:
   raise RuntimeError("Missing RuntimeError from register_pretty_printer")
 gdb.printing.register_pretty_printer(gdb, my_pretty_printer, replace=True)