From 7a9018d083e27eda44fc10055bd367b3fd1e90e7 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Sun, 28 Jun 2020 10:24:12 -0400
Subject: [PATCH 1/2] os.arch for arm32 is 'arm'

Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
 src/org/openj9/envInfo/JavaInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/openj9/envInfo/JavaInfo.java b/src/org/openj9/envInfo/JavaInfo.java
index e465a17e..fe0dd617 100644
--- a/src/org/openj9/envInfo/JavaInfo.java
+++ b/src/org/openj9/envInfo/JavaInfo.java
@@ -54,7 +54,7 @@ public String getSPEC() {
             spec += "_ppc";
         } else if (osArch.contains("s390x")) {
             spec += "_390";
-        } else if (osArch.contains("aarch")) {
+        } else if (osArch.contains("aarch") || (osArch.contains("arm")) {
             spec += "_arm";
         } else if (osArch.contains("sparcv9")) {
             spec += "_sparcv9";

From 8e4b936b37396a31a4003ecf3fb2db2f69680ff1 Mon Sep 17 00:00:00 2001
From: Shelley Lambert <slambert@gmail.com>
Date: Tue, 7 Jul 2020 09:09:13 -0400
Subject: [PATCH 2/2] Unneeded brace

Signed-off-by: Shelley Lambert <slambert@gmail.com>
---
 src/org/openj9/envInfo/JavaInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/openj9/envInfo/JavaInfo.java b/src/org/openj9/envInfo/JavaInfo.java
index fe0dd617..0310d227 100644
--- a/src/org/openj9/envInfo/JavaInfo.java
+++ b/src/org/openj9/envInfo/JavaInfo.java
@@ -54,7 +54,7 @@ public String getSPEC() {
             spec += "_ppc";
         } else if (osArch.contains("s390x")) {
             spec += "_390";
-        } else if (osArch.contains("aarch") || (osArch.contains("arm")) {
+        } else if (osArch.contains("aarch") || osArch.contains("arm")) {
             spec += "_arm";
         } else if (osArch.contains("sparcv9")) {
             spec += "_sparcv9";