[src/trunk]: src/common/lib/libc/arch/arm/string Change __XSCALE__ to _ARM_AR...

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

details:   https://anonhg.NetBSD.org/src/rev/a02fae99cf9a
branches:  trunk
changeset: 783258:a02fae99cf9a
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Dec 12 15:46:05 2012 +0000

description:
Change __XSCALE__ to _ARM_ARCH_DWORD_OK so that any cpu with strd can use it.

diffstat:

 common/lib/libc/arch/arm/string/memset.S |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 444b14b1e967 -r a02fae99cf9a common/lib/libc/arch/arm/string/memset.S
--- a/common/lib/libc/arch/arm/string/memset.S  Wed Dec 12 15:43:44 2012 +0000
+++ b/common/lib/libc/arch/arm/string/memset.S  Wed Dec 12 15:46:05 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: memset.S,v 1.1 2005/12/20 19:28:49 christos Exp $      */
+/*     $NetBSD: memset.S,v 1.2 2012/12/12 15:46:05 matt Exp $  */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -102,7 +102,7 @@
 #ifndef _BZERO
        orr     r3, r3, r3, lsl #8      /* Extend value to 16-bits */
 #endif
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_DWORD_OK
        tst     ip, #0x04               /* Quad-align for Xscale */
 #else
        cmp     r1, #0x10
@@ -110,7 +110,7 @@
 #ifndef _BZERO
        orr     r3, r3, r3, lsl #16     /* Extend value to 32-bits */
 #endif
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_DWORD_OK
        subne   r1, r1, #0x04           /* Quad-align if necessary */
        strne   r3, [ip], #0x04
        cmp     r1, #0x10
@@ -123,7 +123,7 @@
        /* Do 128 bytes at a time */
 .Lmemset_loop128:
        subs    r1, r1, #0x80
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_DWORD_OK
        strged  r2, [ip], #0x08
        strged  r2, [ip], #0x08
        strged  r2, [ip], #0x08
@@ -166,7 +166,7 @@
        /* Do 32 bytes at a time */
 .Lmemset_loop32:
        subs    r1, r1, #0x20
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_DWORD_OK
        strged  r2, [ip], #0x08
        strged  r2, [ip], #0x08
        strged  r2, [ip], #0x08
@@ -183,7 +183,7 @@
        adds    r1, r1, #0x10           /* Partially adjust for extra sub */
 
        /* Deal with 16 bytes or more */
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_DWORD_OK
        strged  r2, [ip], #0x08
        strged  r2, [ip], #0x08
 #else
@@ -201,7 +201,7 @@
        bgt     .Lmemset_loop4
        RETc(eq)                        /* Zero length so just exit */
 
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_DWORD_OK
        /* Compensate for 64-bit alignment check */
        adds    r1, r1, #0x04
        RETc(eq)