From owner-svn-src-all@FreeBSD.ORG  Mon Jun 15 20:47:27 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 09141DBC;
 Mon, 15 Jun 2015 20:47:27 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id EC9415F4;
 Mon, 15 Jun 2015 20:47:26 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FKlQ6I062964;
 Mon, 15 Jun 2015 20:47:26 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FKlQ4I062963;
 Mon, 15 Jun 2015 20:47:26 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201506152047.t5FKlQ4I062963@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org
 using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 15 Jun 2015 20:47:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284428 - head/lib/msun/src
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2015 20:47:27 -0000

Author: tijl
Date: Mon Jun 15 20:47:26 2015
New Revision: 284428
URL: https://svnweb.freebsd.org/changeset/base/284428

Log:
  Follow up to r284427: fix NaN mixing for ctanhf too.

Modified:
  head/lib/msun/src/s_ctanhf.c

Modified: head/lib/msun/src/s_ctanhf.c
==============================================================================
--- head/lib/msun/src/s_ctanhf.c	Mon Jun 15 20:40:44 2015	(r284427)
+++ head/lib/msun/src/s_ctanhf.c	Mon Jun 15 20:47:26 2015	(r284428)
@@ -51,7 +51,8 @@ ctanhf(float complex z)
 
 	if (ix >= 0x7f800000) {
 		if (ix & 0x7fffff)
-			return (CMPLXF(x, (y == 0 ? y : x * y)));
+			return (CMPLXF((x + 0) * (y + 0),
+			    y == 0 ? y : (x + 0) * (y + 0)));
 		SET_FLOAT_WORD(x, hx - 0x40000000);
 		return (CMPLXF(x,
 		    copysignf(0, isinf(y) ? y : sinf(y) * cosf(y))));