Module Name: src
Committed By: joerg
Date: Sun Jul 6 01:19:45 UTC 2014
Modified Files:
src/common/lib/libc/atomic: atomic_load.c atomic_store.c
Log Message:
Add unused memory model argument to make GCC happy.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/atomic/atomic_load.c \
src/common/lib/libc/atomic/atomic_store.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_load.c
diff -u src/common/lib/libc/atomic/atomic_load.c:1.1 src/common/lib/libc/atomic/atomic_load.c:1.2
--- src/common/lib/libc/atomic/atomic_load.c:1.1 Sat Jul 5 20:44:46 2014
+++ src/common/lib/libc/atomic/atomic_load.c Sun Jul 6 01:19:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_load.c,v 1.1 2014/07/05 20:44:46 joerg Exp $ */
+/* $NetBSD: atomic_load.c,v 1.2 2014/07/06 01:19:45 joerg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: atomic_load.c,v 1.1 2014/07/05 20:44:46 joerg Exp $");
+__RCSID("$NetBSD: atomic_load.c,v 1.2 2014/07/06 01:19:45 joerg Exp $");
#include "atomic_op_namespace.h"
@@ -35,9 +35,9 @@ __RCSID("$NetBSD: atomic_load.c,v 1.1 20
#include <sys/atomic.h>
#define atomic_load_n(n,b) \
-uint ## b ## _t __atomic_load_ ## n(volatile uint ## b ## _t *); \
+uint ## b ## _t __atomic_load_ ## n(volatile uint ## b ## _t *, int); \
uint ## b ## _t \
-__atomic_load_ ## n(volatile uint ## b ## _t *ptr) \
+__atomic_load_ ## n(volatile uint ## b ## _t *ptr, int memmodel) \
{ \
uint## b ##_t val; \
membar_enter(); \
Index: src/common/lib/libc/atomic/atomic_store.c
diff -u src/common/lib/libc/atomic/atomic_store.c:1.1 src/common/lib/libc/atomic/atomic_store.c:1.2
--- src/common/lib/libc/atomic/atomic_store.c:1.1 Sat Jul 5 20:44:46 2014
+++ src/common/lib/libc/atomic/atomic_store.c Sun Jul 6 01:19:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_store.c,v 1.1 2014/07/05 20:44:46 joerg Exp $ */
+/* $NetBSD: atomic_store.c,v 1.2 2014/07/06 01:19:45 joerg Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: atomic_store.c,v 1.1 2014/07/05 20:44:46 joerg Exp $");
+__RCSID("$NetBSD: atomic_store.c,v 1.2 2014/07/06 01:19:45 joerg Exp $");
#include "atomic_op_namespace.h"
@@ -35,9 +35,10 @@ __RCSID("$NetBSD: atomic_store.c,v 1.1 2
#include <sys/atomic.h>
#define atomic_store_n(n,b) \
-void __atomic_store_ ## n(volatile uint ## b ## _t *, uint ## b ## _t); \
+void __atomic_store_ ## n(volatile uint ## b ## _t *, uint ## b ## _t, int); \
void \
-__atomic_store_ ## n(volatile uint ## b ## _t *ptr, uint ## b ## _t val) \
+__atomic_store_ ## n(volatile uint ## b ## _t *ptr, uint ## b ## _t val, \
+ int memmodel) \
{ \
membar_enter(); \
*ptr = val; \
