re PR fortran/67059 (gfortran --version output is inconsistent with the rest of GCC)

	PR fortran/67059
	* gfortranspec.c (lang_specific_driver): Adjust --version output.

From-SVN: r226734

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bc2a28b030abf687b6553b51b29e7dd3b4a83c58..d1ead45836afe294b97a2c188b3ff6b93e9852c2 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-08  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+       PR fortran/67059
+       * gfortranspec.c (lang_specific_driver): Adjust --version output.
+
 2015-08-08  Bud Davis  <jmdavis@link.com>
            Mikael Morin  <mikael@gcc.gnu.org>
 

diff --git a/gcc/fortran/gfortranspec.c b/gcc/fortran/gfortranspec.c
index 8af4c768035c5e7dc3b6ede846576723eed10aa7..fe594dba117432f35929b7c352ccf3658958e882 100644 (file)
--- a/gcc/fortran/gfortranspec.c
+++ b/gcc/fortran/gfortranspec.c
@@ -276,12 +276,11 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options,
 
        case OPT__version:
          printf ("GNU Fortran %s%s\n", pkgversion_string, version_string);
-         printf ("Copyright %s 2015 Free Software Foundation, Inc.\n\n",
+         printf ("Copyright %s 2015 Free Software Foundation, Inc.\n",
                  _("(C)"));
-         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\n"));
+         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);
          break;