From bc94e564de09b519fcd843f0d8949159453b3eec Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 14 Nov 2011 18:54:37 +0100
Subject: libc/uClibc: use the floating-point string option in tests

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 5687eb8..8ba4a68 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -10,6 +10,11 @@
 ## help Highly configurable, thus as feature-rich as you
 ## help need, without compromising for size.
 
+if ARCH_FLOAT_SOFTFP
+comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG"
+comment "You may experience issues, although it should work just fine"
+endif # ARCH_FLOAT_SOFTFP
+
 choice
     bool
     prompt "uClibc version"
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index 87de620..795c04f 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -352,13 +352,15 @@ mungeuClibcConfig() {
 
     # Accomodate for old and new uClibc version, where the
     # way to select between hard/soft float has changed
-    case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in
-        y,) cat <<-ENDSED
+    case "${CT_ARCH_FLOAT}" in
+        hard|softfp)
+            cat <<-ENDSED
 				s/^[^_]*(HAS_FPU).*/\\1=y/
 				s/.*(UCLIBC_HAS_FPU).*/\\1=y/
 				ENDSED
             ;;
-        ,y) cat <<-ENDSED
+        soft)
+            cat <<-ENDSED
 				s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/
 				s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/
 				ENDSED
-- 
cgit v0.10.2-6-g49f6