Mercurial > hg > icedtea14

changeset 2570:a0886ab83260

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM 2015-06-08 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM * NEWS: Updated. 2013-01-16 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM * acinclude.m4: (IT_ENABLE_ZERO_BUILD): Depend on IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that ENABLE_CACAO and ENABLE_JAMVM are set. This makes the tests work correctly again and means that Zero is turned on automatically where there is no CACAO or JamVM and the architecture is not supported by a HotSpot JIT.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 08 Jun 2015 06:07:58 +0100
parents 8c21507c2875
children 7cb23ee6d362
files ChangeLog NEWS acinclude.m4
diffstat 3 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 08 05:58:21 2015 +0100
+++ b/ChangeLog	Mon Jun 08 06:07:58 2015 +0100
@@ -1,3 +1,22 @@
+2015-06-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2407: Fix automatic enabling of the Zero build
+	on non-JIT architectures which don't use CACAO or JamVM
+	* NEWS: Updated.
+
+2013-01-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2407: Fix automatic enabling of the Zero build
+	on non-JIT architectures which don't use CACAO or JamVM
+	* acinclude.m4:
+	(IT_ENABLE_ZERO_BUILD): Depend on
+	IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that
+	ENABLE_CACAO and ENABLE_JAMVM are set.  This
+	makes the tests work correctly again and means
+	that Zero is turned on automatically where there
+	is no CACAO or JamVM and the architecture is not
+	supported by a HotSpot JIT.
+
 2014-06-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2339: Fail early if there is no native HotSpot JIT
--- a/NEWS	Mon Jun 08 05:58:21 2015 +0100
+++ b/NEWS	Mon Jun 08 06:07:58 2015 +0100
@@ -75,6 +75,7 @@
   - PR2369: SunEC provider is partially installed
   - PR2377: PaX mark the installed JDK so it runs on hardened systems
   - PR2383: Location of docs directory in install-data-local is incorrect
+  - PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck
--- a/acinclude.m4	Mon Jun 08 05:58:21 2015 +0100
+++ b/acinclude.m4	Mon Jun 08 06:07:58 2015 +0100
@@ -612,6 +612,8 @@
 AC_DEFUN([IT_ENABLE_ZERO_BUILD],
 [
   AC_REQUIRE([IT_SET_ARCH_SETTINGS])
+  AC_REQUIRE([IT_ENABLE_CACAO])
+  AC_REQUIRE([IT_ENABLE_JAMVM])
   AC_REQUIRE([IT_HAS_NATIVE_HOTSPOT_PORT])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no