8252114: Windows-AArch64: Enable and test ZGC and ShenandoahGC

Reviewed-by: shade, stefank, rkennke
openjdk · Sep 22, 2020 · 96f722c · 96f722c · bridgekeeper · Sep 22, 2020
1 parent f7b1ce4
commit 96f722c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
@@ -395,8 +395,14 @@ AC_DEFUN_ONCE([JVM_FEATURES_CHECK_ZGC],
         AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
         AVAILABLE=false
       fi
-    elif test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"; then
-      AC_MSG_RESULT([yes])
+    elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+      if test "x$OPENJDK_TARGET_OS" = "xlinux" || \
+          test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
+        AVAILABLE=false
+      fi
     else
       AC_MSG_RESULT([no, $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU])
       AVAILABLE=false