From fd1e0dc09e646ff1a127687263f8908c8153c623 Mon Sep 17 00:00:00 2001
From: Reka Kovacs <rekakovacs@microsoft.com>
Date: Mon, 30 Aug 2021 14:39:14 +0200
Subject: [PATCH] Backport 96f722cf63ae0e115612d816aa339d38074d3ade

---
 make/autoconf/hotspot.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 858a806d477..a4c700e2c34 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -355,7 +355,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   # Only enable Shenandoah on supported arches, and only if requested
   AC_MSG_CHECKING([if shenandoah can be built])
   if HOTSPOT_CHECK_JVM_FEATURE(shenandoahgc); then
-    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64" ; then
+    if 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"