diff options
| author | Alan Modra <amodra@gmail.com> | 2011-10-25 03:08:40 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2011-10-25 03:08:40 +0000 |
| commit | 432a499b07a72dc33597d99c868660ba8a613532 (patch) | |
| tree | d93f33a615ae437b0a9b19ff0e7f1dddd2c112f5 | |
| parent | a22cedb77aa5a5a8a4480134d6a9cccabd6f18c7 (diff) | |
| download | binutils-gdb-432a499b07a72dc33597d99c868660ba8a613532.tar.gz | |
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.
| -rw-r--r-- | binutils/ChangeLog | 8 | ||||
| -rw-r--r-- | binutils/ar.c | 6 |
2 files changed, 11 insertions, 3 deletions
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; |