Module Name: src
Committed By: chs
Date: Mon Oct 29 14:09:38 UTC 2012
Modified Files:
src/common/lib/libc/arch/arm/atomic: atomic_cas_32.S atomic_cas_64.S
atomic_cas_8.S atomic_inc_32.S atomic_inc_64.S
src/sys/arch/arm/arm: bcopyinout.S
Log Message:
_ARCH_ARM_6 -> _ARM_ARCH_6
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/atomic/atomic_cas_32.S \
src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S \
src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/arm/bcopyinout.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/atomic_cas_32.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_32.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_cas_32.S:1.4
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_32.S:1.3 Fri Aug 31 23:41:52 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_32.S Mon Oct 29 14:09:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_32.S,v 1.3 2012/08/31 23:41:52 matt Exp $ */
+/* $NetBSD: atomic_cas_32.S,v 1.4 2012/10/29 14:09:38 chs Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -68,4 +68,4 @@ STRONG_ALIAS(_atomic_cas_uint_ni,_atomic
STRONG_ALIAS(_atomic_cas_ulong_ni,_atomic_cas_32)
STRONG_ALIAS(_atomic_cas_ptr,_atomic_cas_32)
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S:1.4
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S:1.3 Fri Aug 31 23:41:52 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_8.S Mon Oct 29 14:09:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_8.S,v 1.3 2012/08/31 23:41:52 matt Exp $ */
+/* $NetBSD: atomic_cas_8.S,v 1.4 2012/10/29 14:09:38 chs Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -56,4 +56,4 @@ ATOMIC_OP_ALIAS(atomic_cas_8,_atomic_cas
STRONG_ALIAS(_atomic_cas_char,_atomic_cas_8)
STRONG_ALIAS(_atomic_cas_uchar,_atomic_cas_8)
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S:1.4
--- src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S:1.3 Fri Aug 31 23:41:52 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S Mon Oct 29 14:09:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_inc_32.S,v 1.3 2012/08/31 23:41:52 matt Exp $ */
+/* $NetBSD: atomic_inc_32.S,v 1.4 2012/10/29 14:09:38 chs Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -76,4 +76,4 @@ STRONG_ALIAS(_atomic_inc_uint_nv,_atomic
STRONG_ALIAS(_atomic_inc_ulong_nv,_atomic_inc_32_nv)
STRONG_ALIAS(_atomic_inc_ptr_nv,_atomic_inc_32_nv)
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.1 src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.2
--- src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S:1.1 Tue Sep 11 20:51:25 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_cas_64.S Mon Oct 29 14:09:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_cas_64.S,v 1.1 2012/09/11 20:51:25 matt Exp $ */
+/* $NetBSD: atomic_cas_64.S,v 1.2 2012/10/29 14:09:38 chs Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,4 +66,4 @@ ENTRY_NP(_atomic_cas_64)
ATOMIC_OP_ALIAS(atomic_cas_64,_atomic_cas_64)
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
Index: src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S:1.2 src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S:1.3
--- src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S:1.2 Thu Sep 13 00:36:12 2012
+++ src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S Mon Oct 29 14:09:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_inc_64.S,v 1.2 2012/09/13 00:36:12 matt Exp $ */
+/* $NetBSD: atomic_inc_64.S,v 1.3 2012/10/29 14:09:38 chs Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -69,4 +69,4 @@ ENTRY_NP(_atomic_inc_64_nv)
END(_atomic_inc_64_nv)
ATOMIC_OP_ALIAS(atomic_inc_64_nv,_atomic_inc_64_nv)
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
Index: src/sys/arch/arm/arm/bcopyinout.S
diff -u src/sys/arch/arm/arm/bcopyinout.S:1.18 src/sys/arch/arm/arm/bcopyinout.S:1.19
--- src/sys/arch/arm/arm/bcopyinout.S:1.18 Tue Jul 31 06:54:16 2012
+++ src/sys/arch/arm/arm/bcopyinout.S Mon Oct 29 14:09:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout.S,v 1.18 2012/07/31 06:54:16 matt Exp $ */
+/* $NetBSD: bcopyinout.S,v 1.19 2012/10/29 14:09:38 chs Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -51,7 +51,7 @@
#include "bcopyinout_xscale.S"
#else
-RCSID("$NetBSD: bcopyinout.S,v 1.18 2012/07/31 06:54:16 matt Exp $")
+RCSID("$NetBSD: bcopyinout.S,v 1.19 2012/10/29 14:09:38 chs Exp $")
.text
.align 0
@@ -65,7 +65,7 @@ RCSID("$NetBSD: bcopyinout.S,v 1.18 2012
#define RESTORE_REGS ldmfd sp!, {r4-r11, r14}
#endif
-#if defined(__XSCALE__) || defined(_ARCH_ARM_6)
+#if defined(__XSCALE__) || defined(_ARM_ARCH_6)
#define HELLOCPP #
#define PREFETCH(rx,o) pld [ rx , HELLOCPP (o) ]
#else
