[src/trunk]: src _ARCH_ARM_6 -> _ARM_ARCH_6

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

details:   https://anonhg.NetBSD.org/src/rev/1396138e0575
branches:  trunk
changeset: 782348:1396138e0575
user:      chs <chs%NetBSD.org@localhost>
date:      Mon Oct 29 14:09:38 2012 +0000

description:
_ARCH_ARM_6 -> _ARM_ARCH_6

diffstat:

 common/lib/libc/arch/arm/atomic/atomic_cas_32.S |  4 ++--
 common/lib/libc/arch/arm/atomic/atomic_cas_64.S |  4 ++--
 common/lib/libc/arch/arm/atomic/atomic_cas_8.S  |  4 ++--
 common/lib/libc/arch/arm/atomic/atomic_inc_32.S |  4 ++--
 common/lib/libc/arch/arm/atomic/atomic_inc_64.S |  4 ++--
 sys/arch/arm/arm/bcopyinout.S                   |  6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diffs (102 lines):

diff -r 511d544e43f9 -r 1396138e0575 common/lib/libc/arch/arm/atomic/atomic_cas_32.S
--- a/common/lib/libc/arch/arm/atomic/atomic_cas_32.S   Mon Oct 29 14:01:33 2012 +0000
+++ b/common/lib/libc/arch/arm/atomic/atomic_cas_32.S   Mon Oct 29 14:09:38 2012 +0000
@@ -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_ulong_ni,_atomic_cas_32)
 STRONG_ALIAS(_atomic_cas_ptr,_atomic_cas_32)
 
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
diff -r 511d544e43f9 -r 1396138e0575 common/lib/libc/arch/arm/atomic/atomic_cas_64.S
--- a/common/lib/libc/arch/arm/atomic/atomic_cas_64.S   Mon Oct 29 14:01:33 2012 +0000
+++ b/common/lib/libc/arch/arm/atomic/atomic_cas_64.S   Mon Oct 29 14:09:38 2012 +0000
@@ -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 @@
 
 ATOMIC_OP_ALIAS(atomic_cas_64,_atomic_cas_64)
 
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
diff -r 511d544e43f9 -r 1396138e0575 common/lib/libc/arch/arm/atomic/atomic_cas_8.S
--- a/common/lib/libc/arch/arm/atomic/atomic_cas_8.S    Mon Oct 29 14:01:33 2012 +0000
+++ b/common/lib/libc/arch/arm/atomic/atomic_cas_8.S    Mon Oct 29 14:09:38 2012 +0000
@@ -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 @@
 STRONG_ALIAS(_atomic_cas_char,_atomic_cas_8)
 STRONG_ALIAS(_atomic_cas_uchar,_atomic_cas_8)
 
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
diff -r 511d544e43f9 -r 1396138e0575 common/lib/libc/arch/arm/atomic/atomic_inc_32.S
--- a/common/lib/libc/arch/arm/atomic/atomic_inc_32.S   Mon Oct 29 14:01:33 2012 +0000
+++ b/common/lib/libc/arch/arm/atomic/atomic_inc_32.S   Mon Oct 29 14:09:38 2012 +0000
@@ -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_ulong_nv,_atomic_inc_32_nv)
 STRONG_ALIAS(_atomic_inc_ptr_nv,_atomic_inc_32_nv)
 
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
diff -r 511d544e43f9 -r 1396138e0575 common/lib/libc/arch/arm/atomic/atomic_inc_64.S
--- a/common/lib/libc/arch/arm/atomic/atomic_inc_64.S   Mon Oct 29 14:01:33 2012 +0000
+++ b/common/lib/libc/arch/arm/atomic/atomic_inc_64.S   Mon Oct 29 14:09:38 2012 +0000
@@ -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 @@
        END(_atomic_inc_64_nv)
 ATOMIC_OP_ALIAS(atomic_inc_64_nv,_atomic_inc_64_nv)
 
-#endif /* _ARCH_ARM_6 */
+#endif /* _ARM_ARCH_6 */
diff -r 511d544e43f9 -r 1396138e0575 sys/arch/arm/arm/bcopyinout.S
--- a/sys/arch/arm/arm/bcopyinout.S     Mon Oct 29 14:01:33 2012 +0000
+++ b/sys/arch/arm/arm/bcopyinout.S     Mon Oct 29 14:09:38 2012 +0000
@@ -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 @@
 #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