Finish ajusting math lib options. Close out a couple of todo items.

4 files changed, 4 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index a61f657d0..4f6b575e5 100644
--- a/Makefile
+++ b/Makefile
@@ -114,21 +114,6 @@ uClibc_config.h: Makefile Config
 	else \
 	    echo "#undef __UCLIBC_HAS_FLOATS__" >> uClibc_config.h ; \
 	fi
-	@if [ "$(HAS_LIBM_FLOAT)" = "true" ] ; then \
-	    echo "#define __UCLIBC_HAS_LIBM_FLOAT__ 1" >> uClibc_config.h ; \
-	else \
-	    echo "#undef __UCLIBC_HAS_LIBM_FLOAT__" >> uClibc_config.h ; \
-	fi
-	@if [ "$(HAS_LIBM_DOUBLE)" = "true" ] ; then \
-	    echo "#define __UCLIBC_HAS_LIBM_DOUBLE__ 1" >> uClibc_config.h ; \
-	else \
-	    echo "#undef __UCLIBC_HAS_LIBM_DOUBLE__" >> uClibc_config.h ; \
-	fi
-	@if [ "$(HAS_LIBM_LONG_DOUBLE)" = "true" ] ; then \
-	    echo "#define __UCLIBC_HAS_LIBM_LONG_DOUBLE__ 1" >> uClibc_config.h ; \
-	else \
-	    echo "#undef __UCLIBC_HAS_LIBM_LONG_DOUBLE__" >> uClibc_config.h ; \
-	fi
 	@if [ "$(HAS_LONG_LONG)" = "true" ] ; then \
 	    echo "#define __UCLIBC_HAS_LONG_LONG__ 1" >> uClibc_config.h ; \
 	else \
diff --git a/Rules.mak b/Rules.mak
index 371eed8d3..5ec34fe2a 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -69,13 +69,6 @@ ifeq ($(strip $(DOPIC)),true)
     CFLAGS += -fPIC
 endif
 
-# Disable libm if HAS_FLOATING_POINT isn't true.
-ifneq ($(HAS_FLOATING_POINT),true)
-	HAS_LIBM_FLOAT = false
-	HAS_LIBM_DOUBLE = false
-	HAS_LIBM_LONG_DOUBLE = false
-endif
-
 ifeq ($(strip $(HAVE_SHARED)),true)
     LIBRARY_CACHE=#-DUSE_CACHE
 ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
diff --git a/TODO b/TODO
index 637a513da..76d129947 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
 Any takers?
 
-On ARM, the kernel fp math emulator uses a funky byte ordering
-    that causes some of our math functions to produce bad results.
-    We need to fix up the things for the wierd ARM byte ordering.
 Fix regex so it isn't so stinking big
 Fix glob so it isn't so stinking big
 Integrate Jeff Garzik's key-value reading code for pwd/grp, /etc/hosts, etc
@@ -21,11 +18,6 @@ Add in shadow support (include/shadow.h and such)
 Right now, getopt has different behavior when dynamically vs when
     statically linked, violating the principle of least surprise.
 
-Split the math library, such that by default we only build C89
-    math functions, i.e.: acos asin atan atan2 ceil cos cosh exp 
-    fabs floor fmod frexp ldexp log log10 modf pow sin sinh sqrt 
-    tan tanh
-
 
 -----------------------------------------------------------------------------
 Manuel's unsorted todo:
diff --git a/libm/Makefile b/libm/Makefile
index d60f52d6c..c82ca3f25 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -28,7 +28,6 @@ LIBM_SHARED_FULLNAME=libm-$(MAJOR_VERSION).$(MINOR_VERSION).so
 TARGET_CC= $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
 TARGET_CFLAGS+=-D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE
 
-
 ifeq ($(strip $(DO_C99_MATH)),true)
 CSRC =   e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c\
          e_exp.c e_fmod.c e_gamma.c e_gamma_r.c e_hypot.c e_j0.c\
@@ -59,8 +58,11 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
 
-
+ifneq ($(strip $(HAS_FLOATING_POINT)),true)
+all:  clean
+else
 all: $(OBJS) $(COBJS1) $(LIBM)
+endif
 
 $(LIBM): ar-target
 	@if [ -f $(LIBM) ] ; then \