changeset 2619:e342c6b2cbc0

Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM. 2013-01-16 Andrew John Hughes <gnu_andrew@member.fsf.org> * 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 Thu, 17 Jan 2013 00:39:24 +0000
parents 2718234602c7
children a506120a631e
files ChangeLog acinclude.m4
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 17 00:37:19 2013 +0000
+++ b/ChangeLog	Thu Jan 17 00:39:24 2013 +0000
@@ -1,3 +1,14 @@
+2013-01-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* 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.
+
 2013-01-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* patches/hotspot/zero/6924259-string_offset.patch:
--- a/acinclude.m4	Thu Jan 17 00:37:19 2013 +0000
+++ b/acinclude.m4	Thu Jan 17 00:39:24 2013 +0000
@@ -653,6 +653,8 @@
 AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD],
 [
   AC_REQUIRE([IT_SET_ARCH_SETTINGS])
+  AC_REQUIRE([IT_ENABLE_CACAO])
+  AC_REQUIRE([IT_ENABLE_JAMVM])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no
   AC_ARG_ENABLE([zero],