make/autoconf/flags.m4
changeset 52735 7b9f61b7fd94
parent 52351 0ecb4e520110
child 52736 99c48295ec8e
equal deleted inserted replaced
52734:d537553ed639 52735:7b9f61b7fd94
    47     AC_MSG_RESULT([$OPENJDK_TARGET_ABI_PROFILE])
    47     AC_MSG_RESULT([$OPENJDK_TARGET_ABI_PROFILE])
    48 
    48 
    49     if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-sflt; then
    49     if test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-sflt; then
    50       ARM_FLOAT_TYPE=vfp-sflt
    50       ARM_FLOAT_TYPE=vfp-sflt
    51       ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb'
    51       ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb'
       
    52       ARM_ARCH_TYPE_ASFLAGS='-march=armv7-a -mthumb'
    52     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-hflt; then
    53     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-vfp-hflt; then
    53       ARM_FLOAT_TYPE=vfp-hflt
    54       ARM_FLOAT_TYPE=vfp-hflt
    54       ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb'
    55       ARM_ARCH_TYPE_FLAGS='-march=armv7-a -mthumb'
       
    56       ARM_ARCH_TYPE_ASFLAGS='-march=armv7-a -mthumb'
    55     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
    57     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm-sflt; then
    56       ARM_FLOAT_TYPE=sflt
    58       ARM_FLOAT_TYPE=sflt
    57       ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
    59       ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
       
    60       ARM_ARCH_TYPE_ASFLAGS='-march=armv5t'
    58     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
    61     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv5-vfp-sflt; then
    59       ARM_FLOAT_TYPE=vfp-sflt
    62       ARM_FLOAT_TYPE=vfp-sflt
    60       ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
    63       ARM_ARCH_TYPE_FLAGS='-march=armv5t -marm'
       
    64       ARM_ARCH_TYPE_ASFLAGS='-march=armv5t'
    61     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then
    65     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarmv6-vfp-hflt; then
    62       ARM_FLOAT_TYPE=vfp-hflt
    66       ARM_FLOAT_TYPE=vfp-hflt
    63       ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm'
    67       ARM_ARCH_TYPE_FLAGS='-march=armv6 -marm'
       
    68       ARM_ARCH_TYPE_ASFLAGS='-march=armv6'
    64     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xaarch64; then
    69     elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xaarch64; then
    65       # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
    70       # No special flags, just need to trigger setting JDK_ARCH_ABI_PROP_NAME
    66       ARM_FLOAT_TYPE=
    71       ARM_FLOAT_TYPE=
    67       ARM_ARCH_TYPE_FLAGS=
    72       ARM_ARCH_TYPE_FLAGS=
       
    73       ARM_ARCH_TYPE_ASFLAGS=
    68     else
    74     else
    69       AC_MSG_ERROR([Invalid ABI profile: "$OPENJDK_TARGET_ABI_PROFILE"])
    75       AC_MSG_ERROR([Invalid ABI profile: "$OPENJDK_TARGET_ABI_PROFILE"])
    70     fi
    76     fi
    71 
    77 
    72     if test "x$ARM_FLOAT_TYPE" = xvfp-sflt; then
    78     if test "x$ARM_FLOAT_TYPE" = xvfp-sflt; then
    73       ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt'
    79       ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=softfp -mfpu=vfp -DFLOAT_ARCH=-vfp-sflt'
       
    80       ARM_FLOAT_TYPE_ASFLAGS="-mfloat-abi=softfp -mfpu=vfp"
    74     elif test "x$ARM_FLOAT_TYPE" = xvfp-hflt; then
    81     elif test "x$ARM_FLOAT_TYPE" = xvfp-hflt; then
    75       ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=hard -mfpu=vfp -DFLOAT_ARCH=-vfp-hflt'
    82       ARM_FLOAT_TYPE_FLAGS='-mfloat-abi=hard -mfpu=vfp -DFLOAT_ARCH=-vfp-hflt'
       
    83       ARM_FLOAT_TYPE_ASFLAGS="-mfloat-abi=hard -mfpu=vfp"
    76     elif test "x$ARM_FLOAT_TYPE" = xsflt; then
    84     elif test "x$ARM_FLOAT_TYPE" = xsflt; then
    77       ARM_FLOAT_TYPE_FLAGS='-msoft-float -mfpu=vfp'
    85       ARM_FLOAT_TYPE_FLAGS='-msoft-float -mfpu=vfp'
       
    86       ARM_FLOAT_TYPE_ASFLAGS="-mfloat-abi=soft -mfpu=vfp"
    78     fi
    87     fi
    79     AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags])
    88     AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags])
    80     AC_MSG_RESULT([$ARM_FLOAT_TYPE_FLAGS])
    89     AC_MSG_RESULT([$ARM_FLOAT_TYPE_FLAGS])
       
    90     AC_MSG_CHECKING([for $ARM_FLOAT_TYPE floating point flags for assembler])
       
    91     AC_MSG_RESULT([$ARM_FLOAT_TYPE_ASFLAGS])
    81 
    92 
    82     AC_MSG_CHECKING([for arch type flags])
    93     AC_MSG_CHECKING([for arch type flags])
    83     AC_MSG_RESULT([$ARM_ARCH_TYPE_FLAGS])
    94     AC_MSG_RESULT([$ARM_ARCH_TYPE_FLAGS])
       
    95     AC_MSG_CHECKING([for arch type flags for assembler])
       
    96     AC_MSG_RESULT([$ARM_ARCH_TYPE_ASFLAGS])
    84 
    97 
    85     # Now set JDK_ARCH_ABI_PROP_NAME. This is equivalent to the last part of the
    98     # Now set JDK_ARCH_ABI_PROP_NAME. This is equivalent to the last part of the
    86     # autoconf target triplet.
    99     # autoconf target triplet.
    87     [ JDK_ARCH_ABI_PROP_NAME=`$ECHO $OPENJDK_TARGET_AUTOCONF_NAME | $SED -e 's/.*-\([^-]*\)$/\1/'` ]
   100     [ JDK_ARCH_ABI_PROP_NAME=`$ECHO $OPENJDK_TARGET_AUTOCONF_NAME | $SED -e 's/.*-\([^-]*\)$/\1/'` ]
    88     # Sanity check that it is a known ABI.
   101     # Sanity check that it is a known ABI.