5de29b
From 1aa79fbb9921281a8aedfe3eea1f273406b5f24c Mon Sep 17 00:00:00 2001
5de29b
From: Rajalakshmi Srinivasaraghavan <raji@linux.vnet.ibm.com>
5de29b
Date: Wed, 30 Jul 2014 11:23:08 -0500
5de29b
Subject: [PATCH] Fix cproj handling of (finite, NaN) arguments (bug 15531).
5de29b
5de29b
commit c980f2f4fe0f5d301f706017a1f7e4e942193ec0
5de29b
Author: Joseph Myers <joseph@codesourcery.com>
5de29b
Date:   Tue Aug 20 19:41:15 2013 +0000
5de29b
5de29b
    Fix cproj handling of (finite, NaN) arguments (bug 15531).
5de29b
5de29b
	* math/s_cprojf.c (__cprojf): Only return an infinity if one part of
5de29b
	argument is infinite.
5de29b
5de29b
This patch is added so as to compile isnan multiarch implementation
5de29b
successfully since __GI___isnanf is missing.This wll be fixed later in master.
5de29b
---
5de29b
 math/s_cprojf.c | 6 ++----
5de29b
 1 file changed, 2 insertions(+), 4 deletions(-)
5de29b
12745e
diff --git glibc-2.17-c758a686/math/s_cprojf.c glibc-2.17-c758a686/math/s_cprojf.c
5de29b
index 6cbc93b..a0f0af9 100644
12745e
--- glibc-2.17-c758a686/math/s_cprojf.c
12745e
+++ glibc-2.17-c758a686/math/s_cprojf.c
5de29b
@@ -1,5 +1,5 @@
5de29b
 /* Compute projection of complex float value to Riemann sphere.
5de29b
-   Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
5de29b
+   Copyright (C) 1997-2014 Free Software Foundation, Inc.
5de29b
    This file is part of the GNU C Library.
5de29b
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
5de29b
 
5de29b
@@ -24,9 +24,7 @@
5de29b
 __complex__ float
5de29b
 __cprojf (__complex__ float x)
5de29b
 {
5de29b
-  if (isnan (__real__ x) && isnan (__imag__ x))
5de29b
-    return x;
5de29b
-  else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
5de29b
+  if (__isinf_nsf (__real__ x) || __isinf_nsf (__imag__ x))
5de29b
     {
5de29b
       __complex__ float res;
5de29b
 
5de29b
-- 
5de29b
1.8.3.1
5de29b