diff options
| -rw-r--r-- | config/target.in | 5 | ||||
| -rw-r--r-- | scripts/build/libc/glibc-eglibc.sh-common | 6 | ||||
| -rw-r--r-- | scripts/functions | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/config/target.in b/config/target.in index 8282a9d4..d38e4c19 100644 --- a/config/target.in +++ b/config/target.in @@ -296,6 +296,11 @@ config TARGET_LDFLAGS Leave blank if you don't know better. +config ARCH_FLOAT + string + default "hard" if ARCH_FLOAT_HW + default "soft" if ARCH_FLOAT_SW + source "config.gen/arch.in.2" endmenu diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index 2af3a9a7..d306fd06 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -132,9 +132,9 @@ do_libc_backend() { *) extra_config+=("--disable-shared");; esac - case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in - y,) extra_config+=("--with-fp");; - ,y) extra_config+=("--without-fp");; + case "${CT_ARCH_FLOAT}" in + hard) extra_config+=("--with-fp");; + soft) extra_config+=("--without-fp");; esac if [ "${CT_LIBC_DISABLE_VERSIONING}" = "y" ]; then diff --git a/scripts/functions b/scripts/functions index 789b6221..69becf81 100644 --- a/scripts/functions +++ b/scripts/functions @@ -983,7 +983,13 @@ CT_DoBuildTargetTuple() { [ "${CT_ARCH_CPU}" ] && { CT_ARCH_CPU_CFLAG="-mcpu=${CT_ARCH_CPU}"; CT_ARCH_WITH_CPU="--with-cpu=${CT_ARCH_CPU}"; } [ "${CT_ARCH_TUNE}" ] && { CT_ARCH_TUNE_CFLAG="-mtune=${CT_ARCH_TUNE}"; CT_ARCH_WITH_TUNE="--with-tune=${CT_ARCH_TUNE}"; } [ "${CT_ARCH_FPU}" ] && { CT_ARCH_FPU_CFLAG="-mfpu=${CT_ARCH_FPU}"; CT_ARCH_WITH_FPU="--with-fpu=${CT_ARCH_FPU}"; } - [ "${CT_ARCH_FLOAT_SW}" ] && { CT_ARCH_FLOAT_CFLAG="-msoft-float"; CT_ARCH_WITH_FLOAT="--with-float=soft"; } + + case "${CT_ARCH_FLOAT}" in + soft) + CT_ARCH_FLOAT_CFLAG="-msoft-float" + CT_ARCH_WITH_FLOAT="--with-float=soft" + ;; + esac # Build the default kernel tuple part CT_TARGET_KERNEL="${CT_KERNEL}" |