Module Name: src
Committed By: justin
Date: Sun May 17 22:08:24 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
sync_bool_compare_and_swap_1.S sync_bool_compare_and_swap_2.S
sync_bool_compare_and_swap_4.S sync_bool_compare_and_swap_8.S
sync_fetch_and_add_8.S sync_fetch_and_and_8.S
sync_fetch_and_nand_8.S sync_fetch_and_or_8.S
sync_fetch_and_sub_8.S sync_fetch_and_xor_8.S
Log Message:
Move arm sync_* changes to Makefile.inc
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/common/lib/libc/arch/arm/atomic/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S
cvs rdiff -u -r1.3 -r1.4 \
src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S
cvs rdiff -u -r1.4 -r1.5 \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S \
src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.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/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.26 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.27
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.26 Tue Oct 14 07:25:05 2014
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/10/14 07:25:05 martin Exp $
+# $NetBSD: Makefile.inc,v 1.27 2015/05/17 22:08:24 justin Exp $
.ifnmake obj
.include "${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk"
@@ -42,7 +42,7 @@ SRCS.atomic+= atomic_inc_32.S atomic_inc
SRCS.atomic+= atomic_sub_64.S
SRCS.atomic+= atomic_swap.S atomic_swap_16.S atomic_swap_64.S
SRCS.atomic+= membar_ops.S
-.if defined(LIB) && ${LIB} != "kern"
+.if defined(LIB) && ${LIB} != "kern" && ${LIB} != "rump"
.for op in add and nand or sub xor
SRCS.atomic+= sync_fetch_and_${op}_8.S
.endfor
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S:1.2 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S:1.3
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S:1.2 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_1.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_1.S,v 1.3 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
/*
* ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel.
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S:1.2 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S:1.3
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S:1.2 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_2.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_2.S,v 1.3 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
/*
* ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel.
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S:1.2 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S:1.3
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S:1.2 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_4.S,v 1.2 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_4.S,v 1.3 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
/*
* ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel.
Index: src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S:1.3 src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S:1.4
--- src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S:1.3 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_bool_compare_and_swap_8.S,v 1.3 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_bool_compare_and_swap_8.S,v 1.4 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
/*
* ARMv6 has load-exclusive/store-exclusive which works for both user
* and kernel.
Index: src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S:1.3 src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S:1.4
--- src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S:1.3 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_fetch_and_nand_8.S,v 1.3 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_fetch_and_nand_8.S,v 1.4 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
ENTRY_NP(__sync_fetch_and_nand_8)
push {r4-r7}
Index: src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S:1.4 src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S:1.5
--- src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S:1.4 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_fetch_and_add_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_fetch_and_add_8.S,v 1.5 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
ENTRY_NP(__sync_fetch_and_add_8)
push {r4-r7}
Index: src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S:1.4 src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S:1.5
--- src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S:1.4 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_fetch_and_and_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_fetch_and_and_8.S,v 1.5 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
ENTRY_NP(__sync_fetch_and_and_8)
push {r4-r7}
Index: src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S:1.4 src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S:1.5
--- src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S:1.4 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_fetch_and_or_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_fetch_and_or_8.S,v 1.5 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
ENTRY_NP(__sync_fetch_and_or_8)
push {r4-r7}
Index: src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S:1.4 src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S:1.5
--- src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S:1.4 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_fetch_and_sub_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_fetch_and_sub_8.S,v 1.5 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
ENTRY_NP(__sync_fetch_and_sub_8)
push {r4-r7}
Index: src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S
diff -u src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S:1.4 src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S:1.5
--- src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S:1.4 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S Sun May 17 22:08:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sync_fetch_and_xor_8.S,v 1.4 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: sync_fetch_and_xor_8.S,v 1.5 2015/05/17 22:08:24 justin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include "atomic_op_asm.h"
-#if defined(_ARM_ARCH_6) && !defined(_RUMPKERNEL)
+#if defined(_ARM_ARCH_6)
ENTRY_NP(__sync_fetch_and_xor_8)
push {r4-r7}
