* acconfig.h (GCJVERSION): New undef.

	* java/lang/natSystem.cc (init_properties): Define java.version,
	java.class.version, os.name, os.arch, os.version.
	Include <sys/utsname.h> if required.
	* configure: Rebuilt.
	* configure.in: Compute and define GCJVERSION.
	* java/lang/natSystem.cc (default_file_encoding): Now static.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26830 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 3 deletions

diff --git a/libjava/configure.in b/libjava/configure.in
index 9be0d874d3c..7877ec1bc78 100644
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -255,6 +255,9 @@ if test -n "${with_cross_host}"; then
    if test "$build" != "$with_cross_host"; then
       CANADIAN=yes
       EH_COMMON_INCLUDE=
+      GCJ="${target_alias}/gcj"
+   else
+      GCJ=
    fi
 else
    # Some POSIX thread systems don't have pthread_mutexattr_settype.
@@ -314,18 +317,35 @@ else
       AC_MSG_ERROR([memcpy is required])
    fi
 
-   test -d "$libgcj_basedir/../gcc/java" || {
+   if test -d "$libgcj_basedir/../gcc/java"; then
+      GCJ=
+   else
       CANADIAN=yes
       NULL_TARGET=yes
-   }
+      GCJ=gcj
+   fi
 fi
 
 AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
 AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
 AM_CONDITIONAL(NATIVE, test "$CANADIAN" = no || test "$NULL_TARGET" = yes)
-
 AC_SUBST(EH_COMMON_INCLUDE)
 
+# Determine gcj version number.
+if test "$GCJ" = ""; then
+   if test -z "${with_multisubdir}"; then
+      builddotdot=.
+   else
+      builddotdot=`echo ${with_multisubdir} | sed -e 's:[^/][^/]*:..:g'`
+   fi
+   dir="`cd ${builddotdot}/../../gcc && pwd`"
+   GCJ="$dir/gcj -B$dir/"
+fi
+changequote(<<,>>)
+gcjvers="`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`"
+changequote([,])
+AC_DEFINE_UNQUOTED(GCJVERSION, "$gcjvers")
+
 AC_SUBST(AM_RUNTESTFLAGS)
 
 dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.