From owner-svn-src-stable@FreeBSD.ORG  Sat May 17 23:20:30 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0A521227;
 Sat, 17 May 2014 23:20:30 +0000 (UTC)
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 EB49120FA;
 Sat, 17 May 2014 23:20:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HNKTxt079118;
 Sat, 17 May 2014 23:20:29 GMT (envelope-from ian@svn.freebsd.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HNKTjS079117;
 Sat, 17 May 2014 23:20:29 GMT (envelope-from ian@svn.freebsd.org)
Message-Id: <201405172320.s4HNKTjS079117@svn.freebsd.org>
From: Ian Lepore <ian@FreeBSD.org>
Date: Sat, 17 May 2014 23:20:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r266377 - stable/10/lib/libc/arm/gen
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 17 May 2014 23:20:30 -0000

Author: ian
Date: Sat May 17 23:20:29 2014
New Revision: 266377
URL: http://svnweb.freebsd.org/changeset/base/266377

Log:
  MFC 265059: Set the new floating point exception mask correctly.

Modified:
  stable/10/lib/libc/arm/gen/fpsetmask_vfp.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/arm/gen/fpsetmask_vfp.c
==============================================================================
--- stable/10/lib/libc/arm/gen/fpsetmask_vfp.c	Sat May 17 23:16:18 2014	(r266376)
+++ stable/10/lib/libc/arm/gen/fpsetmask_vfp.c	Sat May 17 23:20:29 2014	(r266377)
@@ -45,7 +45,7 @@ fpsetmask(fp_except_t mask)
 	__asm __volatile("vmrs %0, fpscr" : "=&r"(old));
 	mask = (mask & FP_X_MASK) << 8;
 	new = (old & ~(FP_X_MASK << 8)) | mask;
-	__asm __volatile("vmsr fpscr, %0" : : "r"(old));
+	__asm __volatile("vmsr fpscr, %0" : : "r"(new));
 
 	return ((old >> 8) & FP_X_MASK);
 }