changeset 57037:665a49692ce0 lworld

[lworld] Temp disable read barrier GCs
author dsimms
date Thu, 12 Sep 2019 11:27:21 +0200
parents a3238d454e63
children d1a51f42ce36
files make/autoconf/hotspot.m4
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/autoconf/hotspot.m4	Mon Sep 09 14:59:26 2019 +0200
+++ b/make/autoconf/hotspot.m4	Thu Sep 12 11:27:21 2019 +0200
@@ -34,6 +34,9 @@
 # All valid JVM variants
 VALID_JVM_VARIANTS="server client minimal core zero custom"
 
+# Valhalla temporarily disabled
+VALHALLA_TEMP=false
+
 ###############################################################################
 # Check if the specified JVM variant should be built. To be used in shell if
 # constructs, like this:
@@ -341,7 +344,8 @@
 
   # Only enable Shenandoah on supported arches
   AC_MSG_CHECKING([if shenandoah can be built])
-  if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
+  # Temp diasable for Valhalla, working in Access API
+  if $VALHALLA_TEMP && (test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64"); then
     AC_MSG_RESULT([yes])
   else
     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
@@ -349,9 +353,10 @@
   fi
 
   # Only enable ZGC on supported platforms
+  # Temp diasable for Valhalla, working in Access API
   AC_MSG_CHECKING([if zgc can be built])
-  if (test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64") || \
-     (test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"); then
+  if $VALHALLA_TEMP && ((test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64") || \
+     (test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64")); then
     AC_MSG_RESULT([yes])
   else
     DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES zgc"