*** old/make/autoconf/flags.m4	Mon Sep 17 10:29:21 2018
--- new/make/autoconf/flags.m4	Mon Sep 17 10:29:20 2018

*** 32,42 ****
--- 32,42 ----
  # Setup ABI profile (for arm)
  #
  AC_DEFUN([FLAGS_SETUP_ABI_PROFILE],
  [
    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])

*** 59,72 ****
--- 59,68 ----
        ARM_FLOAT_TYPE=vfp-sflt
        ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
      elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then
        ARM_FLOAT_TYPE=vfp-hflt
        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" = xaarch64; then
        # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
        ARM_FLOAT_TYPE=
        ARM_ARCH_TYPE_FLAGS=
      else