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.

6 files changed, 17 insertions, 285 deletions

diff --git a/newlib/libm/mathfp/Makefile.am b/newlib/libm/mathfp/Makefile.am
index 82adbea4f..e529022a6 100644
--- a/newlib/libm/mathfp/Makefile.am
+++ b/newlib/libm/mathfp/Makefile.am
@@ -16,7 +16,7 @@ src =	s_acos.c s_frexp.c s_mathcnst.c \
 	s_sincos.c \
 	s_atangent.c s_logarithm.c \
 	s_sineh.c \
-	s_ceil.c s_isnan.c s_isinf.c \
+	s_ceil.c \
 	e_acosh.c e_atanh.c e_remainder.c \
 	er_gamma.c er_lgamma.c \
 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c \
@@ -36,7 +36,6 @@ fsrc =	sf_ceil.c \
 	sf_sincos.c \
 	sf_atangent.c sf_logarithm.c sf_sineh.c \
 	sf_log.c sf_sineh.c \
-	sf_isnan.c sf_isinf.c \
 	ef_acosh.c ef_atanh.c ef_remainder.c \
 	erf_gamma.c erf_lgamma.c \
 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c \
@@ -76,7 +75,6 @@ chobj = eacosh.def \
 	sfloor.def \
 	sfmod.def \
 	sfrexp.def \
-	sisnan.def \
 	sldexp.def \
 	slog10.def \
 	slogarithm.def \
