From d18b8b7a0759b26ebc14eab4e95f643e142a24de Mon Sep 17 00:00:00 2001 From: Hui Zhu Date: Fri, 5 Feb 2010 02:22:39 +0000 Subject: [PATCH] 2010-02-05 Hui Zhu * 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. --- gdb/ChangeLog | 9 +++++++++ gdb/defs.h | 7 +++++++ gdb/exec.c | 6 ++++-- gdb/utils.c | 40 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4fda810a80..d3170ccad0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2010-02-05 Hui Zhu + + * 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. + 2010-02-04 Doug Evans * solib-svr4.c (enable_break): Add comment. diff --git a/gdb/defs.h b/gdb/defs.h index 5b5c261604..770d171942 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 *); diff --git a/gdb/exec.c b/gdb/exec.c index 4ced96851b..51b33a5512 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -219,6 +219,7 @@ exec_file_attach (char *filename, int from_tty) char *scratch_pathname; int scratch_chan; struct target_section *sections = NULL, *sections_end = NULL; + char **matching; scratch_chan = openp (getenv ("PATH"), OPF_TRY_CWD_FIRST, filename, write_files ? O_RDWR | O_BINARY : O_RDONLY | O_BINARY, @@ -253,13 +254,14 @@ exec_file_attach (char *filename, int from_tty) scratch_pathname = xstrdup (scratch_pathname); cleanups = make_cleanup (xfree, scratch_pathname); - if (!bfd_check_format (exec_bfd, bfd_object)) + if (!bfd_check_format_matches (exec_bfd, bfd_object, &matching)) { /* Make sure to close exec_bfd, or else "run" might try to use it. */ exec_close (); error (_("\"%s\": not in executable format: %s"), - scratch_pathname, bfd_errmsg (bfd_get_error ())); + scratch_pathname, + gdb_bfd_errmsg (bfd_get_error (), matching)); } /* FIXME - This should only be run for RS6000, but the ifdef is a poor diff --git a/gdb/utils.c b/gdb/utils.c index 82a66a1002..33c195a41d 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3608,6 +3608,46 @@ compare_positive_ints (const void *ap, const void *bp) return * (int *) ap - * (int *) bp; } +#define AMBIGUOUS_MESS1 ".\nMatching formats:" +#define AMBIGUOUS_MESS2 ".\nUse \"set gnutarget format-name\" to specify the format." + +const char * +gdb_bfd_errmsg (bfd_error_type error_tag, char **matching) +{ + char *ret, *retp; + int ret_len; + char **p; + + /* Check if errmsg just need simple return. */ + if (error_tag != bfd_error_file_ambiguously_recognized || matching == NULL) + return bfd_errmsg (error_tag); + + ret_len = strlen (bfd_errmsg (error_tag)) + strlen (AMBIGUOUS_MESS1) + + strlen (AMBIGUOUS_MESS2); + for (p = matching; *p; p++) + ret_len += strlen (*p) + 1; + ret = xmalloc (ret_len + 1); + retp = ret; + make_cleanup (xfree, ret); + + strcpy (retp, bfd_errmsg (error_tag)); + retp += strlen (retp); + + strcpy (retp, AMBIGUOUS_MESS1); + retp += strlen (retp); + + for (p = matching; *p; p++) + { + sprintf (retp, " %s", *p); + retp += strlen (retp); + } + xfree (matching); + + strcpy (retp, AMBIGUOUS_MESS2); + + return ret; +} + /* Provide a prototype to silence -Wmissing-prototypes. */ extern initialize_file_ftype _initialize_utils; -- 2.34.1