make/autoconf/hotspot.m4

@@ -303,12 +303,18 @@
 
   fi
 
   # Override hotspot cpu definitions for ARM platforms
   if test "x$OPENJDK_TARGET_CPU" = xarm; then
+    if test "x$HOTSPOT_TARGET_CPU_PORT" = xarm; then
     HOTSPOT_TARGET_CPU=arm_32
     HOTSPOT_TARGET_CPU_DEFINE="ARM32"
+    else
+      HOTSPOT_TARGET_CPU=aarch32
+      HOTSPOT_TARGET_CPU_ARCH=aarch32
+      HOTSPOT_TARGET_CPU_DEFINE="AARCH32"
+    fi
   elif test "x$OPENJDK_TARGET_CPU" = xaarch64 && test "x$HOTSPOT_TARGET_CPU_PORT" = xarm64; then
     HOTSPOT_TARGET_CPU=arm_64
     HOTSPOT_TARGET_CPU_ARCH=arm
   fi
 

@@ -556,27 +562,31 @@
   done
 ])
 
 ################################################################################
 #
-# Specify which sources will be used to build the 64-bit ARM port
+# Specify which sources will be used to build the ARM port
 #
-# --with-cpu-port=arm64   will use hotspot/src/cpu/arm
+# --with-cpu-port=arm     will use hotspot/src/cpu/arm
 # --with-cpu-port=aarch64 will use hotspot/src/cpu/aarch64
+# --with-cpu-port=aarch32 will use hotspot/src/cpu/aarch32
 #
 AC_DEFUN([SETUP_HOTSPOT_TARGET_CPU_PORT],
 [
   AC_ARG_WITH(cpu-port, [AS_HELP_STRING([--with-cpu-port],
-      [specify sources to use for Hotspot 64-bit ARM port (arm64,aarch64) @<:@aarch64@:>@ ])])
+      [specify sources to use for Hotspot ARM port (arm,aarch64,aarch32) @<:@aarch64@:>@ ])])
 
   if test "x$with_cpu_port" != x; then
-    if test "x$OPENJDK_TARGET_CPU" != xaarch64; then
-      AC_MSG_ERROR([--with-cpu-port only available on aarch64])
-    fi
-    if test "x$with_cpu_port" != xarm64 && \
-        test "x$with_cpu_port" != xaarch64; then
-      AC_MSG_ERROR([--with-cpu-port must specify arm64 or aarch64])
+    if test "x$OPENJDK_TARGET_CPU" != xaarch64 && \
+       test "x$OPENJDK_TARGET_CPU" != xaarch32 && \
+       test "x$OPENJDK_TARGET_CPU" != xarm ; then
+      AC_MSG_ERROR([--with-cpu-port only available on arm/aarch64/32])
+    fi
+    if test "x$with_cpu_port" != xarm && \
+        test "x$with_cpu_port" != xaarch64 && \
+        test "x$with_cpu_port" != xaarch32 ; then
+      AC_MSG_ERROR([--with-cpu-port must specify arm, aarch32 or aarch64])
     fi
     HOTSPOT_TARGET_CPU_PORT="$with_cpu_port"
   fi
 ])