merge uClibc changes

diff --cc Makerules
Simple merge

diff --cc Rules.mak
index a95fdd8,9f5fe85..7688c72
--- 1/Rules.mak
--- 2/Rules.mak
+++ b/Rules.mak
@@@ -410,8 -415,19 +410,13 @@@ ifeq ($(TARGET_ARCH),mips
        CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64
        CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32
        CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32
+ 
+       CPU_CFLAGS-$(CONFIG_MIPS_NAN_LEGACY)+=-mnan=legacy
+       CPU_CFLAGS-$(CONFIG_MIPS_NAN_2008)+=-mnan=2008
+ 
+       CPU_LDFLAGS-y += $(CPU_CFLAGS)
  endif
  
 -ifeq ($(TARGET_ARCH),nios)
 -      OPTIMIZATION+=-funaligned-struct-hack
 -      CPU_LDFLAGS-y+=-Wl,-m32
 -      CPU_CFLAGS-y+=-Wl,-m32
 -endif
 -
  ifeq ($(TARGET_ARCH),sh)
  $(eval $(call check-gcc-var,-mprefergot))
        OPTIMIZATION += $(CFLAG_-mprefergot)