Merge GDB 7.5.1

gdb/python/python.h

Index: gdb/python/python.h
diff --git a/gdb/python/python.h b/gdb/python/python.h
index 9e461f7ee9d3968b575bf31a4a3e8cae598543c1..0d072712af4e6da693a879c75d3b20a906ba4da0 100644
--- a/gdb/python/python.h
+++ b/gdb/python/python.h
@@ -24,13 +24,15 @@
 
 struct breakpoint_object;
 
-extern int gdbpy_global_auto_load;
+/* The suffix of per-objfile scripts to auto-load.
+   E.g. When the program loads libfoo.so, look for libfoo-gdb.py.  */
+#define GDBPY_AUTO_FILE_NAME "-gdb.py"
 
 extern void finish_python_initialization (void);
 
 void eval_python_from_control_command (struct command_line *);
 
-void source_python_script (const char *file);
+void source_python_script (FILE *file, const char *filename);
 
 int apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
 			      int embedded_offset, CORE_ADDR address,
@@ -41,7 +43,7 @@ int apply_val_pretty_printer (struct type *type, const gdb_byte *valaddr,
 
 void preserve_python_values (struct objfile *objfile, htab_t copied_types);
 
-void load_auto_scripts_for_objfile (struct objfile *objfile);
+void gdbpy_load_auto_scripts_for_objfile (struct objfile *objfile);
 
 int gdbpy_should_stop (struct breakpoint_object *bp_obj);