Move bug report string to one place.

24 files changed, 73 insertions, 20 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index f89a4e8c5e..27720da4c6 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,21 @@
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* bucomm.h: #include "bin-bugs.h"
+	* addr2line.c (usage): Use REPORT_BUGS_TO.
+	* ar.c (usage): Likewise.
+	* nlmconv.c (show_usage): Likewise.
+	* nm.c (usage): Likewise.
+	(OPTION_TARGET): Define.
+	(long_options): Use OPTION_TARGET rather than 200.
+	(main): Likewise.
+
+	* objcopy.c (copy_usage): Likewise.
+	(strip_usage): Likewise.
+	* objdump.c (usage): Likewise.
+	* readelf.c (usage): Likewise.
+	* strings.c (usage): Likewise.
+	* windres.c (usage): Likewise.
+
 2000-03-31  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
 	* readelf.c: Include sys/types.h before sys/stat.h for ultrix.
@@ -7,7 +25,7 @@
 	* rddbg.c (read_section_stabs_debugging_info): Catch out of range
 	string offsets in corrupt stabs entries.
 
-2000-03-27  Alan Modra  <alan@linuxcare.com>
+2000-03-27  Alan Modra  <alan@linuxcare.com.au>
 
 	* readelf.c: Include elf/avr.h
 	(dump_relocations): Add EM_AVR case.
diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 72707c20bb..d72207b4e6 100644
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -80,7 +80,7 @@ Usage: %s [-CfsHV] [-b bfdname] [--target=bfdname]\n\
 	   program_name);
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/binutils/ar.c b/binutils/ar.c
index ad9e59d347..728185eea8 100644
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -283,7 +283,7 @@ usage (help)
   list_supported_targets (program_name, stderr);
 
   if (help)
-    fprintf (s, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (s, REPORT_BUGS_TO);
 
   xexit (help ? 0 : 1);
 }
diff --git a/binutils/bucomm.h b/binutils/bucomm.h
index 36e6a7959e..f211473980 100644
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/types.h>
 
 #include "config.h"
+#include "bin-bugs.h"
 
 #ifdef USE_BINARY_FOPEN
 #include "fopen-bin.h"
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c
index f1c8b6c268..93788a9693 100644
--- a/binutils/nlmconv.c
+++ b/binutils/nlmconv.c
@@ -1138,7 +1138,7 @@ Usage: %s [-dhV] [-I bfdname] [-O bfdname] [-T header-file] [-l linker]\n\
        [in-file [out-file]]\n"),
 	   program_name);
   if (status == 0)
-    fprintf (file, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (file, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/binutils/nm.c b/binutils/nm.c
index ade3f7cdf2..e9476976ff 100644
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -255,6 +255,8 @@ static char *target = NULL;
 static bfd *lineno_cache_bfd;
 static bfd *lineno_cache_rel_bfd;
 
+#define OPTION_TARGET 200
+
 static struct option long_options[] =
 {
   {"debug-syms", no_argument, &print_debug_syms, 1},
@@ -275,7 +277,7 @@ static struct option long_options[] =
   {"reverse-sort", no_argument, &reverse_sort, 1},
   {"size-sort", no_argument, &sort_by_size, 1},
   {"stats", no_argument, &show_stats, 1},
-  {"target", required_argument, 0, 200},
+  {"target", required_argument, 0, OPTION_TARGET},
   {"defined-only", no_argument, &defined_only, 1},
   {"undefined-only", no_argument, &undefined_only, 1},
   {"version", no_argument, &show_version, 1},
@@ -301,7 +303,7 @@ Usage: %s [-aABCDglnopPrsuvV] [-t radix] [--radix=radix] [--target=bfdname]\n\
 	   program_name);
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
@@ -448,7 +450,7 @@ main (argc, argv)
 	  show_version = 1;
 	  break;
 
-	case 200:		/* --target */
+	case OPTION_TARGET:	/* --target */
 	  target = optarg;
 	  break;
 
diff --git a/binutils/objcopy.c b/binutils/objcopy.c
index 37b12e7ba5..f6048b7fd2 100644
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -341,7 +341,7 @@ copy_usage (stream, exit_status)
 "));
   list_supported_targets (program_name, stream);
   if (exit_status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (exit_status);
 }
 
@@ -373,7 +373,7 @@ strip_usage (stream, exit_status)
 
   list_supported_targets (program_name, stream);
   if (exit_status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (exit_status);
 }
 
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 488d4f3f3c..81c79f4bb4 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -274,7 +274,7 @@ usage (stream, status)
       disassembler_usage (stream);
     }
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/binutils/readelf.c b/binutils/readelf.c
index cd1e127dcb..60810663b7 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -1700,7 +1700,7 @@ usage ()
   fprintf (stdout, _("  -I or --histogram         Display histogram of bucket list lengths\n"));
   fprintf (stdout, _("  -v or --version           Display the version number of readelf\n"));
   fprintf (stdout, _("  -H or --help              Display this information\n"));
-  fprintf (stdout, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+  fprintf (stdout, REPORT_BUGS_TO);
 
   exit (0);
 }
diff --git a/binutils/strings.c b/binutils/strings.c
index fb139fab9b..65ea92fe46 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -509,6 +509,6 @@ Usage: %s [-afov] [-n min-len] [-min-len] [-t {o,x,d}] [-]\n\
 	   program_name);
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
diff --git a/binutils/windres.c b/binutils/windres.c
index 3b24b47825..a2f6fe7e13 100644
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -734,7 +734,7 @@ extension if not specified.  A single file name is an input file.\n\
 No input-file is stdin, default rc.  No output-file is stdout, default rc.\n"));
   list_supported_targets (program_name, stream);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b4194fdcc1..51bbbba83b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* as.h: #include "bin-bugs.h"
