PR ld/14357

	* ldmain.c (trace_file_tries): Rename to 'verbose'.
	* ldfile.c: Likewise.
	* ldlang.c: Likewise.
	* ldmain.h: Likewise.
	* lexsup.c: Likewise.
	* emultempl/elf32.em: Likewise.
	* emultemp/spuelf.em: Likewise.
	* pe-dll.c (pe_dll_generate_implib): Only print creation message
	in verbose mode.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7327db577054c95c90572188247f994b744dfd1f..a9525308f8150b91ada6bfac3a54587a783b2cee 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-13  Nick Clifton  <nickc@redhat.com>
+
+       PR ld/14357
+       * ldmain.c (trace_file_tries): Rename to 'verbose'.
+       * ldfile.c: Likewise.
+       * ldlang.c: Likewise.
+       * ldmain.h: Likewise.
+       * lexsup.c: Likewise.
+       * emultempl/elf32.em: Likewise.
+       * emultemp/spuelf.em: Likewise.
+       * pe-dll.c (pe_dll_generate_implib): Only print creation message
+       in verbose mode.
+
 2012-07-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/14156

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 2b7a352a08cad2ebe4c1ef747ed3b781cd19d09c..de51050db5456983ef93d559b7809f6670bdc441 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -412,7 +412,7 @@ fragment <<EOF
   /* First strip off everything before the last '/'.  */
   soname = lbasename (abfd->filename);
 
-  if (trace_file_tries)
+  if (verbose)
     info_msg (_("found %s at %s\n"), soname, name);
 
   global_found = NULL;
@@ -1216,7 +1216,7 @@ gld${EMULATION_NAME}_after_open (void)
       n.by = l->by;
       n.name = l->name;
       nn.by = l->by;
-      if (trace_file_tries)
+      if (verbose)
        info_msg (_("%s needed by %B\n"), l->name, l->by);
 
       /* As-needed libs specified on the command line (or linker script)

diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index 2bcfcc2736f01f2b6af056fc8dbfc5470ef7347f..eef57aa7cc290cdb258940e1c5688f838eb76748 100644 (file)
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -535,7 +535,7 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags)
   cmd[3] = entry->the_bfd->filename;
   cmd[4] = oname;
   cmd[5] = NULL;
-  if (trace_file_tries)
+  if (verbose)
     {
       info_msg (_("running: %s \"%s\" \"%s\" \"%s\" \"%s\"\n"),
                cmd[0], cmd[1], cmd[2], cmd[3], cmd[4]);

diff --git a/ld/ldfile.c b/ld/ldfile.c
index 41ace36f54372b1bc2e6e61d8b346444ae76fc68..e9091e9fa9ab0cb1182a102de48096ac13215a39 100644 (file)
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -126,7 +126,7 @@ ldfile_try_open_bfd (const char *attempt,
 {
   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);
@@ -465,7 +465,7 @@ try_open (const char *name, bfd_boolean *sysrooted)
   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);

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 317e445cd19e29ebd0739d7f5a3247d00fa07457..5a4eef70ee58d7991dfc7d8c3e5edd86222ef0bd 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2740,7 +2740,7 @@ load_symbols (lang_input_statement_type *entry,
       if (!entry->flags.reload)
 #endif
        ldlang_add_file (entry);
-      if (trace_files || trace_file_tries)
+      if (trace_files || verbose)
        info_msg ("%I\n", entry);
       break;
 

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 3bdaf4df2088d29271673d11d55b5eb4fac830ea..15f8ebf201f199d11c8c440a3dee6840d03a8c72 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -88,8 +88,8 @@ int g_switch_value = 8;
 /* Nonzero means print names of input files as processed.  */
 bfd_boolean trace_files;
 
-/* Nonzero means same, but note open failures, too.  */
-bfd_boolean trace_file_tries;
+/* Nonzero means report actions taken by the linker, and describe the linker script in use.  */
+bfd_boolean verbose;
 
 /* Nonzero means version number was printed, so exit successfully
    instead of complaining if no input files are given.  */
@@ -340,7 +340,7 @@ main (int argc, char **argv)
       lex_string = NULL;
     }
 
-  if (trace_file_tries)
+  if (verbose)
     {
       if (saved_script_handle)
        info_msg (_("using external linker script:"));
@@ -861,7 +861,7 @@ add_archive_element (struct bfd_link_info *info,
        minfo ("(%s)\n", name);
     }
 
-  if (trace_files || trace_file_tries)
+  if (trace_files || verbose)
     info_msg ("%I\n", &orig_input);
   return TRUE;
 }

diff --git a/ld/ldmain.h b/ld/ldmain.h
index 527d3f2e51a15c6e256fd44a9143289a85dafa3d..83638339c9f987aecd43cdf5e1dff6c7cab7753f 100644 (file)
--- a/ld/ldmain.h
+++ b/ld/ldmain.h
@@ -31,7 +31,7 @@ extern FILE *previous_script_handle;
 extern bfd_boolean force_make_executable;
 extern char *default_target;
 extern bfd_boolean trace_files;
-extern bfd_boolean trace_file_tries;
+extern bfd_boolean verbose;
 extern bfd_boolean version_printed;
 extern bfd_boolean demangling;
 extern int g_switch_value;

diff --git a/ld/lexsup.c b/ld/lexsup.c
index b5e34683be7134d5dc8881c365ad73397cc98206..fc410c9e301be9fb545a1210f075d687e1c6927f 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1214,7 +1214,7 @@ parse_args (unsigned argc, char **argv)
        case OPTION_VERBOSE:
          ldversion (1);
          version_printed = TRUE;
-         trace_file_tries = TRUE;
+         verbose = TRUE;
          overflow_cutoff_limit = -2;
          if (optarg != NULL)
            {

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 84ff02989223fac8bd6512ca0572abaea80c9de7..31beac828dc3ede2207decb0c053b38ae302cf69 100644 (file)
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -2713,8 +2713,9 @@ pe_dll_generate_implib (def_file *def, const char *impfilename, struct bfd_link_
       return;
     }
 
-  /* xgettext:c-format */
-  info_msg (_("Creating library file: %s\n"), impfilename);
+  if (verbose)
+    /* xgettext:c-format */
+    info_msg (_("Creating library file: %s\n"), impfilename);
 
   bfd_set_format (outarch, bfd_archive);
   outarch->has_armap = 1;