This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: libgcj version number
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 26 Feb 2002 22:58:22 -0700
- Subject: Patch: FYI: libgcj version number
- Reply-to: tromey at redhat dot com
I'm checking this in on the branch and the trunk.
With this change libgcj now just uses the gcc version number. We
weren't updating our version number, and there's no point in having
our own anyway.
Have we updated the libtool version yet? If not we need to do this on
the 3.1 branch.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* java/lang/natSystem.cc (init_properties): Use __VERSION__.
* gij.cc (version): Use __VERSION__.
* include/config.h.in: Rebuilt.
* acconfig.h (GCJVERSION): Removed.
* configure: Rebuilt.
* configure.in (GCJVERSION): Removed.
Index: acconfig.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/acconfig.h,v
retrieving revision 1.22
diff -u -r1.22 acconfig.h
--- acconfig.h 2002/02/07 03:24:08 1.22
+++ acconfig.h 2002/02/27 05:30:07
@@ -89,9 +89,6 @@
/* Define if global `timezone' exists. */
#undef HAVE_TIMEZONE
-/* Define to version of GCJ in use. */
-#undef GCJVERSION
-
/* Define if you have the appropriate function. */
#undef HAVE_ACCESS
#undef HAVE_STAT
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.114
diff -u -r1.114 configure.in
--- configure.in 2002/02/12 05:52:30 1.114
+++ configure.in 2002/02/27 05:30:08
@@ -743,13 +743,6 @@
AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes)
AC_SUBST(GCC_UNWIND_INCLUDE)
-# Determine gcj version number.
-changequote(<<,>>)
-gcjvers="`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`"
-changequote([,])
-AC_DEFINE_UNQUOTED(GCJVERSION, "$gcjvers")
-AC_SUBST(GCJVERSION)
-
AC_SUBST(AM_RUNTESTFLAGS)
dnl Work around a g++ bug. Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
Index: gij.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gij.cc,v
retrieving revision 1.17
diff -u -r1.17 gij.cc
--- gij.cc 2002/02/22 23:24:35 1.17
+++ gij.cc 2002/02/27 05:30:08
@@ -40,7 +40,7 @@
static void
version ()
{
- printf ("gij (GNU libgcj) version %s\n\n", GCJVERSION);
+ printf ("gij (GNU libgcj) version %s\n\n", __VERSION__);
printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
printf ("This is free software; see the source for copying conditions. There is NO\n");
printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
Index: java/lang/natSystem.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/natSystem.cc,v
retrieving revision 1.48
diff -u -r1.48 natSystem.cc
--- java/lang/natSystem.cc 2002/02/22 23:24:45 1.48
+++ java/lang/natSystem.cc 2002/02/27 05:30:09
@@ -306,11 +306,11 @@
SET ("java.version", VERSION);
SET ("java.vendor", "Free Software Foundation, Inc.");
SET ("java.vendor.url", "http://gcc.gnu.org/java/";);
- SET ("java.class.version", GCJVERSION);
+ SET ("java.class.version", __VERSION__);
SET ("java.vm.specification.version", "1.1");
SET ("java.vm.specification.name", "Java(tm) Virtual Machine Specification");
SET ("java.vm.specification.vendor", "Sun Microsystems Inc.");
- SET ("java.vm.version", GCJVERSION);
+ SET ("java.vm.version", __VERSION__);
SET ("java.vm.vendor", "Free Software Foundation, Inc.");
SET ("java.vm.name", "libgcj");
SET ("java.specification.version", "1.1");