--- old/make/autoconf/hotspot.m4	2019-09-26 16:21:58.761393665 +0200
+++ new/make/autoconf/hotspot.m4	2019-09-26 16:21:58.545389958 +0200
@@ -355,7 +355,7 @@
   # Only enable ZGC on supported platforms
   # Temp diasable for Valhalla, working in Access API
   AC_MSG_CHECKING([if zgc can be built])
-  if $VALHALLA_TEMP && ((test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64") || \
+  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
     AC_MSG_RESULT([yes])
   else