# HG changeset patch # User "Yann E. MORIN" # Date 1210786758 0 # Node ID 075fe8e4cd189ad7e9385032771d934504dd5b17 # Parent f31cc6a004724a777a16923155f7742711d5830a Fix building uClibc-based, soft-float toolchains by correctly setting float support in the uClibc config file. Correctly unset float CFLAGS and configure arguments before setting them. /trunk/scripts/build/libc_uClibc.sh | 4 2 2 0 ++-- /trunk/scripts/functions | 4 2 2 0 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -r f31cc6a00472 -r 075fe8e4cd18 scripts/build/libc_uClibc.sh --- a/scripts/build/libc_uClibc.sh Sun May 11 12:53:37 2008 +0000 +++ b/scripts/build/libc_uClibc.sh Wed May 14 17:39:18 2008 +0000 @@ -201,12 +201,12 @@ # way to select between hard/soft float has changed case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in y,) cat >>"${munge_file}" <<-ENDSED -s/[^_]*(HAS_FPU).*/\\1=y/ +s/^[^_]*(HAS_FPU).*/\\1=y/ s/.*(UCLIBC_HAS_FPU).*/\\1=y/ ENDSED ;; ,y) cat >>"${munge_file}" <<-ENDSED -s/[^_]*(HAS_FPU).*/\\# \\1 is not set/ +s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/ s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/ ENDSED ;; diff -r f31cc6a00472 -r 075fe8e4cd18 scripts/functions --- a/scripts/functions Sun May 11 12:53:37 2008 +0000 +++ b/scripts/functions Wed May 14 17:39:18 2008 +0000 @@ -517,8 +517,8 @@ CT_KERNEL_ARCH="${CT_ARCH}" # Set the default values for ARCH, ABI, CPU, TUNE, FPU and FLOAT - unset CT_ARCH_ARCH_CFLAG CT_ARCH_ABI_CFLAG CT_ARCH_CPU_CFLAG CT_ARCH_TUNE_CFLAG CT_ARCH_FPU_CFLAG - unset CT_ARCH_WITH_ARCH CT_ARCH_WITH_ABI CT_ARCH_WITH_CPU CT_ARCH_WITH_TUNE CT_ARCH_WITH_FPU + unset CT_ARCH_ARCH_CFLAG CT_ARCH_ABI_CFLAG CT_ARCH_CPU_CFLAG CT_ARCH_TUNE_CFLAG CT_ARCH_FPU_CFLAG CT_ARCH_FLOAT_CFLAG + unset CT_ARCH_WITH_ARCH CT_ARCH_WITH_ABI CT_ARCH_WITH_CPU CT_ARCH_WITH_TUNE CT_ARCH_WITH_FPU CT_ARCH_WITH_FLOAT [ "${CT_ARCH_ARCH}" ] && { CT_ARCH_ARCH_CFLAG="-march=${CT_ARCH_ARCH}"; CT_ARCH_WITH_ARCH="--with-arch=${CT_ARCH_ARCH}"; } [ "${CT_ARCH_ABI}" ] && { CT_ARCH_ABI_CFLAG="-mabi=${CT_ARCH_ABI}"; CT_ARCH_WITH_ABI="--with-abi=${CT_ARCH_ABI}"; } [ "${CT_ARCH_CPU}" ] && { CT_ARCH_CPU_CFLAG="-mcpu=${CT_ARCH_CPU}"; CT_ARCH_WITH_CPU="--with-cpu=${CT_ARCH_CPU}"; }