@@ -160,9 +158,6 @@ sfmod.def: s_fmod.c
 sfrexp.def: s_frexp.c
 	$(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null
 	touch stmp-def
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
 sldexp.def: s_ldexp.c
 	$(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/mathfp/Makefile.in b/newlib/libm/mathfp/Makefile.in
index e0eaaa43e..b11e8130f 100644
--- a/newlib/libm/mathfp/Makefile.in
+++ b/newlib/libm/mathfp/Makefile.in
@@ -98,10 +98,10 @@ AUTOMAKE_OPTIONS = cygnus
 
 INCLUDES = -I$(srcdir)/../common $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS)
 
-src = s_acos.c s_frexp.c s_mathcnst.c 	s_cos.c s_sinh.c 	s_asin.c 	s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c 	s_exp.c s_ldexp.c s_pow.c s_tan.c 	s_atan.c 	s_atan2.c s_fabs.c s_log.c s_tanh.c 	s_log10.c s_sin.c 	s_floor.c s_sine.c 	s_sincos.c 	s_atangent.c s_logarithm.c 	s_sineh.c 	s_ceil.c s_isnan.c s_isinf.c 	e_acosh.c e_atanh.c e_remainder.c 	er_gamma.c er_lgamma.c 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c 	w_cabs.c w_drem.c s_asinh.c s_fmod.c 	e_scalb.c s_signif.c 	s_exp2.c s_tgamma.c
+src = s_acos.c s_frexp.c s_mathcnst.c 	s_cos.c s_sinh.c 	s_asin.c 	s_asine.c s_cosh.c s_ispos.c s_numtest.c s_sqrt.c 	s_exp.c s_ldexp.c s_pow.c s_tan.c 	s_atan.c 	s_atan2.c s_fabs.c s_log.c s_tanh.c 	s_log10.c s_sin.c 	s_floor.c s_sine.c 	s_sincos.c 	s_atangent.c s_logarithm.c 	s_sineh.c 	s_ceil.c 	e_acosh.c e_atanh.c e_remainder.c 	er_gamma.c er_lgamma.c 	s_erf.c e_j0.c e_j1.c w_jn.c e_hypot.c 	w_cabs.c w_drem.c s_asinh.c s_fmod.c 	e_scalb.c s_signif.c 	s_exp2.c s_tgamma.c
 
 
-fsrc = sf_ceil.c 	sf_acos.c sf_frexp.c 	sf_cos.c sf_sinh.c 	sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c 	sf_asin.c 	sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c 	sf_atan2.c sf_fabs.c sf_tanh.c 	sf_atan.c sf_log10.c sf_sin.c 	sf_floor.c sf_sine.c 	sf_sincos.c 	sf_atangent.c sf_logarithm.c sf_sineh.c 	sf_log.c sf_sineh.c 	sf_isnan.c sf_isinf.c 	ef_acosh.c ef_atanh.c ef_remainder.c 	erf_gamma.c erf_lgamma.c 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c 	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c 	ef_scalb.c sf_signif.c 	sf_exp2.c sf_tgamma.c
+fsrc = sf_ceil.c 	sf_acos.c sf_frexp.c 	sf_cos.c sf_sinh.c 	sf_asine.c sf_cosh.c sf_ispos.c sf_numtest.c sf_sqrt.c 	sf_asin.c 	sf_exp.c sf_ldexp.c sf_pow.c sf_tan.c 	sf_atan2.c sf_fabs.c sf_tanh.c 	sf_atan.c sf_log10.c sf_sin.c 	sf_floor.c sf_sine.c 	sf_sincos.c 	sf_atangent.c sf_logarithm.c sf_sineh.c 	sf_log.c sf_sineh.c 	ef_acosh.c ef_atanh.c ef_remainder.c 	erf_gamma.c erf_lgamma.c 	sf_erf.c ef_j0.c ef_j1.c wf_jn.c ef_hypot.c 	wf_cabs.c wf_drem.c sf_asinh.c sf_fmod.c 	ef_scalb.c sf_signif.c 	sf_exp2.c sf_tgamma.c
 
 
 libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
@@ -113,7 +113,7 @@ libmathfp_la_LDFLAGS = -Xcompiler -nostdlib
 @USE_LIBTOOL_FALSE@noinst_LIBRARIES = lib.a
 @USE_LIBTOOL_FALSE@lib_a_SOURCES = $(src) $(fsrc)
 
-chobj = eacosh.def 	eatanh.def 	ehypot.def 	eremainder.def 	erlgamma.def 	sacos.def 	sasine.def 	sasinh.def 	satan.def 	satan2.def 	satangent.def 	scosh.def 	serf.def 	sexp.def 	sfabs.def 	sfloor.def 	sfmod.def 	sfrexp.def 	sisnan.def 	sldexp.def 	slog10.def 	slogarithm.def 	spow.def 	ssine.def 	ssineh.def 	ssqrt.def 	stan.def 	stanh.def 	wjn.def
+chobj = eacosh.def 	eatanh.def 	ehypot.def 	eremainder.def 	erlgamma.def 	sacos.def 	sasine.def 	sasinh.def 	satan.def 	satan2.def 	satangent.def 	scosh.def 	serf.def 	sexp.def 	sfabs.def 	sfloor.def 	sfmod.def 	sfrexp.def 	sldexp.def 	slog10.def 	slogarithm.def 	spow.def 	ssine.def 	ssineh.def 	ssqrt.def 	stan.def 	stanh.def 	wjn.def
 
 
 SUFFIXES = .def
@@ -143,8 +143,7 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@s_sin.$(OBJEXT) s_floor.$(OBJEXT) s_sine.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_sincos.$(OBJEXT) s_atangent.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@s_logarithm.$(OBJEXT) s_sineh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) s_isnan.$(OBJEXT) s_isinf.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \
+@USE_LIBTOOL_FALSE@s_ceil.$(OBJEXT) e_acosh.$(OBJEXT) e_atanh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@e_remainder.$(OBJEXT) er_gamma.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@er_lgamma.$(OBJEXT) s_erf.$(OBJEXT) e_j0.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@e_j1.$(OBJEXT) w_jn.$(OBJEXT) e_hypot.$(OBJEXT) \
@@ -165,7 +164,6 @@ lib_a_LIBADD =
 @USE_LIBTOOL_FALSE@sf_sincos.$(OBJEXT) sf_atangent.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_logarithm.$(OBJEXT) sf_sineh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@sf_log.$(OBJEXT) sf_sineh.$(OBJEXT) \
-@USE_LIBTOOL_FALSE@sf_isnan.$(OBJEXT) sf_isinf.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@ef_acosh.$(OBJEXT) ef_atanh.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@ef_remainder.$(OBJEXT) erf_gamma.$(OBJEXT) \
 @USE_LIBTOOL_FALSE@erf_lgamma.$(OBJEXT) sf_erf.$(OBJEXT) \
