From 96f722cf63ae0e115612d816aa339d38074d3ade Mon Sep 17 00:00:00 2001
From: Monica Beckwith <mbeckwit@openjdk.org>
Date: Tue, 22 Sep 2020 07:09:48 +0000
Subject: [PATCH] 8252114: Windows-AArch64: Enable and test ZGC and
 ShenandoahGC

Reviewed-by: shade, stefank, rkennke
---
 make/autoconf/jvm-features.m4 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/make/autoconf/jvm-features.m4 b/make/autoconf/jvm-features.m4
index 8ec76f669f7..5118ef0f1f0 100644
--- 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