From: Alan Modra <amodra@gmail.com>
Date: Tue, 25 Oct 2011 03:04:34 +0000 (+0000)
Subject: 	PR binutils/13278
X-Git-Tag: binutils-2_22~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b65fcc7c84c921cc4357db3df19581a400ef969f;p=thirdparty%2Fbinutils-gdb.git

	PR binutils/13278
	2011-10-11  Alan Modra  <amodra@gmail.com>
	* archive.c (bfd_generic_archive_p): Only check first element
	when target_defaulted.
	(_bfd_construct_extended_name_table): Use ar_maxnamelen.
	(_bfd_archive_bsd44_construct_extended_name_table): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ea5d79292d6..aabe22d51e7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,13 @@
 2011-10-25  Alan Modra  <amodra@gmail.com>
 
 	Apply mainline patches
+	2011-10-11  Alan Modra  <amodra@gmail.com>
+	PR binutils/13278
+	* archive.c (bfd_generic_archive_p): Only check first element
+	when target_defaulted.
+	(_bfd_construct_extended_name_table): Use ar_maxnamelen.
+	(_bfd_archive_bsd44_construct_extended_name_table): Likewise.
+
 	2011-10-11  Alan Modra  <amodra@gmail.com>
 	PR binutils/13257
 	* archive.c (_bfd_find_nested_archive, _bfd_get_elt_at_filepos): Open
diff --git a/bfd/archive.c b/bfd/archive.c
index 44ac712388d..3e333c7e894 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -793,7 +793,7 @@ bfd_generic_archive_p (bfd *abfd)
       return NULL;
     }
 
-  if (bfd_has_map (abfd))
+  if (abfd->target_defaulted && bfd_has_map (abfd))
     {
       bfd *first;
 
@@ -1512,7 +1512,7 @@ _bfd_construct_extended_name_table (bfd *abfd,
 				    char **tabloc,
 				    bfd_size_type *tablen)
 {
-  unsigned int maxname = abfd->xvec->ar_max_namelen;
+  unsigned int maxname = ar_maxnamelen (abfd);
   bfd_size_type total_namelen = 0;
   bfd *current;
   char *strptr;
@@ -1707,7 +1707,7 @@ _bfd_archive_bsd44_construct_extended_name_table (bfd *abfd,
                                                   bfd_size_type *tablen,
                                                   const char **name)
 {
-  unsigned int maxname = abfd->xvec->ar_max_namelen;
+  unsigned int maxname = ar_maxnamelen (abfd);
   bfd *current;
 
   *tablen = 0;