|
| 1 | +diff -r a08cbfc0e4ec common/autoconf/flags.m4 |
| 2 | +--- a/common/autoconf/flags.m4 Thu Aug 03 18:56:56 2017 +0000 |
| 3 | ++++ b/common/autoconf/flags.m4 Wed Dec 27 00:52:44 2017 +0100 |
| 4 | +@@ -30,7 +30,7 @@ |
| 5 | + AC_DEFUN([FLAGS_SETUP_ABI_PROFILE], |
| 6 | + [ |
| 7 | + AC_ARG_WITH(abi-profile, [AS_HELP_STRING([--with-abi-profile], |
| 8 | +- [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt, armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])]) |
| 9 | ++ [specify ABI profile for ARM builds (arm-vfp-sflt,arm-vfp-hflt,arm-sflt,arm-ev3,armv5-vfp-sflt,armv6-vfp-hflt,arm64,aarch64) @<:@toolchain dependent@:>@ ])]) |
| 10 | + |
| 11 | + if test "x$with_abi_profile" != x; then |
| 12 | + if test "x$OPENJDK_TARGET_CPU" != xarm && \ |
| 13 | +@@ -51,6 +51,9 @@ |
| 14 | + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then |
| 15 | + ARM_FLOAT_TYPE=sflt |
| 16 | + ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' |
| 17 | ++ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then |
| 18 | ++ ARM_FLOAT_TYPE=sflt |
| 19 | ++ ARM_ARCH_TYPE_FLAGS='-mcpu=arm926ej-s -marm' |
| 20 | + elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then |
| 21 | + ARM_FLOAT_TYPE=vfp-sflt |
| 22 | + ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' |
| 23 | +@@ -1305,6 +1308,8 @@ |
| 24 | + if test "x$OPENJDK_$1_OS" = xlinux; then |
| 25 | + if test "x$OPENJDK_$1_CPU" = xx86; then |
| 26 | + $2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -march=i586" |
| 27 | ++ elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-ev3; then |
| 28 | ++ $2JVM_ASFLAGS="-mcpu=arm926ej-s" |
| 29 | + fi |
| 30 | + elif test "x$OPENJDK_$1_OS" = xmacosx; then |
| 31 | + $2JVM_ASFLAGS="[$]$2JVM_ASFLAGS -x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16" |
0 commit comments