Commit 2ce47839 authored by Martin Storsjo's avatar Martin Storsjo
Browse files

configure: arm: Check __ARM_PCS_VFP if the float ABI hasn't been defined

The support for detecting hardfp toolchains in af9dd50e is a
step in the right direction, but that particular switch case
isn't executed at all if the toolchain variable is set.

This fixes cross building from x86 ubuntu to armhf ubuntu,
in configurations such as
"CROSS=arm-linux-gnueabihf- ./configure --target=armv7-linux-gcc".

Change-Id: I6f141361e40374fbab564f9196d90e598fe9a0f6
Showing with 7 additions and 1 deletion
...@@ -793,7 +793,13 @@ process_common_toolchain() { ...@@ -793,7 +793,13 @@ process_common_toolchain() {
check_add_asflags --defsym ARCHITECTURE=${arch_int} check_add_asflags --defsym ARCHITECTURE=${arch_int}
tune_cflags="-mtune=" tune_cflags="-mtune="
if [ ${tgt_isa} == "armv7" ]; then if [ ${tgt_isa} == "armv7" ]; then
[ -z "${float_abi}" ] && float_abi=softfp if [ -z "${float_abi}" ]; then
check_cpp <<EOF && float_abi=hard || float_abi=softfp
#ifndef __ARM_PCS_VFP
#error "not hardfp"
#endif
EOF
fi
check_add_cflags -march=armv7-a -mfloat-abi=${float_abi} check_add_cflags -march=armv7-a -mfloat-abi=${float_abi}
check_add_asflags -march=armv7-a -mfloat-abi=${float_abi} check_add_asflags -march=armv7-a -mfloat-abi=${float_abi}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment