gcc/

	* gcc.c (process_command): Allow translation of the copyright
	symbol but not the rest of the copyright message.
	* gcov.c (print_version): Likewise.  Allow translation of the
	message about warranty.

gcc/f/
	* Make-lang.in (g77spec.o): Depend on intl.h.
	* g77spec.c: Include intl.h.
	(lang_specific_driver): Allow translation of the copyright
	symbol but not the rest of the copyright message.  Allow
	translation of the message about warranty.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78152 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cdefdba..205f9d9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * gcc.c (process_command): Allow translation of the copyright
+       symbol but not the rest of the copyright message.
+       * gcov.c (print_version): Likewise.  Allow translation of the
+       message about warranty.
+
 2004-02-20  Hans-Peter Nilsson  <hp@axis.com>
 
        * config/cris/cris.md ("*andsi_movu"): Correct parentheses in

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 0dd169a..10a93ac 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-20  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * Make-lang.in (g77spec.o): Depend on intl.h.
+       * g77spec.c: Include intl.h.
+       (lang_specific_driver): Allow translation of the copyright
+       symbol but not the rest of the copyright message.  Allow
+       translation of the message about warranty.
+
 2004-02-19  Matt Kraai  <kraai@alumni.cmu.edu>
 
        * Make-lang.in (f/stamp-1t, f/stamp-2t, f/stamp-fo)

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 5131a57..04e46c7 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -64,7 +64,7 @@ F77 f77: f771$(exeext)
   f77.stageprofile f77.stagefeedback
 
 g77spec.o: $(srcdir)/f/g77spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \
-       $(CONFIG_H)
+       $(CONFIG_H) intl.h
        (SHLIB_LINK='$(SHLIB_LINK)' \
        SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \

diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index b540499..3dca7bc 100644 (file)
--- a/gcc/f/g77spec.c
+++ b/gcc/f/g77spec.c
@@ -1,5 +1,5 @@
 /* Specific flags and argument handling of the Fortran front-end.
-   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -50,6 +50,7 @@ Boston, MA 02111-1307, USA.  */
 #include "coretypes.h"
 #include "tm.h"
 #include "gcc.h"
+#include "intl.h"
 
 #ifndef MATH_LIBRARY
 #define MATH_LIBRARY "-lm"
@@ -345,16 +346,17 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
          break;
 
        case OPTION_version:
-         printf ("\
-GNU Fortran (GCC) %s\n\
-Copyright (C) 2002 Free Software Foundation, Inc.\n\
-\n\
+         printf ("GNU Fortran (GCC) %s\n", version_string);
+         printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+                 _("(C)"));
+         printf ("\n");
+         printf (_("\
 GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute copies of GNU Fortran\n\
 under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING\n\
 or type the command `info -f g77 Copying'.\n\
-", version_string);
+"));
          exit (0);
          break;
 

diff --git a/gcc/gcc.c b/gcc/gcc.c
index ebefeb8..e4cce36 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -3349,8 +3349,8 @@ process_command (int argc, const char *const *argv)
        {
          /* translate_options () has turned --version into -fversion.  */
          printf (_("%s (GCC) %s\n"), programname, version_string);
-         fputs ("Copyright (C) 2004 Free Software Foundation, Inc.\n",
-                stdout);
+         printf ("Copyright %s 2004 Free Software Foundation, Inc.\n",
+                 _("(C)"));
          fputs (_("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"),
                 stdout);

diff --git a/gcc/gcov.c b/gcc/gcov.c
index f95334a..172f9e8 100644 (file)
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -1,7 +1,7 @@
 /* Gcov.c: prepend line execution counts and branch probabilities to a
    source file.
    Copyright (C) 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    Contributed by James E. Wilson of Cygnus Support.
    Mangled by Bob Manson of Cygnus Support.
    Mangled further by Nathan Sidwell <nathan@codesourcery.com>
@@ -420,11 +420,12 @@ static void
 print_version (void)
 {
   fnotice (stdout, "gcov (GCC) %s\n", version_string);
-  fnotice (stdout, "Copyright (C) 2003 Free Software Foundation, Inc.\n");
+  fprintf (stdout, "Copyright %s 2004 Free Software Foundation, Inc.\n",
+          _("(C)"));
   fnotice (stdout,
-          "This is free software; see the source for copying conditions.\n"
-          "There is NO warranty; not even for MERCHANTABILITY or \n"
-          "FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+          _("This is free software; see the source for copying conditions.\n"
+            "There is NO warranty; not even for MERCHANTABILITY or \n"
+            "FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
   exit (SUCCESS_EXIT_CODE);
 }