From owner-svn-src-head@FreeBSD.ORG  Tue Sep  9 13:50:22 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 201B1B81;
 Tue,  9 Sep 2014 13:50:22 +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 0B4C0D97;
 Tue,  9 Sep 2014 13:50:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89DoLBb074215;
 Tue, 9 Sep 2014 13:50:21 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89DoL7v074214;
 Tue, 9 Sep 2014 13:50:21 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201409091350.s89DoL7v074214@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 9 Sep 2014 13:50:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271310 - head/sys/arm/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Sep 2014 13:50:22 -0000

Author: ian
Date: Tue Sep  9 13:50:21 2014
New Revision: 271310
URL: http://svnweb.freebsd.org/changeset/base/271310

Log:
  Rename new to newval in inline asm code, to avoid clashes with C++ new.
  Also rename cmp to cmpval just to keep the asm variable names similar to
  the C variable names.

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

Modified: head/sys/arm/include/atomic.h
==============================================================================
--- head/sys/arm/include/atomic.h	Tue Sep  9 11:38:29 2014	(r271309)
+++ head/sys/arm/include/atomic.h	Tue Sep  9 13:50:21 2014	(r271310)
@@ -268,12 +268,12 @@ atomic_cmpset_64(volatile uint64_t *p, u
 	__asm __volatile(
 		"1:          \n"
 		"   ldrexd   %[tmp], [%[ptr]]\n"
-		"   teq      %Q[tmp], %Q[cmp]\n"
+		"   teq      %Q[tmp], %Q[cmpval]\n"
 		"   itee eq  \n"
-		"   teqeq    %R[tmp], %R[cmp]\n"
+		"   teqeq    %R[tmp], %R[cmpval]\n"
 		"   movne    %[ret], #0\n"
 		"   bne      2f\n"
-		"   strexd   %[ret], %[new], [%[ptr]]\n"
+		"   strexd   %[ret], %[newval], [%[ptr]]\n"
 		"   teq      %[ret], #0\n"
 		"   it ne    \n"
 		"   bne      1b\n"
@@ -282,8 +282,8 @@ atomic_cmpset_64(volatile uint64_t *p, u
 		:   [ret]    "=&r"  (ret), 
 		    [tmp]    "=&r"  (tmp)
 		:   [ptr]    "r"    (p), 
-		    [cmp]    "r"    (cmpval), 
-		    [new]    "r"    (newval)
+		    [cmpval] "r"    (cmpval), 
+		    [newval] "r"    (newval)
 		:   "cc", "memory");
 	return (ret);
 }