X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldmain.c;h=0579727289ba0be513bc3971ff05102dbfb67175;hb=3f965e60f6b747ff7d0052a823b7fa37e385bd8c;hp=1096368a9d9d46e731f15d6ee750654f8e30a8c2;hpb=28113e82bd6a33795a87c0988cf0ca85c308793d;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldmain.c b/ld/ldmain.c index 1096368a9d..0579727289 100644 --- a/ld/ldmain.c +++ b/ld/ldmain.c @@ -1,5 +1,7 @@ /* Main program of GNU linker. - Copyright (C) 1991, 92, 93, 94, 1995 Free Software Foundation, Inc. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, + 2002 + Free Software Foundation, Inc. Written by Steve Chamberlain steve@cygnus.com This file is part of GLD, the Gnu Linker. @@ -15,37 +17,46 @@ 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" #include -#include +#include "safe-ctype.h" #include "libiberty.h" #include "progress.h" #include "bfdlink.h" +#include "filenames.h" #include "ld.h" #include "ldmain.h" #include "ldmisc.h" #include "ldwrite.h" -#include "ldgram.h" #include "ldexp.h" #include "ldlang.h" -#include "ldemul.h" +#include "ldgram.h" #include "ldlex.h" #include "ldfile.h" +#include "ldemul.h" #include "ldctor.h" -/* Somewhere above, sys/stat.h got included . . . . */ +/* Somewhere above, sys/stat.h got included . . . . */ #if !defined(S_ISDIR) && defined(S_IFDIR) #define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif #include +#ifdef HAVE_SBRK +#ifdef NEED_DECLARATION_SBRK +extern PTR sbrk (); +#endif +#endif + +int main PARAMS ((int, char **)); + static char *get_emulation PARAMS ((int, char **)); static void set_scripts_dir PARAMS ((void)); @@ -57,7 +68,7 @@ const char *output_filename = "a.out"; /* Name this program was invoked by. */ char *program_name; -/* The file that we're creating */ +/* The file that we're creating. */ bfd *output_bfd = 0; /* Set by -G argument, for MIPS ECOFF target. */ @@ -76,10 +87,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 +121,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,11 +130,10 @@ 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 = -{ +static struct bfd_link_callbacks link_callbacks = { add_archive_element, multiple_definition, multiple_common, @@ -130,7 +144,7 @@ static struct bfd_link_callbacks link_callbacks = reloc_overflow, reloc_dangerous, unattached_reloc, - notice_ysym + notice }; struct bfd_link_info link_info; @@ -138,10 +152,10 @@ struct bfd_link_info link_info; static void remove_output () { - if (output_filename) + if (output_filename) { if (output_bfd && output_bfd->iostream) - fclose((FILE *)(output_bfd->iostream)); + fclose ((FILE *) (output_bfd->iostream)); if (delete_output_file_on_failure) unlink (output_filename); } @@ -155,6 +169,15 @@ main (argc, argv) char *emulation; long start_time = get_run_time (); +#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) + setlocale (LC_MESSAGES, ""); +#endif +#if defined (HAVE_SETLOCALE) + setlocale (LC_CTYPE, ""); +#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + program_name = argv[0]; xmalloc_set_program_name (program_name); @@ -166,44 +189,89 @@ main (argc, argv) 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); + } + +#if YYDEBUG + { + extern int yydebug; + yydebug = 1; + } +#endif + /* 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; + config.split_by_reloc = (unsigned) -1; + config.split_by_file = (bfd_size_type) -1; command_line.force_common_definition = false; + command_line.inhibit_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.emitrelocations = false; link_info.shared = false; link_info.symbolic = false; + link_info.export_dynamic = false; link_info.static_link = false; + link_info.traditional_format = false; + link_info.optimize = false; + link_info.no_undefined = false; + link_info.allow_shlib_undefined = false; link_info.strip = strip_none; - link_info.discard = discard_none; - link_info.lprefix_len = 1; - link_info.lprefix = "L"; + link_info.discard = discard_sec_merge; 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"; + link_info.new_dtags = false; + link_info.eh_frame_hdr = false; + link_info.flags = (bfd_vma) 0; + link_info.flags_1 = (bfd_vma) 0; + link_info.pei386_auto_import = false; + link_info.combreloc = false; + link_info.spare_dynamic_tags = 5; + ldfile_add_arch (""); config.make_executable = true; force_make_executable = false; config.magic_demand_paged = true; config.text_read_only = true; - config.make_executable = true; emulation = get_emulation (argc, argv); ldemul_choose_mode (emulation); - default_target = ldemul_choose_target (); + default_target = ldemul_choose_target (argc, argv); lang_init (); ldemul_before_parse (); lang_has_input_file = false; @@ -213,10 +281,22 @@ 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")); + } + + if (! link_info.shared) + { + if (command_line.filter_shlib) + einfo (_("%P%F: -F may not be used without -shared\n")); + if (command_line.auxiliary_filters) + einfo (_("%P%F: -f may not be used without -shared\n")); } /* Treat ld -r -s as ld -r -S -x (i.e., strip all local symbols). I @@ -225,7 +305,7 @@ main (argc, argv) if (link_info.relocateable && link_info.strip == strip_all) { link_info.strip = strip_debugger; - if (link_info.discard == discard_none) + if (link_info.discard == discard_sec_merge) link_info.discard = discard_all; } @@ -233,23 +313,17 @@ main (argc, argv) the -L's in argv have been processed. */ set_scripts_dir (); - if (had_script == false) + /* If we have not already opened and parsed a linker script + read the emulation's appropriate default script. */ + if (saved_script_handle == NULL) { - /* Read the emulation's appropriate default script. */ int isfile; - char *s = ldemul_get_script (&isfile); + char *s = ldemul_get_script (& isfile); if (isfile) ldfile_open_command_file (s); else - { - if (trace_file_tries) - { - info_msg ("using internal linker script:\n"); - info_msg ("==================================================\n"); - info_msg (s); - info_msg ("\n==================================================\n"); - } + { lex_string = s; lex_redirect (s); } @@ -258,23 +332,55 @@ main (argc, argv) lex_string = NULL; } + if (trace_file_tries) + { + if (saved_script_handle) + info_msg (_("using external linker script:")); + else + info_msg (_("using internal linker script:")); + info_msg ("\n==================================================\n"); + + if (saved_script_handle) + { + static const int ld_bufsz = 8193; + size_t n; + char *buf = xmalloc (ld_bufsz); + + rewind (saved_script_handle); + while ((n = fread (buf, 1, ld_bufsz - 1, saved_script_handle)) > 0) + { + buf [n] = 0; + info_msg (buf); + } + rewind (saved_script_handle); + free (buf); + } + else + { + int isfile; + + info_msg (ldemul_get_script (& isfile)); + } + + info_msg ("\n==================================================\n"); + } + lang_final (); if (lang_has_input_file == false) { 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 (); - if (config.map_filename) { if (strcmp (config.map_filename, "-") == 0) @@ -287,27 +393,28 @@ 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); } } } - lang_process (); /* Print error messages for any missing symbols, for any warning - symbols, and possibly multiple definitions */ + symbols, and possibly multiple definitions. */ - - if (config.text_read_only) + if (! link_info.relocateable) { - /* Look for a text section and mark the readonly attribute in it */ + /* Look for a text section and switch the readonly attribute in it. */ asection *found = bfd_get_section_by_name (output_bfd, ".text"); if (found != (asection *) NULL) { - found->flags |= SEC_READONLY; + if (config.text_read_only) + found->flags |= SEC_READONLY; + else + found->flags &= ~SEC_READONLY; } } @@ -318,6 +425,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?) */ @@ -326,36 +440,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 } @@ -378,7 +532,7 @@ get_emulation (argc, argv) char *emulation; int i; - emulation = (char *) getenv (EMULATION_ENVIRON); + emulation = getenv (EMULATION_ENVIRON); if (emulation == NULL) emulation = DEFAULT_EMULATION; @@ -396,14 +550,18 @@ 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], "-mips32") == 0 + || strcmp (argv[i], "-mips64") == 0 + || strcmp (argv[i], "-mips4") == 0 + || strcmp (argv[i], "-mips5") == 0) { - /* FIXME: The arguments -mips1, -mips2 and -mips3 are + /* FIXME: The arguments -mips1, -mips2, -mips3, etc. are passed to the linker by some MIPS compilers. They generally tell the linker to use a slightly different library path. Perhaps someday these should be @@ -443,7 +601,7 @@ check_for_scripts_dir (dir) dirlen = strlen (dir); /* sizeof counts the terminating NUL. */ - buf = (char *) xmalloc (dirlen + sizeof("/ldscripts")); + buf = (char *) xmalloc (dirlen + sizeof ("/ldscripts")); sprintf (buf, "%s/ldscripts", dir); res = stat (buf, &s) == 0 && S_ISDIR (s.st_mode); @@ -468,10 +626,19 @@ set_scripts_dir () size_t dirlen; if (check_for_scripts_dir (SCRIPTDIR)) - return; /* We've been installed normally. */ + /* We've been installed normally. */ + return; /* Look for "ldscripts" in the dir where our binary is. */ end = strrchr (program_name, '/'); +#ifdef HAVE_DOS_BASED_FILE_SYSTEM + { + /* We could have \foo\bar, or /foo\bar. */ + char *bslash = strrchr (program_name, '\\'); + if (end == NULL || (bslash != NULL && bslash > end)) + end = bslash; + } +#endif if (end == NULL) { @@ -488,14 +655,16 @@ set_scripts_dir () dir[dirlen] = '\0'; if (check_for_scripts_dir (dir)) - return; /* Don't free dir. */ + /* Don't free dir. */ + return; /* Look for "ldscripts" in /../lib. */ strcpy (dir + dirlen, "/../lib"); if (check_for_scripts_dir (dir)) return; - free (dir); /* Well, we tried. */ + /* Well, we tried. */ + free (dir); } void @@ -509,12 +678,12 @@ 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. */ @@ -530,10 +699,10 @@ add_wrap (name) if (! bfd_hash_table_init_n (link_info.wrap_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.wrap_hash, name, true, true) == NULL) - einfo ("%P%F: bfd_hash_lookup failed: %E\n"); + einfo (_("%P%F: bfd_hash_lookup failed: %E\n")); } /* Handle the -retain-symbols-file option. */ @@ -548,7 +717,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) @@ -561,7 +730,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); @@ -569,14 +738,14 @@ add_keepsyms_file (filename) c = getc (file); while (c != EOF) { - while (isspace (c)) + while (ISSPACE (c)) c = getc (file); if (c != EOF) { size_t len = 0; - while (! isspace (c) && c != EOF) + while (! ISSPACE (c) && c != EOF) { buf[len] = c; ++len; @@ -592,12 +761,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; } @@ -607,10 +776,9 @@ add_keepsyms_file (filename) /* This is called when BFD has decided to include an archive member in a link. */ -/*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; { @@ -629,15 +797,88 @@ 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, _("Archive member included because of file (symbol)\n\n")); + 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); @@ -648,10 +889,9 @@ add_archive_element (info, abfd, name) /* This is called when BFD has discovered a symbol which is defined multiple times. */ -/*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; @@ -660,10 +900,30 @@ 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); + + if (command_line.relax) + { + einfo (_("%P: Disabling relaxation: it will not work with multiple definitions\n")); + command_line.relax = 0; + } + return true; } @@ -672,10 +932,9 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval) or when two common symbols are found. We only do something if -warn-common was used. */ -/*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; @@ -692,43 +951,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); } } @@ -739,10 +998,9 @@ multiple_common (info, name, obfd, otype, osize, nbfd, ntype, nsize) entry in the linker hash table for the set. SECTION and VALUE represent a value which should be added to the set. */ -/*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; @@ -750,7 +1008,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) @@ -789,7 +1047,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; @@ -799,7 +1057,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') @@ -809,13 +1067,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; @@ -832,8 +1086,7 @@ constructor_callback (info, constructor, name, abfd, section, value) /* A structure used by warning_callback to pass information through bfd_map_over_sections. */ -struct warning_callback_info -{ +struct warning_callback_info { boolean found; const char *warning; const char *symbol; @@ -842,10 +1095,9 @@ struct warning_callback_info /* This is called when there is a reference to a warning symbol. */ -/*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; @@ -883,11 +1135,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; @@ -903,6 +1155,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; @@ -930,14 +1185,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; @@ -961,14 +1216,14 @@ warning_find_reloc (abfd, sec, iarg) /* This is called when an undefined symbol is found. */ -/*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 ATTRIBUTE_UNUSED; { static char *error_name; static unsigned int error_count; @@ -986,14 +1241,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 @@ -1006,25 +1261,33 @@ undefined_symbol (info, name, abfd, section, address) error_count = 0; if (error_name != (char *) NULL) free (error_name); - error_name = buystring (name); + error_name = xstrdup (name); } 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); } @@ -1033,10 +1296,9 @@ undefined_symbol (info, name, abfd, section, address) /* This is called when a reloc overflows. */ -/*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; @@ -1045,10 +1307,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"); @@ -1057,57 +1319,65 @@ reloc_overflow (info, name, reloc_name, addend, abfd, section, address) /* This is called when a dangerous relocation is made. */ -/*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; } /* This is called when a reloc is being generated attached to a symbol that is not being output. */ -/*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; }