From: H.J. Lu <hjl.tools@gmail.com>
Date: Sun, 16 Oct 2011 19:36:10 +0000 (+0000)
Subject: Set target from the the first object only if it isn't set.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=746c5e8cf04907404d06ba0919c008f0da633255;p=binutils-gdb.git

Set target from the the first object only if it isn't set.

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.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4dcc376da11..b344d01d9c9 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+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-10-13  Nick Clifton  <nickc@redhat.com>
 
 	Fixes to aid translation:
diff --git a/binutils/ar.c b/binutils/ar.c
index 7b3c3fa0229..882ef1ac0de 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;