ChangeLog rotatation and copyright year update

[deliverable/binutils-gdb.git] / ld / ldfile.c

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 16baef831e1ce12d7a3a227c1102e4fbb62beb27..f33bc9dab7886c6e5274f43ef16767eff881679c 100644 (file)
--- a/ld/ldfile.c
+++ b/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-2015 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