From 234cf97f858cc122f816a72a4e41a2191df5b005 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Wed, 10 Aug 2005 21:02:28 +0000 Subject: 2005-08-10 Stephen Huw Clarke * libm/common/sf_fmax.c: Fix to properly handle NaNs. * libm/common/s_max.c: Ditto. * libm/common/sf_fmin.c: Ditto. * libm/common/s_min.c: Ditto. --- newlib/libm/common/s_fmax.c | 4 ++-- newlib/libm/common/s_fmin.c | 4 ++-- newlib/libm/common/sf_fmax.c | 4 ++-- newlib/libm/common/sf_fmin.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'newlib/libm') diff --git a/newlib/libm/common/s_fmax.c b/newlib/libm/common/s_fmax.c index 2de04efab..53e1559e3 100644 --- a/newlib/libm/common/s_fmax.c +++ b/newlib/libm/common/s_fmax.c @@ -17,9 +17,9 @@ #endif { if (__fpclassifyd(x) == FP_NAN) - return x; - if (__fpclassifyd(y) == FP_NAN) return y; + if (__fpclassifyd(y) == FP_NAN) + return x; return x > y ? x : y; } diff --git a/newlib/libm/common/s_fmin.c b/newlib/libm/common/s_fmin.c index f9eb51cdd..65e0b1c6d 100644 --- a/newlib/libm/common/s_fmin.c +++ b/newlib/libm/common/s_fmin.c @@ -17,9 +17,9 @@ #endif { if (__fpclassifyd(x) == FP_NAN) - return x; - if (__fpclassifyd(y) == FP_NAN) return y; + if (__fpclassifyd(y) == FP_NAN) + return x; return x < y ? x : y; } diff --git a/newlib/libm/common/sf_fmax.c b/newlib/libm/common/sf_fmax.c index 292b99edf..ac1bf46f5 100644 --- a/newlib/libm/common/sf_fmax.c +++ b/newlib/libm/common/sf_fmax.c @@ -15,9 +15,9 @@ #endif { if (__fpclassifyf(x) == FP_NAN) - return x; - if (__fpclassifyf(y) == FP_NAN) return y; + if (__fpclassifyf(y) == FP_NAN) + return x; return x > y ? x : y; } diff --git a/newlib/libm/common/sf_fmin.c b/newlib/libm/common/sf_fmin.c index 4ef3510aa..f0e344455 100644 --- a/newlib/libm/common/sf_fmin.c +++ b/newlib/libm/common/sf_fmin.c @@ -15,9 +15,9 @@ #endif { if (__fpclassifyf(x) == FP_NAN) - return x; - if (__fpclassifyf(y) == FP_NAN) return y; + if (__fpclassifyf(y) == FP_NAN) + return x; return x < y ? x : y; } -- cgit v1.2.3