re PR other/704 (--help and --version)

	* gcc.c (option_map): Remove --version.
	(process_command): Handle -fversion following the GNU Coding
	Standards.  Partially addresses PR other/704.

f:
	* g77spec.c (lookup_option): Handle -fversion.
	(lang_specific_driver): Update copyright date in --version output.

From-SVN: r48631

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59717afadb74778553f2339acae49dfd3422b771..ed9c48a4b255e420cc322058a3dbb97df9f73ff9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-08  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * gcc.c (option_map): Remove --version.
+       (process_command): Handle -fversion following the GNU Coding
+       Standards.  Partially addresses PR other/704.
+
 2002-01-08  Graham Stott  <grahams@redhat.com>
 
        * combine.c (combine_instructions): Fix typo.

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 2ff4d91d12976ac472d3fa6c9252077cf30aa4ac..c151a1f404ac54a16160b3faa33ee6fb4b4ad6e2 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-08  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+       * g77spec.c (lookup_option): Handle -fversion.
+       (lang_specific_driver): Update copyright date in --version output.
+
 Mon Jan  7 00:03:42 2002  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
 
        * invoke.texi: Markup g77 as @command.  Remove reference to

diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c
index 8c746ed12f576eb5d70a3baea5821ea0a3b51053..7ba075675e9c820f749f01d38baa96ee2614af20 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 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -194,6 +194,8 @@ lookup_option (xopt, xskip, xarg, text)
        opt = OPTION_syntax_only;
       else if (! strcmp (text, "-dumpversion"))
        opt = OPTION_version;
+      else if (! strcmp (text, "-fversion"))  /* Really --version!! */
+       opt = OPTION_version;
       else if (! strcmp (text, "-Xlinker")
               || ! strcmp (text, "-specs"))
        skip = 1;
@@ -373,7 +375,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries)
        case OPTION_version:
          printf ("\
 GNU Fortran %s (Fortran Frontend version %s)\n\
-Copyright (C) 2001 Free Software Foundation, Inc.\n\
+Copyright (C) 2002 Free Software Foundation, Inc.\n\
 \n\
 GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\
 You may redistribute copies of GNU Fortran\n\

diff --git a/gcc/gcc.c b/gcc/gcc.c
index bb2b0c42a8e9e35872eee893010e264a492b6828..d5472d33ddf307be2622560ad83fc121baa074a3 100644 (file)
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -982,7 +982,6 @@ static const struct option_map option_map[] =
    {"--use-version", "-V", "a"},
    {"--user-dependencies", "-MM", 0},
    {"--verbose", "-v", 0},
-   {"--version", "-dumpversion", 0},
    {"--warn-", "-W", "*j"},
    {"--write-dependencies", "-MD", 0},
    {"--write-user-dependencies", "-MMD", 0},
@@ -3350,6 +3349,17 @@ process_command (argc, argv)
          printf ("%s\n", spec_machine);
          exit (0);
        }
+      else if (strcmp (argv[i], "-fversion") == 0)
+       {
+         /* translate_options () has turned --version into -fversion.  */
+         printf (_("%s (GCC) %s\n"), programname, version_string);
+         fputs (_("Copyright (C) 2002 Free Software Foundation, Inc.\n"),
+                stdout);
+         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);
+         exit (0);
+       }
       else if (strcmp (argv[i], "-fhelp") == 0)
        {
          /* translate_options () has turned --help into -fhelp.  */