From owner-svn-src-head@FreeBSD.ORG  Wed Jul  6 00:47:27 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CBB66106566C;
	Wed,  6 Jul 2011 00:47:27 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BBBA88FC19;
	Wed,  6 Jul 2011 00:47:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p660lRLV092324;
	Wed, 6 Jul 2011 00:47:27 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p660lRYm092322;
	Wed, 6 Jul 2011 00:47:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107060047.p660lRYm092322@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 6 Jul 2011 00:47:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223811 - head/contrib/bind9/lib/isc/sparc64/include/isc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Wed, 06 Jul 2011 00:47:27 -0000

Author: dougb
Date: Wed Jul  6 00:47:27 2011
New Revision: 223811
URL: http://svn.freebsd.org/changeset/base/223811

Log:
  Apply bug fixes
  
  Submitted by:	marius

Modified:
  head/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h

Modified: head/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
==============================================================================
--- head/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h	Tue Jul  5 23:31:40 2011	(r223810)
+++ head/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h	Wed Jul  6 00:47:27 2011	(r223811)
@@ -72,9 +72,9 @@ isc_atomic_xadd(isc_int32_t *p, isc_int3
 	for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) {
 		swapped = prev + val;
 		__asm__ volatile(
-			"casa [%1] %2, %3, %0"
-			: "+r"(swapped)
-			: "r"(p), "n"(ASI_P), "r"(prev));
+			"casa [%2] %3, %4, %0"
+			: "+r"(swapped), "=m"(*p)
+			: "r"(p), "n"(ASI_P), "r"(prev), "m"(*p));
 		if (swapped == prev)
 			break;
 	}
@@ -92,10 +92,9 @@ isc_atomic_store(isc_int32_t *p, isc_int
 	for (prev = *(volatile isc_int32_t *)p; ; prev = swapped) {
 		swapped = val;
 		__asm__ volatile(
-			"casa [%1] %2, %3, %0"
-			: "+r"(swapped)
-			: "r"(p), "n"(ASI_P), "r"(prev)
-			: "memory");
+			"casa [%2] %3, %4, %0"
+			: "+r"(swapped), "=m"(*p)
+			: "r"(p), "n"(ASI_P), "r"(prev), "m"(*p));
 		if (swapped == prev)
 			break;
 	}
@@ -111,9 +110,9 @@ isc_atomic_cmpxchg(isc_int32_t *p, isc_i
 	isc_int32_t temp = val;
 
 	__asm__ volatile(
-		"casa [%1] %2, %3, %0"
-		: "+r"(temp)
-		: "r"(p), "n"(ASI_P), "r"(cmpval));
+		"casa [%2] %3, %4, %0"
+		: "+r"(temp), "=m"(*p)
+		: "r"(p), "n"(ASI_P), "r"(cmpval), "m"(*p));
 
 	return (temp);
 }