Module Name: src
Committed By: matt
Date: Sat Sep 5 04:03:43 UTC 2009
Modified Files:
src/common/lib/libc/arch/mips/atomic [matt-nb5-mips64]: Makefile.inc
Log Message:
Enable the new atomic op routines on mips64e[bl].
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.8.1 \
src/common/lib/libc/arch/mips/atomic/Makefile.inc
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 src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8.8.1
--- src/common/lib/libc/arch/mips/atomic/Makefile.inc:1.8 Mon Sep 29 08:43:00 2008
+++ src/common/lib/libc/arch/mips/atomic/Makefile.inc Sat Sep 5 04:03:42 2009
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.8 2008/09/29 08:43:00 ad Exp $
+# $NetBSD: Makefile.inc,v 1.8.8.1 2009/09/05 04:03:42 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 \
@@ -9,14 +10,23 @@
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 membar_ops.o
+ atomic_swap_64_cas.c
-.endif
+CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+.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
+.endif
+.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
-CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
+.else
+SRCS+= membar_ops.S atomic_init_cas.c
+.endif
.endif
