From owner-svn-src-all@freebsd.org  Thu Feb  2 01:33:10 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29C33CCCD8F;
 Thu,  2 Feb 2017 01:33:10 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 EBB17D32;
 Thu,  2 Feb 2017 01:33:09 +0000 (UTC) (envelope-from mjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v121X9eJ000792;
 Thu, 2 Feb 2017 01:33:09 GMT (envelope-from mjg@FreeBSD.org)
Received: (from mjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v121X95M000791;
 Thu, 2 Feb 2017 01:33:09 GMT (envelope-from mjg@FreeBSD.org)
Message-Id: <201702020133.v121X95M000791@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org
 using -f
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Thu, 2 Feb 2017 01:33:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313080 - head/sys/i386/include
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Feb 2017 01:33:10 -0000

Author: mjg
Date: Thu Feb  2 01:33:08 2017
New Revision: 313080
URL: https://svnweb.freebsd.org/changeset/base/313080

Log:
  i386: fixup fcmpset
  
  An incorrect output specifier was used which worked with clang by accident,
  but breaks with the in-tree gcc version.
  
  While here plug a whitespace nit.
  
  Reported by:	bde

Modified:
  head/sys/i386/include/atomic.h

Modified: head/sys/i386/include/atomic.h
==============================================================================
--- head/sys/i386/include/atomic.h	Thu Feb  2 01:21:55 2017	(r313079)
+++ head/sys/i386/include/atomic.h	Thu Feb  2 01:33:08 2017	(r313080)
@@ -225,9 +225,9 @@ atomic_fcmpset_int(volatile u_int *dst, 
 	"	cmpxchgl %3,%1 ;	"
 	"       sete	%0 ;		"
 	"# atomic_cmpset_int"
-	: "=r" (res),			/* 0 */
+	: "=q" (res),			/* 0 */
 	  "+m" (*dst),			/* 1 */
-	  "+a" (*expect)			/* 2 */
+	  "+a" (*expect)		/* 2 */
 	: "r" (src)			/* 3 */
 	: "memory", "cc");
 	return (res);