From owner-svn-src-head@FreeBSD.ORG  Sat Jun 15 08:23:53 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id B5B792D8;
 Sat, 15 Jun 2013 08:23:53 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A6C481DEA;
 Sat, 15 Jun 2013 08:23:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5F8Nr4w089580;
 Sat, 15 Jun 2013 08:23:53 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5F8NrRW089579;
 Sat, 15 Jun 2013 08:23:53 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201306150823.r5F8NrRW089579@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sat, 15 Jun 2013 08:23:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251783 - head/sys/sparc64/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.14
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: Sat, 15 Jun 2013 08:23:53 -0000

Author: ed
Date: Sat Jun 15 08:23:53 2013
New Revision: 251783
URL: http://svnweb.freebsd.org/changeset/base/251783

Log:
  Remove conflicting macros from SPARC64's atomic(9) header.
  
  The atomic_load() and atomic_store() macros conflict with the equally
  named macros from <stdatomic.h>. Remove them, as they are only used to
  implement functions that are not present on any of the other
  architectures.

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

Modified: head/sys/sparc64/include/atomic.h
==============================================================================
--- head/sys/sparc64/include/atomic.h	Sat Jun 15 08:21:54 2013	(r251782)
+++ head/sys/sparc64/include/atomic.h	Sat Jun 15 08:23:53 2013	(r251783)
@@ -133,12 +133,9 @@
 	t;								\
 })
 
-#define	atomic_load(p, sz)						\
-	atomic_cas((p), 0, 0, sz)
-
 #define	atomic_load_acq(p, sz) ({					\
 	itype(sz) v;							\
-	v = atomic_load((p), sz);					\
+	v = atomic_cas((p), 0, 0, sz);					\
 	__compiler_membar();						\
 	v;								\
 })
@@ -153,8 +150,9 @@
 	e;								\
 })
 
-#define	atomic_store(p, v, sz) do {					\
+#define	atomic_store_rel(p, v, sz) do {					\
 	itype(sz) e, r;							\
+	membar(LoadStore | StoreStore);					\
 	for (e = *(volatile itype(sz) *)(p);; e = r) {			\
 		r = atomic_cas((p), e, (v), sz);			\
 		if (r == e)						\
@@ -162,11 +160,6 @@
 	}								\
 } while (0)
 
-#define	atomic_store_rel(p, v, sz) do {					\
-	membar(LoadStore | StoreStore);					\
-	atomic_store((p), (v), sz);					\
-} while (0)
-
 #define	ATOMIC_GEN(name, ptype, vtype, atype, sz)			\
 									\
 static __inline vtype							\
@@ -267,11 +260,6 @@ atomic_subtract_rel_ ## name(volatile pt
 }									\
 									\
 static __inline void							\
-atomic_store_ ## name(volatile ptype p, vtype v)			\
-{									\
-	atomic_store((p), (v), sz);					\
-}									\
-static __inline void							\
 atomic_store_rel_ ## name(volatile ptype p, vtype v)			\
 {									\
 	atomic_store_rel((p), (v), sz);					\