2006-02-27 Jeff Johnston <jjohnstn@redhat.com>

        * Makefile.am (MATHOBJS_IN_LIBC): Add s_isinfd, sf_isinff,
        s_isnand, and sf_isnanf object files.
        * Makefile.in: Regenerated.
        * libc/include/ieeefp.h: Undef isnan and isinf to avoid
        conflict if <math.h> has previously been included.
        * libc/include/math.h
        * libm/common/Makefile.am: Add new s_isinfd, s_isnand, sf_isinff,
        and sf_isnanf files.  Also support s_isnan, sf_isnan, s_isinf, and
        sf_isinf files which have been moved from math/mathfp directories.
        * libm/common/Makefile.in: Regenerated.
        * libm/common/s_isinfd.c: New file.
        * libm/common/s_isnand.c: Ditto.
        * libm/common/sf_isinff.c: Ditto.
        * libm/common/sf_isnanf.c: Ditto.
        * libm/common/s_isinf.c: Moved from libm/math directory.
        * libm/common/s_isnan.c: Ditto.
        * libm/common/sf_isinf.c: Ditto.
        * libm/common/sf_isnan.c: Ditto.
        * libm/math/Makefile.am: Remove isinf and isnan family functions
        which have been moved into common directory.
        * libm/mathfp/Makefile.am: Ditto.
        * libm/math/Makefile.in: Regenerated.
        * libm/mathfp/Makefile.in: Ditto.
        * libm/math/s_isinf.c: Removed.
        * libm/math/s_isnan.c: Ditto.
        * libm/math/sf_isinf.c: Ditto.
        * libm/math/sf_isnan.c: Ditto.
        * libm/mathfp/s_isinf.c: Ditto.
        * libm/mathfp/s_isnan.c: Ditto.
        * libm/mathfp/sf_isinf.c: Ditto.
        * libm/mathfp/sf_isnan.c: Ditto.

1 files changed, 3 insertions, 9 deletions

diff --git a/newlib/libm/math/Makefile.am b/newlib/libm/math/Makefile.am
index 4b4db93d8..f5971fac9 100644
--- a/newlib/libm/math/Makefile.am
+++ b/newlib/libm/math/Makefile.am
@@ -22,10 +22,9 @@ src = 	k_standard.c k_rem_pio2.c \
 	w_cabs.c w_drem.c \
 	s_asinh.c s_atan.c s_ceil.c \
 	s_cos.c s_erf.c s_fabs.c s_floor.c \
-	s_frexp.c s_isnan.c s_ldexp.c \
+	s_frexp.c s_ldexp.c \
 	s_signif.c s_sin.c \
 	s_tan.c s_tanh.c \
-	s_isinf.c \
 	w_exp2.c w_tgamma.c
 
 fsrc =	kf_rem_pio2.c \
@@ -46,10 +45,9 @@ fsrc =	kf_rem_pio2.c \
 	wf_cabs.c wf_drem.c \
 	sf_asinh.c sf_atan.c sf_ceil.c \
 	sf_cos.c sf_erf.c sf_fabs.c sf_floor.c \
-	sf_frexp.c sf_isnan.c sf_ldexp.c \
+	sf_frexp.c sf_ldexp.c \
 	sf_signif.c sf_sin.c \
 	sf_tan.c sf_tanh.c \
-	sf_isinf.c \
 	wf_exp2.c wf_tgamma.c
 
 libmath_la_LDFLAGS = -Xcompiler -nostdlib
@@ -73,8 +71,7 @@ chobj =	wacos.def wacosh.def wasin.def sasinh.def \
 	wgamma.def whypot.def sldexp.def wlog.def \
 	wlog10.def \
 	wpow.def wremainder.def ssin.def wsinh.def \
-	wsqrt.def stan.def stanh.def \
-	sisnan.def
+	wsqrt.def stan.def stanh.def
 
 SUFFIXES = .def
 
@@ -178,9 +175,6 @@ stan.def: s_tan.c
 stanh.def: s_tanh.c
 	$(CHEW) < $(srcdir)/s_tanh.c >$@ 2>/dev/null
 	touch stmp-def
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
 
 # A partial dependency list.