update_version: Do not check in files which are unchanged.

maintainer-scripts:
	* update_version: Do not check in files which are unchanged.
	* gcc_release: Only update the version in gcc/version.c.
gcc:
	* version.c (version_string): Now const char[].
	* version.h: Update to match.
gcc/ada:
	* Make-lang.in (EXTRA_GNATBIND_OBJS): Add version.o.
	* Makefile.in (TOOLS_LIBS): Add ../../version.o.
	* gnatvsn.ads: Gnat_Version_String is now a function.
	* gnatvsn.adb: New file.  When asked for Gnat_Version_String,
	copy the C version_string into a String and return it.
	* gnatcmd.adb, gnatkr.adb, gnatlbr.adb, gnatlink.adb,
	gnatls.adb,gnatmake.adb, gnatprep.adb, gnatpsta.adb:
	Remove pragma Ident (Gnat_Version_String).  If this was the
	sole use of package Gnatvsn, remove the with statement too.
	* gnat1drv.adb: Tweak -gnatv output.
gcc/f:
	* Make-lang.in (g77spec.o): Don't depend on f/version.h.
	(f/parse.o): Depend on version.h not f/version.h.
	(g77version.o, f/version.o): Delete all references.

	* com.c (ffecom_init_0): Fix transposed array indices in bsearch test.
	* g77spec.c: Don't include f/version.h or refer to ffe_version_string.
	* parse.c: Use version_string, not ffe_version_string.
	* version.c, version.h: Delete files.
libf2c:
	* libF77/Version.c: Rename junk to __LIBF77_VERSION__.  Add
	external decls for __LIBI77_VERSION__ and __LIBU77_VERSION__.
	Delete __G77_LIBF77_VERSION__
	(g77__fvers__): Print all three __LIB*77_VERSION__ strings,
	and __VERSION__ if we have it; nothing else.

	* libI77/Version.c: Provide only __LIBI77_VERSION__ (formerly junk).
	* libU77/Version.c: Provide only __LIBU77_VERSION__ (formerly junk).

From-SVN: r57461

4 files changed, 28 insertions, 42 deletions

diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog
index 83aa4da652e..e06717f03bd 100644
--- a/libf2c/ChangeLog
+++ b/libf2c/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-23  Zack Weinberg  <zack@codesourcery.com>
+
+	* libF77/Version.c: Rename junk to __LIBF77_VERSION__.  Add
+	external decls for __LIBI77_VERSION__ and __LIBU77_VERSION__.
+	Delete __G77_LIBF77_VERSION__
+	(g77__fvers__): Print all three __LIB*77_VERSION__ strings,
+	and __VERSION__ if we have it; nothing else.
+
+	* libI77/Version.c: Provide only __LIBI77_VERSION__ (formerly junk).
+	* libU77/Version.c: Provide only __LIBU77_VERSION__ (formerly junk).
+
 Sun Sep 22 23:43:37 2002  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* Makefile.in (all): Fix multilib parallel build.
@@ -199,7 +210,7 @@ Mon May 20 13:03:54 2002  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 2002-05-02  Alexandre Oliva  <aoliva@redhat.com>
 
-        * Makefile.in: Fix for multilibbed natives.
+	* Makefile.in: Fix for multilibbed natives.
 
 2002-04-15  Loren J. Rittle  <ljrittle@acm.org>
 
@@ -353,7 +364,7 @@ Mon May 20 13:03:54 2002  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	of shared libf2c to 0:0:0.
 
 2001-09-29  Juergen Pfeifer  <juergen.pfeifer@gmx.net>
-            Toon Moene  <toon@moene.indiv.nluug.nl>
+	    Toon Moene  <toon@moene.indiv.nluug.nl>
 
 	Make libf2c a shared library.
 
@@ -427,7 +438,7 @@ Wed Jul 18 11:14:33 2001  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	* libI77/Makefile.in: Add necessary dependencies on config.h.
 
 2001-07-06  Toon Moene  <toon@moene.indiv.nluug.nl>
-            Pedro Vazquez  <vazquez@penelope.iqm.unicamp.br>
+	    Pedro Vazquez  <vazquez@penelope.iqm.unicamp.br>
 
 	* libI77/configure.in: Check for fseeko, ftello.
 	* libI77/configure: Rebuilt.
@@ -454,7 +465,7 @@ Wed Jul 18 11:14:33 2001  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	* libI77/fio.h: Include <sys/types.h> for off_t.
 
 2001-07-01  Toon Moene  <toon@moene.indiv.nluug.nl>
