From 300db8fe900597c450cb97d8e790c329a7bc7129 Mon Sep 17 00:00:00 2001
From: Stewart X Addison <sxa555@users.noreply.github.com>
Date: Mon, 16 Mar 2020 11:25:49 +0000
Subject: [PATCH] Re-enable JIT-enabled arm32 builds on nightlies (#1604)

* Adjust AIX RAM limit down to aid JDK14 (#1555)

Signed-off-by: Stewart Addison <sxa@uk.ibm.com>

* Revert "Go back to using non-JIT arm32 JDK8 so we can do a release (#1588)"

This reverts commit 01f365ec6a222dc6c30fe4452f80b1fbc4484ae7.
---
 configureBuild.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configureBuild.sh b/configureBuild.sh
index 4cc5f449d..ceff68752 100755
--- a/configureBuild.sh
+++ b/configureBuild.sh
@@ -169,6 +169,8 @@ setRepository() {
   elif [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_CORRETTO}" ]]
   then
     suffix="corretto/corretto-${BUILD_CONFIG[OPENJDK_CORE_VERSION]:3}"
+  elif [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "armv7l" ]; then
+    suffix="adoptopenjdk/openjdk-aarch32-jdk8u";
   else
     suffix="adoptopenjdk/openjdk-${BUILD_CONFIG[OPENJDK_FOREST_NAME]}";
   fi
@@ -236,7 +238,7 @@ processArgumentsforSpecificArchitectures() {
 
     "armv7l")
       if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] && isHotSpot; then
-        jvm_variant=zero
+        jvm_variant=client
       else
         jvm_variant=server,client
       fi