make/autoconf/flags.m4

@@ -36,12 +36,13 @@
   AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile],
       [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])])
 
   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
     AC_MSG_CHECKING([for ABI profle])
     AC_MSG_RESULT([$OPENJDK_TARGET_ABI_PROFILE])

@@ -63,10 +64,18 @@
       ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm'
     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm64; 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" = 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=
       ARM_ARCH_TYPE_FLAGS=
     else