natSystem.cc (init_properties): Update VM version properties.

	* java/lang/natSystem.cc (init_properties): Update VM version
	properties.
	* configure.in: Set GCJVERSION.
	* acconfig.h: Add GCJVERSION.
	* configure: Rebuilt.
	* include/config.h.in: Rebuilt.

From-SVN: r50944

libjava/ChangeLog

+2002-03-18  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* java/lang/natSystem.cc (init_properties): Update VM version
+	properties.
+	* configure.in: Set GCJVERSION.
+	* acconfig.h: Add GCJVERSION.
+	* configure: Rebuilt.
+	* include/config.h.in: Rebuilt.
+
 2002-03-17  Anthony Green  <green@redhat.com>
 
 	* java/lang/ieeefp.h: Add ARM thumb support (copied from newlib).

libjava/acconfig.h

@@ -89,6 +89,13 @@
 /* Define if global `timezone' exists.  */
 #undef HAVE_TIMEZONE
 
+/* Define to version of GCJ in use.  */
+#undef GCJVERSION
+
+/* Define if if the synchronization code should try to avoid pthread_self 
+   calls by caching thread IDs in a hashtable.  */
+#undef SLOW_PTHREAD_SELF
+
 /* Define if you have the appropriate function.  */
 #undef HAVE_ACCESS
 #undef HAVE_STAT

libjava/configure.in

@@ -747,6 +747,14 @@ AC_SUBST(GCC_UNWIND_INCLUDE)
 
 AC_SUBST(AM_RUNTESTFLAGS)
 
+# Determine gcj version number.
+changequote(<<,>>)
+gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
+changequote([,])
+GCJVERSION=$gcjversion
+AC_SUBST(GCJVERSION)
+AC_DEFINE_UNQUOTED(GCJVERSION, "$GCJVERSION", [Short GCJ version ID])
+
 dnl Work around a g++ bug.  Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
 AC_MSG_CHECKING([for g++ -ffloat-store bug])
 save_CFLAGS="$CFLAGS"

libjava/include/config.h.in

@@ -117,6 +117,10 @@
 /* Define if global `timezone' exists.  */
 #undef HAVE_TIMEZONE
 
+/* Define if if the synchronization code should try to avoid pthread_self 
+   calls by caching thread IDs in a hashtable.  */
+#undef SLOW_PTHREAD_SELF
+
 /* Define if you have the appropriate function.  */
 #undef HAVE_ACCESS
 #undef HAVE_STAT
@@ -410,6 +414,9 @@
 /* The number of bytes in type void * */
 #undef SIZEOF_VOID_P
 
+/* Short GCJ version ID */
+#undef GCJVERSION
+
 /* Define if <inttypes.h> is available */
 #undef HAVE_INTTYPES_H
 

libjava/java/lang/natSystem.cc

@@ -301,20 +301,30 @@ java::lang::System::init_properties (void)
 
   // A mixture of the Java Product Versioning Specification
   // (introduced in 1.2), and earlier versioning properties.
-  SET ("java.version", VERSION);
+  SET ("java.version", GCJVERSION);
   SET ("java.vendor", "Free Software Foundation, Inc.");
   SET ("java.vendor.url", "http://gcc.gnu.org/java/");
-  SET ("java.class.version", __VERSION__);
-  SET ("java.vm.specification.version", "1.1");
+  SET ("java.class.version", "46.0");
+  SET ("java.vm.specification.version", "1.0");
   SET ("java.vm.specification.name", "Java(tm) Virtual Machine Specification");
   SET ("java.vm.specification.vendor", "Sun Microsystems Inc.");
   SET ("java.vm.version", __VERSION__);
   SET ("java.vm.vendor", "Free Software Foundation, Inc.");
-  SET ("java.vm.name", "libgcj");
-  SET ("java.specification.version", "1.1");
-  SET ("java.specification.name", "Java(tm) Language Specification");
+  SET ("java.vm.name", "GNU libgcj");
+  SET ("java.specification.version", "1.3");
+  SET ("java.specification.name", "Java(tm) Platform API Specification");
   SET ("java.specification.vendor", "Sun Microsystems Inc.");
 
+  char value[100];
+#define NAME "GNU libgcj "
+  strcpy (value, NAME);
+  strncpy (value + sizeof (NAME) - 1, __VERSION__,
+	   sizeof(value) - sizeof(NAME));
+  value[sizeof (value) - 1] = '\0';
+  jstring version = JvNewStringLatin1 (value);
+  newprops->put (JvNewStringLatin1 ("java.fullversion"), version);
+  newprops->put (JvNewStringLatin1 ("java.vm.info"), version);
+
   // This definition is rather arbitrary: we choose $(prefix).  In
   // part we do this because most people specify only --prefix and
   // nothing else when installing gcj.  Plus, people are free to