summaryrefslogtreecommitdiff
path: root/bfd/bfd.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2001-08-17 03:19:01 +0000
committerAlan Modra <amodra@bigpond.net.au>2001-08-17 03:19:01 +0000
commit39dc26fb056ee976cdad5c2bbd60103d048253a7 (patch)
tree81c3af52cc78470a4c3b640c1844c3eaba18e57a /bfd/bfd.c
parent6f77e90d9a24c907684f3ebb63025e127a0c7dee (diff)
downloadgdb-39dc26fb056ee976cdad5c2bbd60103d048253a7.tar.gz
* bfd.c (enum bfd_error): Add bfd_error_wrong_object_format.
(bfd_errmsgs): Add corresponding message. * archive.c (bfd_generic_archive_p): Don't release bfd_ardata when finding an archive that contains different format object files. Return bfd_error_wrong_object_format for this case. * format.c: Formatting fixes. s/CONST/const/. (bfd_check_format_matches): Accept archives that give bfd_error_wrong_object_format if no full match is found. Tidy code handling matching_vector. Don't return a pointer to freed memory in `matching'. Handle ambiguous matches as for partial archive matches. * bfd-in2.h: Regenerate.
Diffstat (limited to 'bfd/bfd.c')
-rw-r--r--bfd/bfd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bfd/bfd.c b/bfd/bfd.c
index ca50aac13e7..8305ddc23a2 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -248,6 +248,7 @@ CODE_FRAGMENT
. bfd_error_system_call,
. bfd_error_invalid_target,
. bfd_error_wrong_format,
+. bfd_error_wrong_object_format,
. bfd_error_invalid_operation,
. bfd_error_no_memory,
. bfd_error_no_symbols,
@@ -275,6 +276,7 @@ const char *const bfd_errmsgs[] =
N_("System call error"),
N_("Invalid bfd target"),
N_("File in wrong format"),
+ N_("Archive object file in wrong format"),
N_("Invalid operation"),
N_("Memory exhausted"),
N_("No symbols"),