From 1c7b8267085f8a5d26eb52461aac694f68ee9582 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 29 Dec 2007 18:07:56 +0000
Subject: [PATCH] unconditionally enable c99 math support in uclibc - many
 packages need it

SVN-Revision: 10024
---
 toolchain/Config.in             | 7 -------
 toolchain/uClibc/Makefile       | 1 -
 toolchain/uClibc/config/arm     | 2 +-
 toolchain/uClibc/config/armeb   | 2 +-
 toolchain/uClibc/config/avr32   | 2 +-
 toolchain/uClibc/config/cris    | 2 +-
 toolchain/uClibc/config/i386    | 2 +-
 toolchain/uClibc/config/i686    | 2 +-
 toolchain/uClibc/config/mips    | 2 +-
 toolchain/uClibc/config/mipsel  | 2 +-
 toolchain/uClibc/config/powerpc | 2 +-
 11 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 64e4372b11..ed5a939787 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -27,13 +27,6 @@ config LARGEFILE
 	help
 		Enable large file (files > 2 GB) support
 
-config C99_MATH
-	bool
-	prompt "Enable full C99 math support?" if TOOLCHAINOPTS
-	default n
-	help
-		Enable if you need full C99 math in libm
-
 config SOFT_FLOAT
 	bool
 	prompt "Use software floating point by default" if TOOLCHAINOPTS
diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index e9925848cc..a9093a96ce 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -46,7 +46,6 @@ define Build/Prepare
 	$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \
 		-e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),g' \
 		-e 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=$(if $(CONFIG_LARGEFILE),y,n),g' \
-		-e 's,.*DO_C99_MATH.*,DO_C99_MATH=$(if $(CONFIG_C99_MATH),y,n),g' \
 		$(PKG_BUILD_DIR)/.config
 	mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/include
 	mkdir -p $(BUILD_DIR_HOST)/uClibc_dev/usr/lib
diff --git a/toolchain/uClibc/config/arm b/toolchain/uClibc/config/arm
index 53437c21d2..0cd1ae23ef 100644
--- a/toolchain/uClibc/config/arm
+++ b/toolchain/uClibc/config/arm
@@ -58,7 +58,7 @@ ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 UCLIBC_HAS_SOFT_FLOAT=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="./toolchain_build_arm/linux"
 KERNEL_HEADERS="./toolchain_build_arm/linux/include"
 HAVE_DOT_CONFIG=y
diff --git a/toolchain/uClibc/config/armeb b/toolchain/uClibc/config/armeb
index 3367204fea..0dfc73bdaa 100644
--- a/toolchain/uClibc/config/armeb
+++ b/toolchain/uClibc/config/armeb
@@ -59,7 +59,7 @@ ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 UCLIBC_HAS_SOFT_FLOAT=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="./toolchain_build_armeb/linux"
 KERNEL_HEADERS="./toolchain_build_armeb/linux/include"
 HAVE_DOT_CONFIG=y
diff --git a/toolchain/uClibc/config/avr32 b/toolchain/uClibc/config/avr32
index e6303081ad..de685cd10b 100644
--- a/toolchain/uClibc/config/avr32
+++ b/toolchain/uClibc/config/avr32
@@ -43,7 +43,7 @@ ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
 UCLIBC_HAS_SOFT_FLOAT=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="./toolchain_build_avr32/linux/include"
 KERNEL_HEADERS="./toolchain_build_avr32/linux/include"
 HAVE_DOT_CONFIG=y
diff --git a/toolchain/uClibc/config/cris b/toolchain/uClibc/config/cris
index 8a018d9fc7..389ba8af9a 100644
--- a/toolchain/uClibc/config/cris
+++ b/toolchain/uClibc/config/cris
@@ -37,7 +37,7 @@ ARCH_HAS_MMU=y
 UCLIBC_HAS_FLOATS=y
 # HAS_FPU is not set
 UCLIBC_HAS_SOFT_FLOAT=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="/raid/trunk/toolchain_build_cris/linux"
 C_SYMBOL_PREFIX=""
 HAVE_DOT_CONFIG=y
diff --git a/toolchain/uClibc/config/i386 b/toolchain/uClibc/config/i386
index 6f27107844..2f5a38bec4 100644
--- a/toolchain/uClibc/config/i386
+++ b/toolchain/uClibc/config/i386
@@ -63,7 +63,7 @@ ARCH_HAS_MMU=y
 ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_HEADERS="."
 HAVE_DOT_CONFIG=y
 
diff --git a/toolchain/uClibc/config/i686 b/toolchain/uClibc/config/i686
index 2828d25cab..d3cae7016d 100644
--- a/toolchain/uClibc/config/i686
+++ b/toolchain/uClibc/config/i686
@@ -63,7 +63,7 @@ ARCH_HAS_MMU=y
 ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_HEADERS="."
 HAVE_DOT_CONFIG=y
 
diff --git a/toolchain/uClibc/config/mips b/toolchain/uClibc/config/mips
index 204d4f7f2a..07e6ec39ce 100644
--- a/toolchain/uClibc/config/mips
+++ b/toolchain/uClibc/config/mips
@@ -56,7 +56,7 @@ ARCH_HAS_MMU=y
 ARCH_USE_MMU=y
 UCLIBC_HAS_FPU=y
 UCLIBC_HAS_FLOATS=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="./toolchain_build_mips/linux"
 KERNEL_HEADERS="./toolchain_build_mips/linux/include"
 HAVE_DOT_CONFIG=y
diff --git a/toolchain/uClibc/config/mipsel b/toolchain/uClibc/config/mipsel
index 2fdb152f7e..0cb3983b60 100644
--- a/toolchain/uClibc/config/mipsel
+++ b/toolchain/uClibc/config/mipsel
@@ -56,7 +56,7 @@ ARCH_HAS_MMU=y
 ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="./toolchain_build_mipsel/linux"
 KERNEL_HEADERS="./toolchain_build_mipsel/linux/include"
 HAVE_DOT_CONFIG=y
diff --git a/toolchain/uClibc/config/powerpc b/toolchain/uClibc/config/powerpc
index af0db3201c..b27efe7da8 100644
--- a/toolchain/uClibc/config/powerpc
+++ b/toolchain/uClibc/config/powerpc
@@ -46,7 +46,7 @@ ARCH_HAS_MMU=y
 ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
 UCLIBC_HAS_FPU=y
-# DO_C99_MATH is not set
+DO_C99_MATH=y
 KERNEL_SOURCE="./toolchain_build_powerpc/linux"
 KERNEL_HEADERS="./toolchain_build_powerpc/linux/include"
 HAVE_DOT_CONFIG=y