* Many files: Added gettext invocations around user-visible

	strings.
	* ld.h: Added gettext-related includes and defines.
	* ldmain.c: Call setlocale, bindtextdomain, textdomain.
	* acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY,
	HAVE_LC_MESSAGES): Define.
	* configure.in: Call CY_GNU_GETTEXT.  Create po/Makefile.in and
	po/Makefile.  Use AM_PROG_LEX.
	(TDIRS): AC_SUBST early on, to avoid having value split when it
	happens to cross line 90 of the generated sed script.
	* Makefile.am (SUBDIRS): New macro.
	(POTFILES): Likewise.
	(po/POTFILES.in): New target.
	(ld_new_LDADD): Added INTLLIBS.
	(ld_new_DEPENDENCIES): Added INTLDEPS.
	* po/Make-in, po/POTFILES.in, po/gas.pot: New files.

1 files changed, 72 insertions, 63 deletions

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 03dd315..ec4086a 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -1,5 +1,5 @@
 /* Main program of GNU linker.
-   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
 This file is part of GLD, the Gnu Linker.
@@ -86,6 +86,7 @@ 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 *));
@@ -161,6 +162,10 @@ main (argc, argv)
   char *emulation;
   long start_time = get_run_time ();
 
+  setlocale (LC_MESSAGES, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
   program_name = argv[0];
   xmalloc_set_program_name (program_name);
 
@@ -178,7 +183,7 @@ main (argc, argv)
      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);
+      einfo (_("%X%P: can't set BFD default target to `%s': %E\n"), TARGET);
       xexit (1);
     }
 
@@ -190,6 +195,7 @@ main (argc, argv)
   command_line.force_common_definition = false;
   command_line.interpreter = NULL;
   command_line.rpath = NULL;
+  command_line.warn_mismatch = true;
 
   link_info.callbacks = &link_callbacks;
   link_info.relocateable = false;
@@ -229,9 +235,9 @@ main (argc, argv)
   if (link_info.relocateable)
     {
       if (command_line.relax)
-	einfo ("%P%F: -relax and -r may not be used together\n");
+	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
@@ -260,7 +266,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");
@@ -279,12 +285,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 ();
@@ -302,7 +308,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);
 	    }
 	}
@@ -348,7 +354,7 @@ 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);
 	}
 
@@ -359,7 +365,7 @@ main (argc, argv)
   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. */
@@ -383,21 +389,21 @@ main (argc, argv)
 	      dst = fopen (dst_name, FOPEN_WB);
 
 	      if (!src)
-		einfo ("%X%P: unable to open for source of copy `%s'\n", output_filename);
+		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);
+		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);
+		      einfo (_("%P: Error writing file `%s'\n"), dst_name);
 		    }
 		}
 	      fclose (src);
-	      if (!fclose (dst))
+	      if (fclose (dst) == EOF)
 		{
-		  einfo ("%P: Error closing file `%s'\n", dst_name);
+		  einfo (_("%P: Error closing file `%s'\n"), dst_name);
 		}
 	      free (dst_name);
 	      free (buf);
@@ -415,10 +421,10 @@ main (argc, argv)
 #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
     }
@@ -459,7 +465,7 @@ 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
@@ -573,12 +579,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.  */
@@ -594,10 +600,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.  */
@@ -612,7 +618,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)
@@ -625,7 +631,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);
@@ -656,12 +662,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;
 }
@@ -738,8 +744,8 @@ add_archive_element (info, abfd, name)
 	{
 	  char buf[100];
 
-	  sprintf (buf, "%-29s %s\n\n", "Archive member included",
-		   "because of file (symbol)");
+	  sprintf (buf, "%-29s %s\n\n", _("Archive member included"),
+		   _("because of file (symbol)"));
 	  minfo ("%s", buf);
 	  header_printed = true;
 	}
@@ -811,10 +817,10 @@ multiple_definition (info, name, obfd, osec, oval, nbfd, nsec, nval)
 	  && bfd_is_abs_section (nsec->output_section)))
     return true;
 
-  einfo ("%X%C: multiple definition of `%T'\n",
+  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;
 }
 
@@ -843,43 +849,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);
 	}
     }
 
@@ -901,7 +907,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)
@@ -940,7 +946,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;
@@ -950,7 +956,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')
@@ -962,7 +968,7 @@ constructor_callback (info, constructor, name, abfd, section, value)
 
   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;
@@ -1030,11 +1036,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;
@@ -1080,14 +1086,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;
@@ -1136,14 +1142,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
@@ -1162,19 +1168,19 @@ 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",
+	einfo (_("%X%C: undefined reference to `%T'\n"),
 	       abfd, section, address, name);
       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",
+	einfo (_("%X%B: undefined reference to `%T'\n"),
 	       abfd, name);
       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);
     }
 
@@ -1195,10 +1201,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");
@@ -1217,10 +1223,10 @@ reloc_dangerous (info, message, 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 ("dangerous relocation: %s\n", message);
+  einfo (_("dangerous relocation: %s\n"), message);
   return true;
 }
 
@@ -1237,10 +1243,10 @@ unattached_reloc (info, name, 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 (" 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;
 }
 
@@ -1259,9 +1265,12 @@ notice (info, name, abfd, section, value)
   if (! info->notice_all
       || (info->notice_hash != NULL
 	  && bfd_hash_lookup (info->notice_hash, name, false, false) != NULL))
-    einfo ("%B: %s %s\n", abfd,
-	   bfd_is_und_section (section) ? "reference to" : "definition of",
-	   name);
+    {
+      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);