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

	PR binutils/13278
	2011-10-16  H.J. Lu  <hongjiu.lu@intel.com>
	* ar.c (open_inarch): Set the target from the the first object
	on the list only if it isn't set.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index b61c8e2e576..2f5af61ba93 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-25  Alan Modra  <amodra@gmail.com>
+
+	Apply mainline patches
+	2011-10-16  H.J. Lu  <hongjiu.lu@intel.com>
+	PR binutils/13278
+	* ar.c (open_inarch): Set the target from the the first object
+	on the list only if it isn't set.
+
 2011-09-22  Tristan Gingold  <gingold@adacore.com>
 
 	* NEWS: Add marker for 2.22.
diff --git a/binutils/ar.c b/binutils/ar.c
index f8c977abcdc..22be2cd053d 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -815,9 +815,9 @@ open_inarch (const char *archive_filename, const char *file)
 	  return NULL;
 	}
 
-      /* Try to figure out the target to use for the archive from the
-         first object on the list.  */
-      if (file != NULL)
+      /* If the target isn't set, try to figure out the target to use
+	 for the archive from the first object on the list.  */
+      if (target == NULL && file != NULL)
 	{
 	  bfd *obj;