From cf0e82688b68e29e84fb5f7a9f747491d01ba7bb Mon Sep 17 00:00:00 2001
From: Ed Nevill <enevill@openjdk.org>
Date: Tue, 6 Mar 2018 23:03:50 +0000
Subject: [PATCH] 8199152: Configure broken on arm32

Reviewed-by: ihse
---
 make/autoconf/flags.m4 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index 2811d49cd97..a09d529068f 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -236,7 +236,8 @@ AC_DEFUN_ONCE([FLAGS_PRE_TOOLCHAIN],
   if test "x$TOOLCHAIN_TYPE" = xxlc; then
     MACHINE_FLAG="-q${OPENJDK_TARGET_CPU_BITS}"
   elif test "x$TOOLCHAIN_TYPE" != xmicrosoft; then
-    if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
+    if test "x$OPENJDK_TARGET_CPU" != xaarch64 &&
+        test "x$OPENJDK_TARGET_CPU" != xarm; then
       MACHINE_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
     fi
   fi