OpenJDK / amber / amber
changeset 53772:7b9f61b7fd94
8214466: Append assembler flags on ARM targets
Reviewed-by: erikj, dholmes
Contributed-by: Jakub Vanek <linuxtardis@gmail.com>
| author | dholmes |
|---|---|
| date | Thu, 29 Nov 2018 00:49:27 -0500 |
| parents | d537553ed639 |
| children | 99c48295ec8e |
| files | make/autoconf/flags-other.m4 make/autoconf/flags.m4 |
| diffstat | 2 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/autoconf/flags-other.m4 Wed Nov 28 22:29:35 2018 -0500 +++ b/make/autoconf/flags-other.m4 Thu Nov 29 00:49:27 2018 -0500 @@ -119,6 +119,12 @@ # Misuse EXTRA_CFLAGS to mimic old behavior $2JVM_ASFLAGS="$JVM_BASIC_ASFLAGS ${$2EXTRA_CFLAGS}" + if test "x$1" = "xTARGET" && \ + test "x$TOOLCHAIN_TYPE" = xgcc && \ + test "x$OPENJDK_TARGET_CPU" = xarm; then + $2JVM_ASFLAGS="${$2JVM_ASFLAGS} $ARM_ARCH_TYPE_ASFLAGS $ARM_FLOAT_TYPE_ASFLAGS" + fi + AC_SUBST($2JVM_ASFLAGS) ])
--- a/make/autoconf/flags.m4 Wed Nov 28 22:29:35 2018 -0500 +++ b/make/autoconf/flags.m4 Thu Nov 29 00:49:27 2018 -0500 @@ -49,38 +49,51 @@ if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-sflt; then ARM_FLOAT_TYPE=vfp-sflt ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb' + ARM_ARCH_TYPE_ASFLAGS='-march=armv7-a -mthumb' elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-hflt; then ARM_FLOAT_TYPE=vfp-hflt ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb' + ARM_ARCH_TYPE_ASFLAGS='-march=armv7-a -mthumb' elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then ARM_FLOAT_TYPE=sflt ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' + ARM_ARCH_TYPE_ASFLAGS='-march=armv5t' elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then ARM_FLOAT_TYPE=vfp-sflt ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm' + ARM_ARCH_TYPE_ASFLAGS='-march=armv5t' elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then ARM_FLOAT_TYPE=vfp-hflt ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm' + ARM_ARCH_TYPE_ASFLAGS='-march=armv6' 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= + ARM_ARCH_TYPE_ASFLAGS= else AC_MSG_ERROR([Invalid ABI profile: "$OPENJDK_TARGET_ABI_PROFILE"]) fi if test "x$ARM_FLOAT_TYPE" = xvfp-sflt; then ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt' + ARM_FLOAT_TYPE_ASFLAGS="-mfloat-abi=softfp -mfpu=vfp" elif test "x$ARM_FLOAT_TYPE" = xvfp-hflt; then ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=hard -mfpu=vfp -DFLOAT_ARCH=-vfp-hflt' + ARM_FLOAT_TYPE_ASFLAGS="-mfloat-abi=hard -mfpu=vfp" elif test "x$ARM_FLOAT_TYPE" = xsflt; then ARM_FLOAT_TYPE_FLAGS='-msoft-float -mfpu=vfp' + ARM_FLOAT_TYPE_ASFLAGS="-mfloat-abi=soft -mfpu=vfp" fi AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags]) AC_MSG_RESULT([$ARM_FLOAT_TYPE_FLAGS]) + AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags for assembler]) + AC_MSG_RESULT([$ARM_FLOAT_TYPE_ASFLAGS]) AC_MSG_CHECKING([for arch type flags]) AC_MSG_RESULT([$ARM_ARCH_TYPE_FLAGS]) + AC_MSG_CHECKING([for arch type flags for assembler]) + AC_MSG_RESULT([$ARM_ARCH_TYPE_ASFLAGS]) # Now set JDK_ARCH_ABI_PROP_NAME. This is equivalent to the last part of the # autoconf target triplet.