@@ -184,19 +182,18 @@ libmathfp_la_LIBADD =
 @USE_LIBTOOL_TRUE@s_ldexp.lo s_pow.lo s_tan.lo s_atan.lo s_atan2.lo \
 @USE_LIBTOOL_TRUE@s_fabs.lo s_log.lo s_tanh.lo s_log10.lo s_sin.lo \
 @USE_LIBTOOL_TRUE@s_floor.lo s_sine.lo s_sincos.lo s_atangent.lo \
-@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo s_isnan.lo \
-@USE_LIBTOOL_TRUE@s_isinf.lo e_acosh.lo e_atanh.lo e_remainder.lo \
-@USE_LIBTOOL_TRUE@er_gamma.lo er_lgamma.lo s_erf.lo e_j0.lo e_j1.lo \
-@USE_LIBTOOL_TRUE@w_jn.lo e_hypot.lo w_cabs.lo w_drem.lo s_asinh.lo \
-@USE_LIBTOOL_TRUE@s_fmod.lo e_scalb.lo s_signif.lo s_exp2.lo \
-@USE_LIBTOOL_TRUE@s_tgamma.lo sf_ceil.lo sf_acos.lo sf_frexp.lo \
-@USE_LIBTOOL_TRUE@sf_cos.lo sf_sinh.lo sf_asine.lo sf_cosh.lo \
-@USE_LIBTOOL_TRUE@sf_ispos.lo sf_numtest.lo sf_sqrt.lo sf_asin.lo \
-@USE_LIBTOOL_TRUE@sf_exp.lo sf_ldexp.lo sf_pow.lo sf_tan.lo sf_atan2.lo \
-@USE_LIBTOOL_TRUE@sf_fabs.lo sf_tanh.lo sf_atan.lo sf_log10.lo \
-@USE_LIBTOOL_TRUE@sf_sin.lo sf_floor.lo sf_sine.lo sf_sincos.lo \
-@USE_LIBTOOL_TRUE@sf_atangent.lo sf_logarithm.lo sf_sineh.lo sf_log.lo \
-@USE_LIBTOOL_TRUE@sf_sineh.lo sf_isnan.lo sf_isinf.lo ef_acosh.lo \
+@USE_LIBTOOL_TRUE@s_logarithm.lo s_sineh.lo s_ceil.lo e_acosh.lo \
+@USE_LIBTOOL_TRUE@e_atanh.lo e_remainder.lo er_gamma.lo er_lgamma.lo \
+@USE_LIBTOOL_TRUE@s_erf.lo e_j0.lo e_j1.lo w_jn.lo e_hypot.lo w_cabs.lo \
+@USE_LIBTOOL_TRUE@w_drem.lo s_asinh.lo s_fmod.lo e_scalb.lo s_signif.lo \
+@USE_LIBTOOL_TRUE@s_exp2.lo s_tgamma.lo sf_ceil.lo sf_acos.lo \
+@USE_LIBTOOL_TRUE@sf_frexp.lo sf_cos.lo sf_sinh.lo sf_asine.lo \
+@USE_LIBTOOL_TRUE@sf_cosh.lo sf_ispos.lo sf_numtest.lo sf_sqrt.lo \
+@USE_LIBTOOL_TRUE@sf_asin.lo sf_exp.lo sf_ldexp.lo sf_pow.lo sf_tan.lo \
+@USE_LIBTOOL_TRUE@sf_atan2.lo sf_fabs.lo sf_tanh.lo sf_atan.lo \
+@USE_LIBTOOL_TRUE@sf_log10.lo sf_sin.lo sf_floor.lo sf_sine.lo \
+@USE_LIBTOOL_TRUE@sf_sincos.lo sf_atangent.lo sf_logarithm.lo \
+@USE_LIBTOOL_TRUE@sf_sineh.lo sf_log.lo sf_sineh.lo ef_acosh.lo \
 @USE_LIBTOOL_TRUE@ef_atanh.lo ef_remainder.lo erf_gamma.lo \
 @USE_LIBTOOL_TRUE@erf_lgamma.lo sf_erf.lo ef_j0.lo ef_j1.lo wf_jn.lo \
 @USE_LIBTOOL_TRUE@ef_hypot.lo wf_cabs.lo wf_drem.lo sf_asinh.lo \
