Really propagate BR2_SOFT_FLOAT setting to 0.9.28.1

diff --git a/toolchain/uClibc/uClibc-0.9.28.config b/toolchain/uClibc/uClibc-0.9.28.config
index bbd7e88b181f75ac83a096eb28c6142656251968..19629d45e8e71add18a580775cba932fafc38a9a 100644 (file)
--- a/toolchain/uClibc/uClibc-0.9.28.config
+++ b/toolchain/uClibc/uClibc-0.9.28.config
@@ -38,6 +38,7 @@ TARGET_ARCH="none"
 ARCH_HAS_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
+HAS_FPU=y
 DO_C99_MATH=y
 WARNINGS="-Wall"
 KERNEL_SOURCE="/usr/src/linux"

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 7302412f0da695da12ed7cb6f01b9737657faf52..301de78aecf361cb78b45e5d25b21eab3abcd8ea 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -142,7 +142,7 @@ endif
        $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
 ifeq ($(BR2_SOFT_FLOAT),y)
        $(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=n,g' \
-               -e 's,.*[^_]HAS_FPU.*,HAS_FPU=n,g' \
+               -e 's,^[^_]*HAS_FPU.*,HAS_FPU=n,g' \
                -e 's,.*UCLIBC_HAS_FLOATS.*,UCLIBC_HAS_FLOATS=y,g' \
                -e 's,.*DO_C99_MATH.*,DO_C99_MATH=y,g' \
                $(UCLIBC_DIR)/.config