changeset 2555:a5c3681e3d67

PR2349: ?struct jvm_version_info? has no member named ?is_kernel_jvm? 2015-05-13 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2349: ?struct jvm_version_info? has no member named ?is_kernel_jvm? * Makefile.am: (ICEDTEA_PATCHES): Add new CACAO patch. (cacao): Set runtime library argument to 'openjdk8'. * NEWS: Updated. * patches/cacao/pr2349.patch: Add support for 'openjdk8' runtime library argument and don't attempt to set is_kernel_jvm in this mode.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 14 May 2015 02:36:17 +0100
parents 1363365ca66b
children 9f4be0a502ce
files ChangeLog Makefile.am NEWS patches/cacao/pr2349.patch
diffstat 4 files changed, 101 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed May 13 03:29:48 2015 +0100
+++ b/ChangeLog	Thu May 14 02:36:17 2015 +0100
@@ -1,3 +1,18 @@
+2015-05-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2349: ‘struct jvm_version_info’ has
+	no member named ‘is_kernel_jvm’
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new CACAO
+	patch.
+	(cacao): Set runtime library argument
+	to 'openjdk8'.
+	* NEWS: Updated.
+	* patches/cacao/pr2349.patch:
+	Add support for 'openjdk8' runtime library
+	argument and don't attempt to set
+	is_kernel_jvm in this mode.
+
 2015-05-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2350: Update to latest CACAO
--- a/Makefile.am	Wed May 13 03:29:48 2015 +0100
+++ b/Makefile.am	Thu May 14 02:36:17 2015 +0100
@@ -221,7 +221,8 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
-	patches/cacao/pr2032.patch
+	patches/cacao/pr2032.patch \
+	patches/cacao/pr2349.patch
 else
 if USING_CACAO
 ICEDTEA_PATCHES +=
@@ -1902,7 +1903,7 @@
 	  --build=$(build_alias) \
 	  --target=$(target_alias) \
 	  --prefix=$(abs_top_builddir)/cacao/install \
-	  --with-java-runtime-library=openjdk7 \
+	  --with-java-runtime-library=openjdk8 \
 	  --with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
 	  --with-java-runtime-library-classes=$(RUNTIME) \
 	  --with-libatomic-ops=no \
--- a/NEWS	Wed May 13 03:29:48 2015 +0100
+++ b/NEWS	Thu May 14 02:36:17 2015 +0100
@@ -61,6 +61,7 @@
   - PR2257: clean-extract-nashorn rule is never run
   - PR2329: jamvm parallel unpack failures
   - PR2348: Avoid following symlinks for CACAO and JamVM patches
+  - PR2349: ‘struct jvm_version_info’ has no member named ‘is_kernel_jvm’
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2349.patch	Thu May 14 02:36:17 2015 +0100
@@ -0,0 +1,82 @@
+diff -r c182f119eaad m4/disable-test-dependency-checks.m4
+--- cacao/cacao/m4/disable-test-dependency-checks.m4	Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/m4/disable-test-dependency-checks.m4	Wed May 13 19:08:20 2015 +0100
+@@ -35,7 +35,7 @@
+                   cldc1.1 | gnuclasspath)
+                       disable_test_dependency_checks=no
+                       ;;
+-                  openjdk | openjdk7)
++                  openjdk | openjdk7 | openjdk8 )
+                       disable_test_dependency_checks=yes
+                       ;;
+                   *)
+diff -r c182f119eaad m4/java-runtime-library.m4
+--- cacao/cacao/m4/java-runtime-library.m4	Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/m4/java-runtime-library.m4	Wed May 13 18:50:10 2015 +0100
+@@ -26,7 +26,7 @@
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY],[
+ AC_MSG_CHECKING(which Java runtime library to use)
+ AC_ARG_WITH([java-runtime-library],
+-            [AS_HELP_STRING(--with-java-runtime-library=<type>,specifies which type of classpath to use as Java runtime library (cldc1.1,gnuclasspath,openjdk,openjdk7) [[default=gnuclasspath]])],
++            [AS_HELP_STRING(--with-java-runtime-library=<type>,specifies which type of classpath to use as Java runtime library (cldc1.1,gnuclasspath,openjdk,openjdk7,openjdk8) [[default=gnuclasspath]])],
+             [case "${withval}" in
+                 cldc1.1)
+                     WITH_JAVA_RUNTIME_LIBRARY=cldc1.1
+@@ -38,6 +38,15 @@
+                     AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], 1, [use GNU Classpath])
+                     AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
+                     ;;
++                openjdk8)
++                    WITH_JAVA_RUNTIME_LIBRARY=openjdk8
++                    AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], 1, [use OpenJDK's Java SE classes])
++                    AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_7], 1, [use OpenJDK's version 7])
++                    AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8], 1, [use OpenJDK's version 8])
++                    AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
++                    AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_7)
++                    AC_SUBST(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8)
++                    ;;
+                 openjdk7)
+                     WITH_JAVA_RUNTIME_LIBRARY=openjdk7
+                     AC_DEFINE([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], 1, [use OpenJDK's Java SE classes])
+@@ -62,6 +71,7 @@
+ AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xgnuclasspath")
+ AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk" -o x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk7")
+ AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_7], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk7")
++AM_CONDITIONAL([WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8], test x"${WITH_JAVA_RUNTIME_LIBRARY}" = "xopenjdk8")
+ ])
+ 
+ 
+diff -r c182f119eaad src/native/vm/openjdk/jvm.cpp
+--- cacao/cacao/src/native/vm/openjdk/jvm.cpp	Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp	Wed May 13 18:50:10 2015 +0100
+@@ -3733,7 +3733,9 @@
+ 	info->update_version = 0;
+ 	info->special_update_version = 0;
+ 	info->is_attach_supported = 0;
++#ifndef WITH_JAVA_RUNTIME_LIBRARY_OPENJDK_8
+ 	info->is_kernel_jvm = 0;
++#endif
+ }
+ 
+ 
+diff -r c182f119eaad configure.ac
+--- cacao/cacao/configure.ac	Fri Dec 12 22:14:45 2014 +0100
++++ cacao/cacao/configure.ac	Wed May 13 22:09:49 2015 +0100
+@@ -678,7 +678,7 @@
+         AC_CHECK_WITH_HPI_H
+         AC_CHECK_WITH_JMM_H
+         ;;
+-    openjdk7)
++    openjdk7 | openjdk8 )
+         AC_CHECK_WITH_JVM_MD_H
+         AC_CHECK_WITH_JVM_H
+         AC_CHECK_WITH_JMM_H
+@@ -693,7 +693,7 @@
+     cldc1.1 | gnuclasspath)
+         AC_PROG_JAVAC
+         ;;
+-    openjdk | openjdk7)
++    openjdk | openjdk7 | openjdk8 )
+         ;;
+     *)
+         AC_MSG_ERROR(unknown classpath configuration ${WITH_JAVA_RUNTIME_LIBRARY})