@@ -497,9 +494,6 @@ sfmod.def: s_fmod.c
 sfrexp.def: s_frexp.c
 	$(CHEW) < $(srcdir)/s_frexp.c >$@ 2>/dev/null
 	touch stmp-def
-sisnan.def: s_isnan.c
-	$(CHEW) < $(srcdir)/s_isnan.c >$@ 2>/dev/null
-	touch stmp-def
 sldexp.def: s_ldexp.c
 	$(CHEW) < $(srcdir)/s_ldexp.c >$@ 2>/dev/null
 	touch stmp-def
diff --git a/newlib/libm/mathfp/s_isinf.c b/newlib/libm/mathfp/s_isinf.c
deleted file mode 100644
index fe9f54799..000000000
--- a/newlib/libm/mathfp/s_isinf.c
+++ /dev/null
@@ -1,37 +0,0 @@
-
-/* @(#)z_isinf.c 1.0 98/08/13 */
-/******************************************************************
- * isinf
- *
- * Input:
- *   x - pointer to a floating point value
- *
- * Output:
- *   An integer that indicates if the number is infinite.
- *
- * Description:
- *   This routine returns an integer that indicates if the number
- *   passed in is infinite (1) or is finite (0).
- *
- *****************************************************************/
-
-#include "fdlibm.h"
-#include "zmath.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-int isinf (double x)
-{
-  __uint32_t lx, hx;
-  int exp;
-
-  EXTRACT_WORDS (hx, lx, x);
-  exp = (hx & 0x7ff00000) >> 20;
-
-  if ((exp == 0x7ff) && ((hx & 0xf0000 || lx) == 0))
-    return (1);
-  else
-    return (0);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/s_isnan.c b/newlib/libm/mathfp/s_isnan.c
deleted file mode 100644
index 70ac704c3..000000000
--- a/newlib/libm/mathfp/s_isnan.c
+++ /dev/null
@@ -1,124 +0,0 @@
-
-/* @(#)z_isnan.c 1.0 98/08/13 */
-
-/*
-FUNCTION
-        <<isnan>>, <<isnanf>>, <<isinf>>, <<isinff>>, <<finite>>, <<finitef>>---test
-for exceptional numbers
-
-INDEX
-        isnan
-INDEX
-        isinf
-INDEX
-        finite
-
-INDEX
-        isnanf
-INDEX
-        isinff
-INDEX
-        finitef
-
-ANSI_SYNOPSIS
-        #include <ieeefp.h>
-        int isnan(double <[arg]>);
-        int isinf(double <[arg]>);
-        int finite(double <[arg]>);
-        int isnanf(float <[arg]>);
-        int isinff(float <[arg]>);
-        int finitef(float <[arg]>);
-
-TRAD_SYNOPSIS
-        #include <ieeefp.h>
-        int isnan(<[arg]>)
-        double <[arg]>;
-        int isinf(<[arg]>)
-        double <[arg]>;
-        int finite(<[arg]>);
-        double <[arg]>;
-        int isnanf(<[arg]>);
-        float <[arg]>;
-        int isinff(<[arg]>);
-        float <[arg]>;
-        int finitef(<[arg]>);
-        float <[arg]>;
-
-
-DESCRIPTION
-        These functions provide information on the floating-point
-        argument supplied.
-
-        There are five major number formats:
-        o+
-        o zero
-          A number which contains all zero bits.
-        o subnormal
-          A number with a zero exponent but a nonzero fraction.
-        o normal
-          A number with an exponent and a fraction.
-        o infinity
-          A number with an all 1's exponent and a zero fraction.
-        o NAN
-          A number with an all 1's exponent and a nonzero fraction.
-
-        o-
-
-        <<isnan>> returns 1 if the argument is a nan. <<isinf>>
-        returns 1 if the argument is infinity.  <<finite>> returns 1 if the
-        argument is zero, subnormal or normal.
-
-        The <<isnanf>>, <<isinff>> and <<finitef>> functions perform the same
-        operations as their <<isnan>>, <<isinf>> and <<finite>>
-        counterparts, but on single-precision floating-point numbers.
-
-QUICKREF
-        isnan - pure
-QUICKREF
-        isinf - pure
-QUICKREF
-        finite - pure
-QUICKREF
-        isnan - pure
-QUICKREF
-        isinf - pure
-QUICKREF
-        finite - pure
-*/
-
-
-/******************************************************************
- * isnan
- *
- * Input:
- *   x - pointer to a floating-point value
- *
- * Output:
- *   An integer that indicates if the number is NaN.
- *
- * Description:
- *   This routine returns an integer that indicates if the number
- *   passed in is NaN (1) or is finite (0).
- *
- *****************************************************************/
-
-#include "fdlibm.h"
-#include "zmath.h"
-
-#ifndef _DOUBLE_IS_32BITS
-
-int isnan (double x)
-{
-  __uint32_t lx, hx;
-  int exp;
-
-  EXTRACT_WORDS (hx, lx, x);
-  exp = (hx & 0x7ff00000) >> 20;
-
-  if ((exp == 0x7ff) && (hx & 0xf0000 || lx))
-    return (1);
-  else
-    return (0);
-}
-
-#endif /* _DOUBLE_IS_32BITS */
diff --git a/newlib/libm/mathfp/sf_isinf.c b/newlib/libm/mathfp/sf_isinf.c
deleted file mode 100644
index 84ab3f71c..000000000
--- a/newlib/libm/mathfp/sf_isinf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/* @(#)z_isinff.c 1.0 98/08/13 */
-/******************************************************************
- * isinff
- *
- * Input:
- *   x - pointer to a floating point value
- *
- * Output:
- *   An integer that indicates if the number is infinite.
- *
- * Description:
- *   This routine returns an integer that indicates if the number
- *   passed in is infinite (1) or is finite (0).
- *
- *****************************************************************/
-
-#include "fdlibm.h"
-#include "zmath.h"
-
-int 
-_DEFUN (isinff, (float),
-	float x)
-{
-  __uint32_t wx;
-  int exp;
-
-  GET_FLOAT_WORD (wx, x);
-  exp = (wx & 0x7f800000) >> 23;
-
-  if ((exp == 0x7f8) && !(wx & 0xf0000))
-    return (1);
-  else
-    return (0);
-}
-
-#ifdef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (isinf, (double),
-        double x)
-{
-  return isinff ((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
-
-
diff --git a/newlib/libm/mathfp/sf_isnan.c b/newlib/libm/mathfp/sf_isnan.c
deleted file mode 100644
index ac557a6b8..000000000
--- a/newlib/libm/mathfp/sf_isnan.c
+++ /dev/null
@@ -1,48 +0,0 @@
-
-/* @(#)z_isnanf.c 1.0 98/08/13 */
-/******************************************************************
- * isnanf
- *
- * Input:
- *   x - pointer to a floating point value
- *
- * Output:
- *   An integer that indicates if the number is NaN.
- *
- * Description:
- *   This routine returns an integer that indicates if the number
- *   passed in is NaN (1) or is finite (0).
- *
- *****************************************************************/
-
-#include "fdlibm.h"
-#include "zmath.h"
-
-int
-_DEFUN (isnanf, (float),
-        float x)
-{
-  __int32_t wx;
-  int exp;
-
-  GET_FLOAT_WORD (wx, x);
-  exp = (wx & 0x7f800000) >> 23;
-
-  if ((exp == 0x7f8) && (wx & 0x7fffff))
-    return (1);
-  else
-    return (0);
-}
-
-
-#ifdef _DOUBLE_IS_32BITS
-
-int
-_DEFUN (isnan, (double),
-        double x)
-{
-  return isnanf((float) x);
-}
-
-#endif /* defined(_DOUBLE_IS_32BITS) */
-