X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldmain.c;h=ba2a5923e3e64442366fdaad94c270efc2a0878b;hb=99a4150f8bbe52591984a85bb86b820e85776b38;hp=6d78e27defa46ffe2895ceed3132985ee58ca95d;hpb=e3d73386d704f9fdd4c3c2bd87531cbc5f4e28d6;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldmain.c b/ld/ldmain.c index 6d78e27def..ba2a5923e3 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -1,5 +1,6 @@ /* Main program of GNU linker. - Copyright (C) 1991, 92, 93, 94, 1995 Free Software Foundation, Inc. + Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999 + Free Software Foundation, Inc. Written by Steve Chamberlain steve@cygnus.com This file is part of GLD, the Gnu Linker. @@ -15,9 +16,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GLD; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - +along with GLD; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ #include "bfd.h" #include "sysdep.h" @@ -46,6 +47,12 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307 #include +#ifdef HAVE_SBRK +#ifdef NEED_DECLARATION_SBRK +extern PTR sbrk (); +#endif +#endif + static char *get_emulation PARAMS ((int, char **)); static void set_scripts_dir PARAMS ((void)); @@ -76,10 +83,14 @@ boolean version_printed; /* Nonzero means link in every member of an archive. */ boolean whole_archive; +/* True if we should demangle symbol names. */ +boolean demangling; + args_type command_line; ld_config_type config; +static void remove_output PARAMS ((void)); static boolean check_for_scripts_dir PARAMS ((char *dir)); static boolean add_archive_element PARAMS ((struct bfd_link_info *, bfd *, const char *)); @@ -106,7 +117,7 @@ static boolean warning_callback PARAMS ((struct bfd_link_info *, static void warning_find_reloc PARAMS ((bfd *, asection *, PTR)); static boolean undefined_symbol PARAMS ((struct bfd_link_info *, const char *, bfd *, - asection *, bfd_vma)); + asection *, bfd_vma, boolean)); static boolean reloc_overflow PARAMS ((struct bfd_link_info *, const char *, const char *, bfd_vma, bfd *, asection *, bfd_vma)); @@ -115,8 +126,8 @@ static boolean reloc_dangerous PARAMS ((struct bfd_link_info *, const char *, static boolean unattached_reloc PARAMS ((struct bfd_link_info *, const char *, bfd *, asection *, bfd_vma)); -static boolean notice_ysym PARAMS ((struct bfd_link_info *, const char *, - bfd *, asection *, bfd_vma)); +static boolean notice PARAMS ((struct bfd_link_info *, const char *, + bfd *, asection *, bfd_vma)); static struct bfd_link_callbacks link_callbacks = { @@ -130,7 +141,7 @@ static struct bfd_link_callbacks link_callbacks = reloc_overflow, reloc_dangerous, unattached_reloc, - notice_ysym + notice }; struct bfd_link_info link_info; @@ -155,6 +166,12 @@ main (argc, argv) char *emulation; long start_time = get_run_time (); +#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) + setlocale (LC_MESSAGES, ""); +#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); @@ -162,35 +179,63 @@ main (argc, argv) bfd_init (); + bfd_set_error_program_name (program_name); + xatexit (remove_output); + /* Set the default BFD target based on the configured target. Doing + this permits the linker to be configured for a particular target, + and linked against a shared BFD library which was configured for + a different target. The macro TARGET is defined by Makefile. */ + if (! bfd_set_default_target (TARGET)) + { + einfo (_("%X%P: can't set BFD default target to `%s': %E\n"), TARGET); + xexit (1); + } + /* Initialize the data about options. */ trace_files = trace_file_tries = version_printed = false; whole_archive = false; - config.traditional_format = false; config.build_constructors = true; config.dynamic_link = false; + config.has_shared = false; command_line.force_common_definition = false; command_line.interpreter = NULL; command_line.rpath = NULL; + command_line.warn_mismatch = true; + command_line.check_section_addresses = true; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the + output of the linker, unless COLLECT_NO_DEMANGLE is set in the + environment. Acting the same way here lets us provide the same + interface by default. */ + demangling = getenv ("COLLECT_NO_DEMANGLE") == NULL; link_info.callbacks = &link_callbacks; link_info.relocateable = false; link_info.shared = false; link_info.symbolic = false; link_info.static_link = false; + link_info.traditional_format = false; + link_info.optimize = false; + link_info.no_undefined = false; link_info.strip = strip_none; link_info.discard = discard_none; - link_info.lprefix_len = 1; - link_info.lprefix = "L"; link_info.keep_memory = true; link_info.input_bfds = NULL; link_info.create_object_symbols_section = NULL; link_info.hash = NULL; link_info.keep_hash = NULL; + link_info.notice_all = false; link_info.notice_hash = NULL; link_info.wrap_hash = NULL; - + link_info.mpc860c0 = 0; + /* SVR4 linkers seem to set DT_INIT and DT_FINI based on magic _init + and _fini symbols. We are compatible. */ + link_info.init_function = "_init"; + link_info.fini_function = "_fini"; + ldfile_add_arch (""); config.make_executable = true; @@ -211,10 +256,14 @@ main (argc, argv) if (link_info.relocateable) { - if (command_line.relax) - einfo ("%P%F: -relax and -r may not be used together\n"); + if (command_line.gc_sections) + einfo ("%P%F: --gc-sections and -r may not be used together\n"); + if (link_info.mpc860c0) + einfo (_("%P%F: -r and --mpc860c0 may not be used together\n")); + else if (command_line.relax) + einfo (_("%P%F: --relax and -r may not be used together\n")); if (link_info.shared) - einfo ("%P%F: -r and -shared may not be used together\n"); + einfo (_("%P%F: -r and -shared may not be used together\n")); } /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I @@ -243,7 +292,7 @@ main (argc, argv) { if (trace_file_tries) { - info_msg ("using internal linker script:\n"); + info_msg (_("using internal linker script:\n")); info_msg ("==================================================\n"); info_msg (s); info_msg ("\n==================================================\n"); @@ -262,12 +311,12 @@ main (argc, argv) { if (version_printed) xexit (0); - einfo ("%P%F: no input files\n"); + einfo (_("%P%F: no input files\n")); } if (trace_files) { - info_msg ("%P: mode %s\n", emulation); + info_msg (_("%P: mode %s\n"), emulation); } ldemul_after_parse (); @@ -285,7 +334,7 @@ main (argc, argv) if (config.map_file == (FILE *) NULL) { bfd_set_error (bfd_error_system_call); - einfo ("%P%F: cannot open map file %s: %E\n", + einfo (_("%P%F: cannot open map file %s: %E\n"), config.map_filename); } } @@ -316,6 +365,13 @@ main (argc, argv) ldwrite (); + if (config.map_file != NULL) + lang_map (); + if (command_line.cref) + output_cref (config.map_file != NULL ? config.map_file : stdout); + if (nocrossref_list != NULL) + check_nocrossrefs (); + /* Even if we're producing relocateable output, some non-fatal errors should be reported in the exit status. (What non-fatal errors, if any, do we want to ignore for relocateable output?) */ @@ -324,36 +380,76 @@ main (argc, argv) { if (trace_files == true) { - einfo ("%P: link errors found, deleting executable `%s'\n", + einfo (_("%P: link errors found, deleting executable `%s'\n"), output_filename); } - if (output_bfd->iostream) - fclose ((FILE *) (output_bfd->iostream)); + /* The file will be removed by remove_output. */ - unlink (output_filename); xexit (1); } else { if (! bfd_close (output_bfd)) - einfo ("%F%B: final close failed: %E\n", output_bfd); + einfo (_("%F%B: final close failed: %E\n"), output_bfd); + + /* If the --force-exe-suffix is enabled, and we're making an + executable file and it doesn't end in .exe, copy it to one which does. */ + + if (! link_info.relocateable && command_line.force_exe_suffix) + { + int len = strlen (output_filename); + if (len < 4 + || (strcasecmp (output_filename + len - 4, ".exe") != 0 + && strcasecmp (output_filename + len - 4, ".dll") != 0)) + { + FILE *src; + FILE *dst; + const int bsize = 4096; + char *buf = xmalloc (bsize); + int l; + char *dst_name = xmalloc (len + 5); + strcpy (dst_name, output_filename); + strcat (dst_name, ".exe"); + src = fopen (output_filename, FOPEN_RB); + dst = fopen (dst_name, FOPEN_WB); + + if (!src) + einfo (_("%X%P: unable to open for source of copy `%s'\n"), output_filename); + if (!dst) + einfo (_("%X%P: unable to open for destination of copy `%s'\n"), dst_name); + while ((l = fread (buf, 1, bsize, src)) > 0) + { + int done = fwrite (buf, 1, l, dst); + if (done != l) + { + einfo (_("%P: Error writing file `%s'\n"), dst_name); + } + } + fclose (src); + if (fclose (dst) == EOF) + { + einfo (_("%P: Error closing file `%s'\n"), dst_name); + } + free (dst_name); + free (buf); + } + } } END_PROGRESS (program_name); if (config.stats) { - extern char **environ; #ifdef HAVE_SBRK char *lim = (char *) sbrk (0); #endif long run_time = get_run_time () - start_time; - fprintf (stderr, "%s: total time in link: %ld.%06ld\n", + fprintf (stderr, _("%s: total time in link: %ld.%06ld\n"), program_name, run_time / 1000000, run_time % 1000000); #ifdef HAVE_SBRK - fprintf (stderr, "%s: data size %ld\n", program_name, + fprintf (stderr, _("%s: data size %ld\n"), program_name, (long) (lim - (char *) &environ)); #endif } @@ -376,7 +472,7 @@ get_emulation (argc, argv) char *emulation; int i; - emulation = (char *) getenv (EMULATION_ENVIRON); + emulation = getenv (EMULATION_ENVIRON); if (emulation == NULL) emulation = DEFAULT_EMULATION; @@ -394,12 +490,13 @@ get_emulation (argc, argv) } else { - einfo("%P%F: missing argument to -m\n"); + einfo(_("%P%F: missing argument to -m\n")); } } else if (strcmp (argv[i], "-mips1") == 0 || strcmp (argv[i], "-mips2") == 0 - || strcmp (argv[i], "-mips3") == 0) + || strcmp (argv[i], "-mips3") == 0 + || strcmp (argv[i], "-mips4") == 0) { /* FIXME: The arguments -mips1, -mips2 and -mips3 are passed to the linker by some MIPS compilers. They @@ -507,12 +604,31 @@ add_ysym (name) if (! bfd_hash_table_init_n (link_info.notice_hash, bfd_hash_newfunc, 61)) - einfo ("%P%F: bfd_hash_table_init failed: %E\n"); + einfo (_("%P%F: bfd_hash_table_init failed: %E\n")); } if (bfd_hash_lookup (link_info.notice_hash, name, true, true) == (struct bfd_hash_entry *) NULL) - einfo ("%P%F: bfd_hash_lookup failed: %E\n"); + einfo (_("%P%F: bfd_hash_lookup failed: %E\n")); +} + +/* Record a symbol to be wrapped, from the --wrap option. */ + +void +add_wrap (name) + const char *name; +{ + if (link_info.wrap_hash == NULL) + { + link_info.wrap_hash = ((struct bfd_hash_table *) + xmalloc (sizeof (struct bfd_hash_table))); + if (! bfd_hash_table_init_n (link_info.wrap_hash, + bfd_hash_newfunc, + 61)) + einfo (_("%P%F: bfd_hash_table_init failed: %E\n")); + } + if (bfd_hash_lookup (link_info.wrap_hash, name, true, true) == NULL) + einfo (_("%P%F: bfd_hash_lookup failed: %E\n")); } /* Handle the -retain-symbols-file option. */ @@ -527,7 +643,7 @@ add_keepsyms_file (filename) int c; if (link_info.strip == strip_some) - einfo ("%X%P: error: duplicate retain-symbols-file\n"); + einfo (_("%X%P: error: duplicate retain-symbols-file\n")); file = fopen (filename, "r"); if (file == (FILE *) NULL) @@ -540,7 +656,7 @@ add_keepsyms_file (filename) link_info.keep_hash = ((struct bfd_hash_table *) xmalloc (sizeof (struct bfd_hash_table))); if (! bfd_hash_table_init (link_info.keep_hash, bfd_hash_newfunc)) - einfo ("%P%F: bfd_hash_table_init failed: %E\n"); + einfo (_("%P%F: bfd_hash_table_init failed: %E\n")); bufsize = 100; buf = (char *) xmalloc (bufsize); @@ -571,12 +687,12 @@ add_keepsyms_file (filename) if (bfd_hash_lookup (link_info.keep_hash, buf, true, true) == (struct bfd_hash_entry *) NULL) - einfo ("%P%F: bfd_hash_lookup for insertion failed: %E\n"); + einfo (_("%P%F: bfd_hash_lookup for insertion failed: %E\n")); } } if (link_info.strip != strip_none) - einfo ("%P: `-retain-symbols-file' overrides `-s' and `-S'\n"); + einfo (_("%P: `-retain-symbols-file' overrides `-s' and `-S'\n")); link_info.strip = strip_some; } @@ -589,7 +705,7 @@ add_keepsyms_file (filename) /*ARGSUSED*/ static boolean add_archive_element (info, abfd, name) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; bfd *abfd; const char *name; { @@ -608,15 +724,89 @@ add_archive_element (info, abfd, name) /* FIXME: The following fields are not set: header.next, header.type, closed, passive_position, symbol_count, - next_real_file, is_archive, target, real, common_section, - common_output_section, complained. This bit of code is from the - old decode_library_subfile function. I don't know whether any of - those fields matters. */ + next_real_file, is_archive, target, real. This bit of code is + from the old decode_library_subfile function. I don't know + whether any of those fields matters. */ ldlang_add_file (input); if (config.map_file != (FILE *) NULL) - minfo ("%s needed due to %T\n", abfd->filename, name); + { + static boolean header_printed; + struct bfd_link_hash_entry *h; + bfd *from; + int len; + + h = bfd_link_hash_lookup (link_info.hash, name, false, false, true); + + if (h == NULL) + from = NULL; + else + { + switch (h->type) + { + default: + from = NULL; + break; + + case bfd_link_hash_defined: + case bfd_link_hash_defweak: + from = h->u.def.section->owner; + break; + + case bfd_link_hash_undefined: + case bfd_link_hash_undefweak: + from = h->u.undef.abfd; + break; + + case bfd_link_hash_common: + from = h->u.c.p->section->owner; + break; + } + } + + if (! header_printed) + { + char buf[100]; + + sprintf (buf, "%-29s %s\n\n", _("Archive member included"), + _("because of file (symbol)")); + minfo ("%s", buf); + header_printed = true; + } + + if (bfd_my_archive (abfd) == NULL) + { + minfo ("%s", bfd_get_filename (abfd)); + len = strlen (bfd_get_filename (abfd)); + } + else + { + minfo ("%s(%s)", bfd_get_filename (bfd_my_archive (abfd)), + bfd_get_filename (abfd)); + len = (strlen (bfd_get_filename (bfd_my_archive (abfd))) + + strlen (bfd_get_filename (abfd)) + + 2); + } + + if (len >= 29) + { + print_nl (); + len = 0; + } + while (len < 30) + { + print_space (); + ++len; + } + + if (from != NULL) + minfo ("%B ", from); + if (h != NULL) + minfo ("(%T)\n", h->root.string); + else + minfo ("(%s)\n", name); + } if (trace_files || trace_file_tries) info_msg ("%I\n", input); @@ -630,7 +820,7 @@ add_archive_element (info, abfd, name) /*ARGSUSED*/ static boolean multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *name; bfd *obfd; asection *osec; @@ -639,10 +829,23 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval) asection *nsec; bfd_vma nval; { - einfo ("%X%C: multiple definition of `%T'\n", + /* If either section has the output_section field set to + bfd_abs_section_ptr, it means that the section is being + discarded, and this is not really a multiple definition at all. + FIXME: It would be cleaner to somehow ignore symbols defined in + sections which are being discarded. */ + if ((osec->output_section != NULL + && ! bfd_is_abs_section (osec) + && bfd_is_abs_section (osec->output_section)) + || (nsec->output_section != NULL + && ! bfd_is_abs_section (nsec) + && bfd_is_abs_section (nsec->output_section))) + return true; + + einfo (_("%X%C: multiple definition of `%T'\n"), nbfd, nsec, nval, name); if (obfd != (bfd *) NULL) - einfo ("%D: first defined here\n", obfd, osec, oval); + einfo (_("%D: first defined here\n"), obfd, osec, oval); return true; } @@ -654,7 +857,7 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval) /*ARGSUSED*/ static boolean multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *name; bfd *obfd; enum bfd_link_hash_type otype; @@ -671,43 +874,43 @@ multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize) || ntype == bfd_link_hash_indirect) { ASSERT (otype == bfd_link_hash_common); - einfo ("%B: warning: definition of `%T' overriding common\n", + einfo (_("%B: warning: definition of `%T' overriding common\n"), nbfd, name); if (obfd != NULL) - einfo ("%B: warning: common is here\n", obfd); + einfo (_("%B: warning: common is here\n"), obfd); } else if (otype == bfd_link_hash_defined || otype == bfd_link_hash_defweak || otype == bfd_link_hash_indirect) { ASSERT (ntype == bfd_link_hash_common); - einfo ("%B: warning: common of `%T' overridden by definition\n", + einfo (_("%B: warning: common of `%T' overridden by definition\n"), nbfd, name); if (obfd != NULL) - einfo ("%B: warning: defined here\n", obfd); + einfo (_("%B: warning: defined here\n"), obfd); } else { ASSERT (otype == bfd_link_hash_common && ntype == bfd_link_hash_common); if (osize > nsize) { - einfo ("%B: warning: common of `%T' overridden by larger common\n", + einfo (_("%B: warning: common of `%T' overridden by larger common\n"), nbfd, name); if (obfd != NULL) - einfo ("%B: warning: larger common is here\n", obfd); + einfo (_("%B: warning: larger common is here\n"), obfd); } else if (nsize > osize) { - einfo ("%B: warning: common of `%T' overriding smaller common\n", + einfo (_("%B: warning: common of `%T' overriding smaller common\n"), nbfd, name); if (obfd != NULL) - einfo ("%B: warning: smaller common is here\n", obfd); + einfo (_("%B: warning: smaller common is here\n"), obfd); } else { - einfo ("%B: warning: multiple common of `%T'\n", nbfd, name); + einfo (_("%B: warning: multiple common of `%T'\n"), nbfd, name); if (obfd != NULL) - einfo ("%B: warning: previous common is here\n", obfd); + einfo (_("%B: warning: previous common is here\n"), obfd); } } @@ -721,7 +924,7 @@ multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize) /*ARGSUSED*/ static boolean add_to_set (info, h, reloc, abfd, section, value) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; struct bfd_link_hash_entry *h; bfd_reloc_code_real_type reloc; bfd *abfd; @@ -729,7 +932,7 @@ add_to_set (info, h, reloc, abfd, section, value) bfd_vma value; { if (config.warn_constructors) - einfo ("%P: warning: global constructor %s used\n", + einfo (_("%P: warning: global constructor %s used\n"), h->root.string); if (! config.build_constructors) @@ -768,7 +971,7 @@ constructor_callback (info, constructor, name, abfd, section, value) char set_name[1 + sizeof "__CTOR_LIST__"]; if (config.warn_constructors) - einfo ("%P: warning: global constructor %s used\n", name); + einfo (_("%P: warning: global constructor %s used\n"), name); if (! config.build_constructors) return true; @@ -778,7 +981,7 @@ constructor_callback (info, constructor, name, abfd, section, value) if (bfd_reloc_type_lookup (output_bfd, BFD_RELOC_CTOR) == NULL && (link_info.relocateable || bfd_reloc_type_lookup (abfd, BFD_RELOC_CTOR) == NULL)) - einfo ("%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"); + einfo (_("%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n")); s = set_name; if (bfd_get_symbol_leading_char (abfd) != '\0') @@ -788,13 +991,9 @@ constructor_callback (info, constructor, name, abfd, section, value) else strcpy (s, "__DTOR_LIST__"); - if (config.map_file != (FILE *) NULL) - fprintf (config.map_file, - "Adding %s to constructor/destructor set %s\n", name, set_name); - h = bfd_link_hash_lookup (info->hash, set_name, true, true, true); if (h == (struct bfd_link_hash_entry *) NULL) - einfo ("%P%F: bfd_link_hash_lookup failed: %E\n"); + einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n")); if (h->type == bfd_link_hash_new) { h->type = bfd_link_hash_undefined; @@ -824,7 +1023,7 @@ struct warning_callback_info /*ARGSUSED*/ static boolean warning_callback (info, warning, symbol, abfd, section, address) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *warning; const char *symbol; bfd *abfd; @@ -862,11 +1061,11 @@ warning_callback (info, warning, symbol, abfd, section, address) symsize = bfd_get_symtab_upper_bound (abfd); if (symsize < 0) - einfo ("%B%F: could not read symbols: %E\n", abfd); + einfo (_("%B%F: could not read symbols: %E\n"), abfd); asymbols = (asymbol **) xmalloc (symsize); symbol_count = bfd_canonicalize_symtab (abfd, asymbols); if (symbol_count < 0) - einfo ("%B%F: could not read symbols: %E\n", abfd); + einfo (_("%B%F: could not read symbols: %E\n"), abfd); if (entry != NULL) { entry->asymbols = asymbols; @@ -882,6 +1081,9 @@ warning_callback (info, warning, symbol, abfd, section, address) if (! info.found) einfo ("%B: %s\n", abfd, warning); + + if (entry == NULL) + free (asymbols); } return true; @@ -909,14 +1111,14 @@ warning_find_reloc (abfd, sec, iarg) relsize = bfd_get_reloc_upper_bound (abfd, sec); if (relsize < 0) - einfo ("%B%F: could not read relocs: %E\n", abfd); + einfo (_("%B%F: could not read relocs: %E\n"), abfd); if (relsize == 0) return; relpp = (arelent **) xmalloc (relsize); relcount = bfd_canonicalize_reloc (abfd, sec, relpp, info->asymbols); if (relcount < 0) - einfo ("%B%F: could not read relocs: %E\n", abfd); + einfo (_("%B%F: could not read relocs: %E\n"), abfd); p = relpp; pend = p + relcount; @@ -942,12 +1144,13 @@ warning_find_reloc (abfd, sec, iarg) /*ARGSUSED*/ static boolean -undefined_symbol (info, name, abfd, section, address) - struct bfd_link_info *info; +undefined_symbol (info, name, abfd, section, address, fatal) + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *name; bfd *abfd; asection *section; bfd_vma address; + boolean fatal; { static char *error_name; static unsigned int error_count; @@ -965,14 +1168,14 @@ undefined_symbol (info, name, abfd, section, address) hash = ((struct bfd_hash_table *) xmalloc (sizeof (struct bfd_hash_table))); if (! bfd_hash_table_init (hash, bfd_hash_newfunc)) - einfo ("%F%P: bfd_hash_table_init failed: %E\n"); + einfo (_("%F%P: bfd_hash_table_init failed: %E\n")); } if (bfd_hash_lookup (hash, name, false, false) != NULL) return true; if (bfd_hash_lookup (hash, name, true, true) == NULL) - einfo ("%F%P: bfd_hash_lookup failed: %E\n"); + einfo (_("%F%P: bfd_hash_lookup failed: %E\n")); } /* We never print more than a reasonable number of errors in a row @@ -991,19 +1194,27 @@ undefined_symbol (info, name, abfd, section, address) if (section != NULL) { if (error_count < MAX_ERRORS_IN_A_ROW) - einfo ("%X%C: undefined reference to `%T'\n", - abfd, section, address, name); + { + einfo (_("%C: undefined reference to `%T'\n"), + abfd, section, address, name); + if (fatal) + einfo ("%X"); + } else if (error_count == MAX_ERRORS_IN_A_ROW) - einfo ("%D: more undefined references to `%T' follow\n", + einfo (_("%D: more undefined references to `%T' follow\n"), abfd, section, address, name); } else { if (error_count < MAX_ERRORS_IN_A_ROW) - einfo ("%X%B: undefined reference to `%T'\n", - abfd, name); + { + einfo (_("%B: undefined reference to `%T'\n"), + abfd, name); + if (fatal) + einfo ("%X"); + } else if (error_count == MAX_ERRORS_IN_A_ROW) - einfo ("%B: more undefined references to `%T' follow\n", + einfo (_("%B: more undefined references to `%T' follow\n"), abfd, name); } @@ -1015,7 +1226,7 @@ undefined_symbol (info, name, abfd, section, address) /*ARGSUSED*/ static boolean reloc_overflow (info, name, reloc_name, addend, abfd, section, address) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *name; const char *reloc_name; bfd_vma addend; @@ -1024,10 +1235,10 @@ reloc_overflow (info, name, reloc_name, addend, abfd, section, address) bfd_vma address; { if (abfd == (bfd *) NULL) - einfo ("%P%X: generated"); + einfo (_("%P%X: generated")); else einfo ("%X%C:", abfd, section, address); - einfo (" relocation truncated to fit: %s %T", reloc_name, name); + einfo (_(" relocation truncated to fit: %s %T"), reloc_name, name); if (addend != 0) einfo ("+%v", addend); einfo ("\n"); @@ -1039,17 +1250,17 @@ reloc_overflow (info, name, reloc_name, addend, abfd, section, address) /*ARGSUSED*/ static boolean reloc_dangerous (info, message, abfd, section, address) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *message; bfd *abfd; asection *section; bfd_vma address; { if (abfd == (bfd *) NULL) - einfo ("%P%X: generated"); + einfo (_("%P%X: generated")); else einfo ("%X%C:", abfd, section, address); - einfo ("dangerous relocation: %s\n", message); + einfo (_("dangerous relocation: %s\n"), message); return true; } @@ -1059,34 +1270,44 @@ reloc_dangerous (info, message, abfd, section, address) /*ARGSUSED*/ static boolean unattached_reloc (info, name, abfd, section, address) - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; const char *name; bfd *abfd; asection *section; bfd_vma address; { if (abfd == (bfd *) NULL) - einfo ("%P%X: generated"); + einfo (_("%P%X: generated")); else einfo ("%X%C:", abfd, section, address); - einfo (" reloc refers to symbol `%T' which is not being output\n", name); + einfo (_(" reloc refers to symbol `%T' which is not being output\n"), name); return true; } -/* This is called when a symbol in notice_hash is found. Symbols are - put in notice_hash using the -y option. */ +/* This is called if link_info.notice_all is set, or when a symbol in + link_info.notice_hash is found. Symbols are put in notice_hash + using the -y option. */ -/*ARGSUSED*/ static boolean -notice_ysym (info, name, abfd, section, value) +notice (info, name, abfd, section, value) struct bfd_link_info *info; const char *name; bfd *abfd; asection *section; bfd_vma value; { - einfo ("%B: %s %s\n", abfd, - bfd_is_und_section (section) ? "reference to" : "definition of", - name); + if (! info->notice_all + || (info->notice_hash != NULL + && bfd_hash_lookup (info->notice_hash, name, false, false) != NULL)) + { + if (bfd_is_und_section (section)) + einfo ("%B: reference to %s\n", abfd, name); + else + einfo ("%B: definition of %s\n", abfd, name); + } + + if (command_line.cref || nocrossref_list != NULL) + add_cref (name, abfd, section, value); + return true; }