-            Pedro Vazquez  <vazquez@penelope.iqm.unicamp.br>
+	    Pedro Vazquez  <vazquez@penelope.iqm.unicamp.br>
 
 	* libI77/fio.h: Use off_t when appropriate.
 	* libI77/backspace.c (f_back): Ditto.
@@ -612,7 +623,7 @@ Wed Jul 18 11:14:33 2001  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 	file atomically.
 
 2000-07-03  Donn Terry  (donnte@microsoft.com)
-        * libU77/aclocal.m4: check for 2 argument gettimeofday without
+	* libU77/aclocal.m4: check for 2 argument gettimeofday without
 	struct timezone
 
 2000-07-02  Toon Moene  <toon@moene.indiv.nluug.nl>
diff --git a/libf2c/libF77/Version.c b/libf2c/libF77/Version.c
index 55b5faa996b..a27b0df7696 100644
--- a/libf2c/libF77/Version.c
+++ b/libf2c/libF77/Version.c
@@ -1,9 +1,6 @@
-static char junk[] = "\n@(#)LIBF77 VERSION 20000929\n";
-
-/*
-*/
-
-char __G77_LIBF77_VERSION__[] = "3.3 20020923 (experimental)";
+const char __LIBF77_VERSION__[] = "@(#) LIBF77 VERSION 20000929\n";
+extern const char __LIBI77_VERSION__[];
+extern const char __LIBU77_VERSION__[];
 
 /*
 2.00	11 June 1980.  File version.c added to library.
@@ -87,6 +84,11 @@ char __G77_LIBF77_VERSION__[] = "3.3 20020923 (experimental)";
 void
 g77__fvers__ ()
 {
-  fprintf (stderr, "__G77_LIBF77_VERSION__: %s", __G77_LIBF77_VERSION__);
-  fputs (junk, stderr);
+  fputs ("GNU Fortran library.\n", stderr);
+#if defined __GNUC__ && defined __VERSION__
+  fprintf (stderr, "Compiled by GCC %s\n", __VERSION__);
+#endif
+  fputs (__LIBF77_VERSION__, stderr);
+  fputs (__LIBI77_VERSION__, stderr);
+  fputs (__LIBU77_VERSION__, stderr);
 }
diff --git a/libf2c/libI77/Version.c b/libf2c/libI77/Version.c
index fe66153ce6d..f6b3d5d8a5e 100644
--- a/libf2c/libI77/Version.c
+++ b/libf2c/libI77/Version.c
@@ -1,9 +1,4 @@
-static char junk[] = "\n@(#) LIBI77 VERSION pjw,dmg-mods 20001205\n";
-
-/*
-*/
-
-char __G77_LIBI77_VERSION__[] = "3.3 20020923 (experimental)";
+const char __LIBI77_VERSION__[] = "@(#) LIBI77 VERSION pjw,dmg-mods 20001205\n";
 
 /*
 2.01	$ format added
@@ -324,17 +319,6 @@ wrtfmt.c:
 /*		treat Tstuff= and Fstuff= as new assignments rather than as */
 /*		logical constants. */
 
-
-
 /* Changes for GNU Fortran (g77) version of libf2c:  */
 
 /* 17 June 1997: detect recursive I/O and call f__fatal explaining it. */
-
-#include <stdio.h>
-
-void
-g77__ivers__ ()
-{
-  fprintf (stderr, "__G77_LIBI77_VERSION__: %s", __G77_LIBI77_VERSION__);
-  fputs (junk, stderr);
-}
diff --git a/libf2c/libU77/Version.c b/libf2c/libU77/Version.c
index d245b6599b0..45b68a6b141 100644
--- a/libf2c/libU77/Version.c
+++ b/libf2c/libU77/Version.c
@@ -1,12 +1 @@
-static char junk[] = "\n@(#) LIBU77 VERSION 19980709\n";
-
-char __G77_LIBU77_VERSION__[] = "3.3 20020923 (experimental)";
-
-#include <stdio.h>
-
-void
-g77__uvers__ ()
-{
-  fprintf (stderr, "__G77_LIBU77_VERSION__: %s", __G77_LIBU77_VERSION__);
-  fputs (junk, stderr);
-}
+const char __LIBU77_VERSION__[] = "@(#) LIBU77 VERSION 19980709\n";