[src/trunk]: src/common/lib/libc/arch/arm/atomic Move arm sync_* changes to M...

[justin <justin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/52ef69cd40a7
branches:  trunk
changeset: 338303:52ef69cd40a7
user:      justin <justin%NetBSD.org@localhost>
date:      Sun May 17 22:08:24 2015 +0000

description:
Move arm sync_* changes to Makefile.inc

diffstat:

 common/lib/libc/arch/arm/atomic/Makefile.inc                   |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S         |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S         |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S        |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S          |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S         |  4 ++--
 common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S         |  4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diffs (198 lines):

diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/Makefile.inc
--- a/common/lib/libc/arch/arm/atomic/Makefile.inc      Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/Makefile.inc      Sun May 17 22:08:24 2015 +0000
@@ -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_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
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S
--- a/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_1.S    Sun May 17 22:08:24 2015 +0000
@@ -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.
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S
--- a/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_2.S    Sun May 17 22:08:24 2015 +0000
@@ -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.
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S
--- a/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_4.S    Sun May 17 22:08:24 2015 +0000
@@ -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.
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_bool_compare_and_swap_8.S    Sun May 17 22:08:24 2015 +0000
@@ -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.
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_fetch_and_add_8.S    Sun May 17 22:08:24 2015 +0000
@@ -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}
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_fetch_and_and_8.S    Sun May 17 22:08:24 2015 +0000
@@ -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}
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S   Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_fetch_and_nand_8.S   Sun May 17 22:08:24 2015 +0000
@@ -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}
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S     Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_fetch_and_or_8.S     Sun May 17 22:08:24 2015 +0000
@@ -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}
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_fetch_and_sub_8.S    Sun May 17 22:08:24 2015 +0000
@@ -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}
diff -r abde3d3bff8e -r 52ef69cd40a7 common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S
--- a/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S    Sun May 17 20:57:11 2015 +0000
+++ b/common/lib/libc/arch/arm/atomic/sync_fetch_and_xor_8.S    Sun May 17 22:08:24 2015 +0000
@@ -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}