diff options
| author | Joseph Myers <jsm28@cam.ac.uk> | 2002-01-08 10:00:27 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2002-01-08 10:00:27 +0000 |
| commit | 3f595aa14ce1e5d7dc853fdb97dfae852849d939 (patch) | |
| tree | 2bef32e66b7ac67a4758606fb3fcb9b477684be4 /gcc | |
| parent | 5bc5a8f9b7f14fdaf530000984a8eb30a0804b32 (diff) | |
| download | gcc-3f595aa14ce1e5d7dc853fdb97dfae852849d939.zip gcc-3f595aa14ce1e5d7dc853fdb97dfae852849d939.tar.gz gcc-3f595aa14ce1e5d7dc853fdb97dfae852849d939.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/f/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/f/g77spec.c | 6 | ||||
| -rw-r--r-- | gcc/gcc.c | 12 |
4 files changed, 26 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 59717af..ed9c48a 100644 --- 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 2ff4d91..c151a1f 100644 --- 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 8c746ed..7ba0756 100644 --- 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\ @@ -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. */ |