2010-02-05 Hui Zhu <teawater@gmail.com>

	* defs.h (gdb_bfd_errmsg): New extern.
	* exec.c (exec_file_attach): Change bfd_errmsg to
	gdb_bfd_errmsg.
	* utils.c (AMBIGUOUS_MESS1): New macro.
	(AMBIGUOUS_MESS2): New macro.
	(gdb_bfd_errmsg): New function.

1 files changed, 7 insertions, 0 deletions

diff --git a/gdb/defs.h b/gdb/defs.h
index 5b5c261..770d171 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -419,6 +419,13 @@ char **gdb_buildargv (const char *);
 
 int compare_positive_ints (const void *ap, const void *bp);
 
+/* A wrapper for bfd_errmsg to produce a more helpful error message
+   in the case of bfd_error_file_ambiguously recognized.
+   MATCHING, if non-NULL, is the corresponding argument to
+   bfd_check_format_matches, and will be freed.  */
+
+extern const char *gdb_bfd_errmsg (bfd_error_type error_tag, char **matching);
+
 /* From demangle.c */
 
 extern void set_demangling_style (char *);