+	* as.c (show_usage): Use REPORT_BUGS_TO.
+	* gasp.c: #include "bin-bugs.h"
+	(show_usage): Use REPORT_BUGS_TO.
+
+	* config/tc-sparc.c (md_show_usage): Add a trailing newline.
+
 Mon Apr  3 13:56:03 2000  Hans-Peter Nilsson  <hp@axis.com>
 
 	* write.c (write_object_file) [! WORKING_DOT_WORD]: If defined,
diff --git a/gas/as.c b/gas/as.c
index 647f4befbe..12aa2fc913 100644
--- a/gas/as.c
+++ b/gas/as.c
@@ -322,7 +322,8 @@ Options:\n\
 
   md_show_usage (stream);
 
-  fprintf (stream, _("\nReport bugs to bug-gnu-utils@gnu.org\n"));
+  fputc ('\n', stream);
+  fprintf (stream, REPORT_BUGS_TO);
 }
 
 /*
diff --git a/gas/as.h b/gas/as.h
index 4c4658a04d..2106b339ab 100644
--- a/gas/as.h
+++ b/gas/as.h
@@ -38,6 +38,7 @@
  */
 
 #include "config.h"
+#include "bin-bugs.h"
 
 /* This is the code recommended in the autoconf documentation, almost
    verbatim.  If it doesn't work for you, let me know, and notify
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index f7049d61da..1e7230061d 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -638,7 +638,7 @@ md_show_usage (stream)
 -EL			generate code for a little endian machine\n\
 -EB			generate code for a big endian machine\n\
 --little-endian-data	generate code for a machine having big endian\n\
-                        instructions and little endian data."));
+                        instructions and little endian data.\n"));
 #endif
 }
 
diff --git a/gas/gasp.c b/gas/gasp.c
index b35a4ae57c..dcceccf515 100644
--- a/gas/gasp.c
+++ b/gas/gasp.c
@@ -50,6 +50,7 @@ suitable for gas to consume.
 */
 
 #include "config.h"
+#include "bin-bugs.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -3550,7 +3551,7 @@ Usage: %s \n\
   [-Ipath]                        add to include path list\n\
   [in-file]\n"));
   if (status == 0)
-    printf (_("\nReport bugs to bug-gnu-utils@gnu.org\n"));
+    printf (REPORT_BUGS_TO);
   exit (status);
 }
 
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index c4742ffffd..5eb13e81d2 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,7 +1,12 @@
+2000-04-01  Alan Modra  <alan@linuxcare.com.au>
+
+	* gprof.h: #include "bin-bugs.h".
+	* gprof.c (usage): Use REPORT_BUGS_TO.
+
 2000-03-31  Alan Modra  <alan@linuxcare.com.au>
 
 	* symtab.c (symtab_finalize): Don't use post-increment on
-	structure copy to work around a ppc gcc bug.
+	structure copy, to work around a ppc gcc bug.
 
 1999-09-29  Mark Kettenis  <kettenis@gnu.org>
 
diff --git a/gprof/gprof.c b/gprof/gprof.c
index cb904870e5..82440a82e8 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -157,7 +157,7 @@ Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfFJnNOpPqQZ][name]] [-I dirs]\n\
 	[image-file] [profile-file...]\n"),
 	   whoami);
   if (status == 0)
-    fprintf (stream, _("Report bugs to bug-gnu-utils@gnu.org\n"));
+    fprintf (stream, REPORT_BUGS_TO);
   done (status);
 }
 
diff --git a/gprof/gprof.h b/gprof/gprof.h
index 8f62aeefd4..a144bf49b5 100644
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -76,6 +76,7 @@
 # define N_(String) (String)
 #endif
 
+#include "bin-bugs.h"
 
 /*
  * These may already be defined on some systems.  We could probably
diff --git a/include/ChangeLog b/include/ChangeLog
index cb15edca06..c76b726e3c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* bin-bugs.h: New file.
+
 2000-03-27  Denis Chertykov  <denisc@overta.ru>
 
 	* dis-asm.h (print_insn_avr): Declare.
diff --git a/include/bin-bugs.h b/include/bin-bugs.h
new file mode 100644
index 0000000000..368011b3c1
--- /dev/null
+++ b/include/bin-bugs.h
@@ -0,0 +1,3 @@
+#ifndef REPORT_BUGS_TO
+#define REPORT_BUGS_TO	_("Report bugs to %s\n"), "bug-gnu-utils@gnu.org"
+#endif
diff --git a/ld/ChangeLog b/ld/ChangeLog
index b1e37f6f56..729a3e91a5 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-03  Alan Modra  <alan@linuxcare.com.au>
+
+	* ld.h: #include "bin-bugs.h"
+	* lexsup.c (help): Use REPORT_BUGS_TO.
+
 2000-03-27  Denis Chertykov  <denisc@overta.ru>
 
 	* configure.tgt (avr-*-*): New target support.
diff --git a/ld/ld.h b/ld/ld.h
index 3c53b98a54..2c7e55dbe2 100644
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -45,6 +45,8 @@
 # define N_(String) (String)
 #endif
 
+#include "bin-bugs.h"
+
 /* Look in this environment name for the linker to pretend to be */
 #define EMULATION_ENVIRON "LDEMULATION"
 /* If in there look for the strings: */
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 06a65e13bd..64c9be1389 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1162,6 +1162,6 @@ help ()
   printf (_("%s: emulation specific options:\n"), program_name);
   ldemul_list_emulation_options (stdout);
   printf ("\n");
-  
-  printf (_("\nReport bugs to bug-gnu-utils@gnu.org\n"));
+
+  printf (REPORT_BUGS_TO);
 }