summaryrefslogtreecommitdiffstats
path: root/binutils-2.25/ld/ldfile.c
diff options
context:
space:
mode:
Diffstat (limited to 'binutils-2.25/ld/ldfile.c')
-rw-r--r--binutils-2.25/ld/ldfile.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/binutils-2.25/ld/ldfile.c b/binutils-2.25/ld/ldfile.c
index 16baef8..782ed7f 100644
--- a/binutils-2.25/ld/ldfile.c
+++ b/binutils-2.25/ld/ldfile.c
@@ -1,7 +1,5 @@
/* Linker file opening and searching.
- Copyright 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012
- Free Software Foundation, Inc.
+ Copyright (C) 1991-2014 Free Software Foundation, Inc.
This file is part of the GNU Binutils.
@@ -369,7 +367,7 @@ ldfile_open_file_search (const char *arch,
return TRUE;
}
- if (entry->flags.maybe_archive)
+ if (entry->flags.maybe_archive && !entry->flags.full_name_provided)
string = concat (search->name, slash, lib, entry->filename,
arch, suffix, (const char *) NULL);
else