OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR ld/14357

Browse Source 
* 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.
This commit is contained in:
Nick Clifton 2012-07-13 13:20:27 +00:00
parent 61e44cfa26
commit cd6f1cf350
9 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ld/ChangeLog
View File

@ -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> 2012-07-10 H.J. Lu <hongjiu.lu@intel.com>
PR ld/14156 PR ld/14156

4
ld/emultempl/elf32.em
View File

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

2
ld/emultempl/spuelf.em
View File

@ -535,7 +535,7 @@ embedded_spu_file (lang_input_statement_type *entry, const char *flags)
cmd[3] = entry->the_bfd->filename; cmd[3] = entry->the_bfd->filename;
cmd[4] = oname; cmd[4] = oname;
cmd[5] = NULL; cmd[5] = NULL;
if (trace_file_tries) if (verbose)
{ {
info_msg (_("running: %s \"%s\" \"%s\" \"%s\" \"%s\"\n"), info_msg (_("running: %s \"%s\" \"%s\" \"%s\" \"%s\"\n"),
cmd[0], cmd[1], cmd[2], cmd[3], cmd[4]); cmd[0], cmd[1], cmd[2], cmd[3], cmd[4]);

4
ld/ldfile.c
View File

@ -126,7 +126,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) if (entry->the_bfd == NULL)
info_msg (_("attempt to open %s failed\n"), attempt); info_msg (_("attempt to open %s failed\n"), attempt);
@ -465,7 +465,7 @@ try_open (const char *name, bfd_boolean *sysrooted)
if (result != NULL) if (result != NULL)
*sysrooted = is_sysrooted_pathname (name); *sysrooted = is_sysrooted_pathname (name);
if (trace_file_tries) if (verbose)
{ {
if (result == NULL) if (result == NULL)
info_msg (_("cannot find script file %s\n"), name); info_msg (_("cannot find script file %s\n"), name);

2
ld/ldlang.c
View File

@ -2740,7 +2740,7 @@ load_symbols (lang_input_statement_type *entry,
if (!entry->flags.reload) if (!entry->flags.reload)
#endif #endif
ldlang_add_file (entry); ldlang_add_file (entry);
if (trace_files || trace_file_tries) if (trace_files || verbose)
info_msg ("%I\n", entry); info_msg ("%I\n", entry);
break; break;

8
ld/ldmain.c
View File

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

2
ld/ldmain.h
View File

@ -31,7 +31,7 @@ extern FILE *previous_script_handle;
extern bfd_boolean force_make_executable; extern bfd_boolean force_make_executable;
extern char *default_target; extern char *default_target;
extern bfd_boolean trace_files; extern bfd_boolean trace_files;
extern bfd_boolean trace_file_tries; extern bfd_boolean verbose;
extern bfd_boolean version_printed; extern bfd_boolean version_printed;
extern bfd_boolean demangling; extern bfd_boolean demangling;
extern int g_switch_value; extern int g_switch_value;

2
ld/lexsup.c
View File

@ -1214,7 +1214,7 @@ parse_args (unsigned argc, char **argv)
case OPTION_VERBOSE: case OPTION_VERBOSE:
ldversion (1); ldversion (1);
version_printed = TRUE; version_printed = TRUE;
trace_file_tries = TRUE; verbose = TRUE;
overflow_cutoff_limit = -2; overflow_cutoff_limit = -2;
if (optarg != NULL) if (optarg != NULL)
{ {

5
ld/pe-dll.c
View File

@ -2713,8 +2713,9 @@ pe_dll_generate_implib (def_file *def, const char *impfilename, struct bfd_link_
return; return;
} }
/* xgettext:c-format */ if (verbose)
info_msg (_("Creating library file: %s\n"), impfilename); /* xgettext:c-format */
info_msg (_("Creating library file: %s\n"), impfilename);
bfd_set_format (outarch, bfd_archive); bfd_set_format (outarch, bfd_archive);
outarch->has_armap = 1; outarch->has_armap = 1;