Module Name: src
Committed By: matt
Date: Sat Sep 5 18:52:32 UTC 2009
Modified Files:
src/common/lib/libc/arch/mips/atomic [matt-nb5-mips64]: Makefile.inc
membar_ops.S
src/sys/arch/mips/mips [matt-nb5-mips64]: lock_stubs.S
Log Message:
Resolve some conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.8.8.1 -r1.8.8.2 \
src/common/lib/libc/arch/mips/atomic/Makefile.inc
cvs rdiff -u -r1.3.10.1 -r1.3.10.2 \
src/common/lib/libc/arch/mips/atomic/membar_ops.S
cvs rdiff -u -r1.9.18.3 -r1.9.18.4 src/sys/arch/mips/mips/lock_stubs.S
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/arch/mips/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.1 src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.2
--- src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.1 Sat Sep 5 04:03:42 2009
+++ src/common/lib/libc/arch/mips/atomic/Makefile.inc Sat Sep 5 18:52:32 2009
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile.inc,v 1.8.8.1 2009/09/05 04:03:42 matt Exp $
+# $NetBSD: Makefile.inc,v 1.8.8.2 2009/09/05 18:52:32 matt Exp $
.if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread")
.if ${MACHINE_ARCH:Mmips64*} == ""
-SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c atomic_and_32_cas.c \
- atomic_and_32_nv_cas.c atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
- atomic_inc_32_cas.c atomic_inc_32_nv_cas.c atomic_or_32_cas.c \
- atomic_or_32_nv_cas.c atomic_swap_32_cas.c atomic_add_64_cas.c \
- atomic_add_64_nv_cas.c atomic_and_64_cas.c atomic_and_64_nv_cas.c \
- atomic_dec_64_cas.c atomic_dec_64_nv_cas.c atomic_inc_64_cas.c \
- atomic_inc_64_nv_cas.c atomic_or_64_cas.c atomic_or_64_nv_cas.c \
+SRCS+= atomic_add_32_cas.c atomic_add_32_nv_cas.c \
+ atomic_and_32_cas.c atomic_and_32_nv_cas.c \
+ atomic_dec_32_cas.c atomic_dec_32_nv_cas.c \
+ atomic_inc_32_cas.c atomic_inc_32_nv_cas.c \
+ atomic_or_32_cas.c atomic_or_32_nv_cas.c \
+ atomic_swap_32_cas.c \
+ atomic_add_64_cas.c atomic_add_64_nv_cas.c \
+ atomic_and_64_cas.c atomic_and_64_nv_cas.c \
+ atomic_dec_64_cas.c atomic_dec_64_nv_cas.c \
+ atomic_inc_64_cas.c atomic_inc_64_nv_cas.c \
+ atomic_or_64_cas.c atomic_or_64_nv_cas.c \
atomic_swap_64_cas.c
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
@@ -17,21 +21,19 @@
.else
SRCS+= atomic_add.S atomic_dec.S atomic_inc.S
SRCS+= atomic_and.S atomic_or.S
-SRCS+= atomic_cas.S atomic_swap.S
+SRCS+= atomic_swap.S
.endif
+
+SRCS+= membar_ops.S
.endif
+
.if defined(LIB) && (${LIB} == "c" || ${LIB} == "pthread")
.if ${MACHINE_ARCH:Mmips64*} == ""
-SRCS+= membar_ops_nop.c atomic_init_testset.c atomic_cas_up.S
+SRCS+= atomic_init_testset.c atomic_cas_up.S
.else
-SRCS+= membar_ops.S atomic_init_cas.c
+SRCS+= atomic_cas.S atomic_init_cas.c
.endif
.endif
-.if defined(LIB) && (${LIB} == "kern")
-
-SRCS+= membar_ops.S
-
-.endif
Index: src/common/lib/libc/arch/mips/atomic/membar_ops.S
diff -u src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.3.10.1 src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.3.10.2
--- src/common/lib/libc/arch/mips/atomic/membar_ops.S:1.3.10.1 Sat Sep 5 04:03:01 2009
+++ src/common/lib/libc/arch/mips/atomic/membar_ops.S Sat Sep 5 18:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: membar_ops.S,v 1.3.10.1 2009/09/05 04:03:01 matt Exp $ */
+/* $NetBSD: membar_ops.S,v 1.3.10.2 2009/09/05 18:52:32 matt Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -49,15 +49,23 @@
#define SYNC sync
#endif
-#ifdef SYNC
.text
LEAF(_membar_sync)
- SYNC
j ra
+#ifdef SYNC
+ SYNC
+#else
nop
+#endif
END(_membar_sync)
+#ifdef _KERNEL
+STRONG_ALIAS(mb_read, _membar_sync)
+STRONG_ALIAS(mb_write, _membar_sync)
+STRONG_ALIAS(mb_memory, _membar_sync)
+#endif
+
ATOMIC_OP_ALIAS(membar_sync,_membar_sync)
ATOMIC_OP_ALIAS(membar_enter,_membar_sync)
STRONG_ALIAS(_membar_enter,_membar_sync)
@@ -67,4 +75,3 @@
STRONG_ALIAS(_membar_producer,_membar_sync)
ATOMIC_OP_ALIAS(membar_consumer,_membar_sync)
STRONG_ALIAS(_membar_consumer,_membar_sync)
-#endif /* SYNC */
Index: src/sys/arch/mips/mips/lock_stubs.S
diff -u src/sys/arch/mips/mips/lock_stubs.S:1.9.18.3 src/sys/arch/mips/mips/lock_stubs.S:1.9.18.4
--- src/sys/arch/mips/mips/lock_stubs.S:1.9.18.3 Fri Aug 21 13:04:55 2009
+++ src/sys/arch/mips/mips/lock_stubs.S Sat Sep 5 18:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.9.18.3 2009/08/21 13:04:55 uebayasi Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.9.18.4 2009/09/05 18:52:32 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -48,18 +48,8 @@
#else
#define SYNC /* nothing */
#define BDSYNC nop
-#endif /* MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR) */
+#endif /* MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR) */
-STRONG_ALIAS(mb_read, mb_memory)
-STRONG_ALIAS(mb_write, mb_memory)
-
-/*
- * void mb_memory(void);
- */
-LEAF(mb_memory)
- j ra
- BDSYNC
-END(mb_memory)
#if MIPS_HAS_LLSC != 0
