diff -r 16028ca35721 -r 22239d19ad65 scripts/build/libc/uClibc.sh
--- a/scripts/build/libc/uClibc.sh	Sat Jan 04 01:10:13 2014 +0100
+++ b/scripts/build/libc/uClibc.sh	Sat Jan 04 16:19:18 2014 +0100
@@ -315,13 +315,6 @@
                     ;;
             esac
             ;;
-        x86)
-            if [ "${CT_ARCH_BITNESS}" = "32" ]; then
-                 cat <<-ENDSED
-					s/.*(UCLIBC_HAS_FENV).*/\\1=y/
-					ENDSED
-            fi
-            ;;
     esac
 
     # Accomodate for old and new uClibc versions, where the
@@ -374,6 +367,11 @@
 				ENDSED
             ;;
     esac
+    if [ "${CT_LIBC_UCLIBC_FENV}" = "y" ]; then
+        cat <<-ENDSED
+			s/.*(UCLIBC_HAS_FENV).*/\\1=y/
+			ENDSED
+    fi
 
     # We always want ctor/dtor
     cat <<-ENDSED