Adjust configs for updated math lib

10 files changed, 40 insertions, 120 deletions

diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index 000de8d3b..b2fa6f757 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -65,20 +65,12 @@ HAS_MMU = true
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = false
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = false
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.cross.arm.uclinux b/extra/Configs/Config.cross.arm.uclinux
index cc3501f70..636574d32 100644
--- a/extra/Configs/Config.cross.arm.uclinux
+++ b/extra/Configs/Config.cross.arm.uclinux
@@ -65,20 +65,12 @@ HAS_MMU = false
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = false
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = false
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386
index 44ee3d06b..5a4f4be75 100644
--- a/extra/Configs/Config.i386
+++ b/extra/Configs/Config.i386
@@ -65,20 +65,12 @@ HAS_MMU = true
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = true
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = true
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k
index 3168eb366..d53278fb5 100644
--- a/extra/Configs/Config.m68k
+++ b/extra/Configs/Config.m68k
@@ -65,20 +65,12 @@ HAS_MMU = false
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = true
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = true
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = true
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.m68k.coff b/extra/Configs/Config.m68k.coff
index 8ae49475f..6d9dc5a52 100644
--- a/extra/Configs/Config.m68k.coff
+++ b/extra/Configs/Config.m68k.coff
@@ -65,20 +65,12 @@ HAS_MMU = false
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = true
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = true
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = true
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips
index 8e3b4ce36..2a51ea0a2 100644
--- a/extra/Configs/Config.mips
+++ b/extra/Configs/Config.mips
@@ -65,20 +65,12 @@ HAS_MMU = false
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = false
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = false
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel
index 8e3b4ce36..2a51ea0a2 100644
--- a/extra/Configs/Config.mipsel
+++ b/extra/Configs/Config.mipsel
@@ -65,20 +65,12 @@ HAS_MMU = false
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = false
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = false
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc
index d9e7c6c30..90bd41cae 100644
--- a/extra/Configs/Config.powerpc
+++ b/extra/Configs/Config.powerpc
@@ -65,20 +65,12 @@ HAS_MMU = true
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = true
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = true
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index e0dfb9e8f..0380b8715 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -86,20 +86,12 @@ endif
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = false
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = false
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.
diff --git a/extra/Configs/Config.v850e b/extra/Configs/Config.v850e
index 2d0533839..c5000c668 100644
--- a/extra/Configs/Config.v850e
+++ b/extra/Configs/Config.v850e
@@ -65,20 +65,12 @@ HAS_MMU = false
 
 # Set this to `false' if you don't have/need basic floating point support
 # support in libc (strtod, printf, scanf).  Set it to `true' otherwise.
-# Note: If not true, Rules.mak disables libm as well.
+# If this is not true, then libm will not be built.
 HAS_FLOATING_POINT = true
 
-# Set this to `false' if you don't have/need float functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_FLOAT = true
-
-# Set this to `false' if you don't have/need double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_DOUBLE = true
-
-# Set this to `false' if you don't have/need long double functions in libm.
-# Set it to `true' otherwise, and make sure HAS_FLOATING_POINT is true as well.
-HAS_LIBM_LONG_DOUBLE = false
+# Set to `true' if you want the math library to contain the full set
+# of C99 math library features.  Costs an extra 35k or so on x86. 
+DO_C99_MATH = false
 
 # Set this to `false' if you don't have/need "(unsigned) long long int" support.
 # Set it to `true' otherwise.