aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/dlltool.c10
2 files changed, 15 insertions, 1 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5fbccc8..a017c64 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-27 Nick Clifton <nickc@redhat.com>
+
+ PR binutils/17512
+ * dlltool.c (identify_search_archive): If the last archive was the
+ same as the current archive, terminate the loop.
+
2015-01-23 Nick Clifton <nickc@redhat.com>
* nlmconv.c (powerpc_mangle_relocs): Fix build errors introduced
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index dcc4651..b5b3aff 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -3589,7 +3589,15 @@ identify_search_archive (bfd * abfd,
}
if (last_arfile != NULL)
- bfd_close (last_arfile);
+ {
+ bfd_close (last_arfile);
+ /* PR 17512: file: 8b2168d4. */
+ if (last_arfile == arfile)
+ {
+ last_arfile = NULL;
+ break;
+ }
+ }
last_arfile = arfile;
}