--- old/make/autoconf/flags.m4	2018-09-25 19:23:23.000000000 +0300
+++ new/make/autoconf/flags.m4	2018-09-25 19:23:22.000000000 +0300
@@ -38,8 +38,9 @@
 
   if test "x$with_abi_profile" != x; then
     if test "x$OPENJDK_TARGET_CPU" != xarm && \
-        test "x$OPENJDK_TARGET_CPU" != xaarch64; then
-      AC_MSG_ERROR([--with-abi-profile only available on arm/aarch64])
+       test "x$OPENJDK_TARGET_CPU" != xaarch64 && \
+       test "x$OPENJDK_TARGET_CPU" != xaarch32 ; then
+      AC_MSG_ERROR([--with-abi-profile only available on arm/aarch64/aarch32])
     fi
 
     OPENJDK_TARGET_ABI_PROFILE=$with_abi_profile
@@ -65,6 +66,14 @@
       # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
       ARM_FLOAT_TYPE=
       ARM_ARCH_TYPE_FLAGS=
+    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xgnueabihf; then
+      # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
+      ARM_FLOAT_TYPE=
+      ARM_ARCH_TYPE_FLAGS=
+    elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xgnueabi; then
+      # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
+      ARM_FLOAT_TYPE=
+      ARM_ARCH_TYPE_FLAGS=
     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xaarch64; then
       # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
       ARM_FLOAT_TYPE=