ChangeLog rotatation and copyright year update

[external/binutils.git] / ld / ldfile.c

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 41ace36..f33bc9d 100644 (file)
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -1,7 +1,5 @@
 /* Linker file opening and searching.
 /* 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.
 
 
    This file is part of the GNU Binutils.
 


@@ -126,7 +124,7 @@ ldfile_try_open_bfd (const char *attempt,
 {
   entry->the_bfd = bfd_openr (attempt, entry->target);
 
 {
   entry->the_bfd = bfd_openr (attempt, entry->target);
 

-  if (trace_file_tries)
+  if (verbose)

     {
       if (entry->the_bfd == NULL)
        info_msg (_("attempt to open %s failed\n"), attempt);
     {
       if (entry->the_bfd == NULL)
        info_msg (_("attempt to open %s failed\n"), attempt);


@@ -369,7 +367,7 @@ ldfile_open_file_search (const char *arch,
            return TRUE;
        }
 
            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
        string = concat (search->name, slash, lib, entry->filename,
                         arch, suffix, (const char *) NULL);
       else


@@ -465,7 +463,7 @@ try_open (const char *name, bfd_boolean *sysrooted)
   if (result != NULL)
     *sysrooted = is_sysrooted_pathname (name);
 
   if (result != NULL)
     *sysrooted = is_sysrooted_pathname (name);
 

-  if (trace_file_tries)
+  if (verbose)

     {
       if (result == NULL)
        info_msg (_("cannot find script file %s\n"), name);
     {
       if (result == NULL)
        info_msg (_("cannot find script file %s\n"), name);


@@ -602,6 +600,7 @@ ldfile_open_command_file_1 (const char *name, bfd_boolean default_only)
     {
       bfd_set_error (bfd_error_system_call);
       einfo (_("%P%F: cannot open linker script file %s: %E\n"), name);
     {
       bfd_set_error (bfd_error_system_call);
       einfo (_("%P%F: cannot open linker script file %s: %E\n"), name);

+      return;

     }
 
   lex_push_file (ldlex_input_stack, name, sysrooted);
     }
 
   lex_push_file (ldlex_input_stack, name, sysrooted);