From ce0e01a34c1f3705400c260e2284fda6b8be0057 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Thu, 25 Aug 2016 02:56:26 +0200
Subject: mips: add hidden NaN choice, refresh uClibc-ng configs

---
 toolchain/gcc/Makefile       |  4 ++++
 toolchain/uclibc-ng/Makefile | 11 +++++++++++
 2 files changed, 15 insertions(+)

(limited to 'toolchain')

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 01f4f4a96..0495cce4c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -115,6 +115,10 @@ ifneq ($(ADK_TARGET_INSTRUCTION_SET),)
 GCC_CONFOPTS+=		--with-mode=$(ADK_TARGET_INSTRUCTION_SET)
 endif
 
+ifneq ($(ADK_TARGET_NAN_MODE),)
+GCC_CONFOPTS+=		--with-nan=$(ADK_TARGET_NAN_MODE)
+endif
+
 # .symver is broken for Blackfin, simple C++ apps fail to link
 ifeq ($(ADK_TARGET_ARCH_BFIN),y)
 GCC_CONFOPTS+=		--disable-symvers
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index d22f44a8e..2970c3ffb 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -244,6 +244,7 @@ ifeq ($(ADK_TARGET_CPU_X86_I686),y)
 endif
 endif
 
+# m68k
 ifeq ($(ADK_TARGET_ARCH_M68K),y)
 ifeq ($(ADK_TARGET_WITHOUT_MMU),y)
 ifeq ($(ADK_TARGET_BINFMT_FLAT_ONE)$(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y)
@@ -252,6 +253,16 @@ endif
 endif
 endif
 
+# mips/mips64 NaN
+ifeq ($(ADK_TARGET_ARCH_MIPS_WITH_NAN_2008),y)
+	$(SED) 's/.*\(CONFIG_MIPS_NAN_LEGACY\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_NAN_2008\).*/\1=y/' ${WRKBUILD}/.config
+endif
+ifeq ($(ADK_TARGET_ARCH_MIPS_WITH_NAN_LEGACY),y)
+	$(SED) 's/.*\(CONFIG_MIPS_NAN_2008\).*/# \1 is not set/' ${WRKBUILD}/.config
+	$(SED) 's/.*\(CONFIG_MIPS_NAN_LEGACY\).*/\1=y/' ${WRKBUILD}/.config
+endif
+
 # mips64 abi
 ifeq ($(ADK_TARGET_ARCH_MIPS64),y)
 ifeq ($(ADK_TARGET_ABI_N64),y)
-- 
cgit v1.2.3