diff options
| author | cognet <cognet@FreeBSD.org> | 2007-10-13 12:06:31 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2007-10-13 12:06:31 +0000 |
| commit | 270e0a1e333630cb522d30b5876a6c45b6b49902 (patch) | |
| tree | 1d0dce94239dc4c00deeb977d02bf49f6b8ef634 /lib | |
| parent | 746a165a980ad41dc063edac7f0b9495c241313f (diff) | |
| download | FreeBSD-src-270e0a1e333630cb522d30b5876a6c45b6b49902.zip FreeBSD-src-270e0a1e333630cb522d30b5876a6c45b6b49902.tar.gz | |
MFKernel: do not use __XSCALE__ to detect if clz/pld/ldrd/strd are
available, use _ARM_ARCH_5/_ARM_ARCH_5E instead.
MFC After: 3 days
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/arm/string/ffs.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/string/memcpy.S | 2 | ||||
| -rw-r--r-- | lib/libc/arm/string/memset.S | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/libc/arm/string/ffs.S b/lib/libc/arm/string/ffs.S index 223d55d..af4e118 100644 --- a/lib/libc/arm/string/ffs.S +++ b/lib/libc/arm/string/ffs.S @@ -49,7 +49,7 @@ ENTRY(ffs) /* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */ rsb r1, r0, #0 ands r0, r0, r1 -#ifndef __XSCALE__ +#ifndef _ARM_ARCH_5 /* * now r0 has at most one set bit, call this X * if X = 0, all further instructions are skipped diff --git a/lib/libc/arm/string/memcpy.S b/lib/libc/arm/string/memcpy.S index 1d17b93..3628652 100644 --- a/lib/libc/arm/string/memcpy.S +++ b/lib/libc/arm/string/memcpy.S @@ -2,7 +2,7 @@ #include <machine/asm.h> __FBSDID("$FreeBSD$"); -#if !defined(__XSCALE__) || defined(_STANDALONE) +#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE) #include "memcpy_arm.S" #else #include "memcpy_xscale.S" diff --git a/lib/libc/arm/string/memset.S b/lib/libc/arm/string/memset.S index 1e97846..5387aab 100644 --- a/lib/libc/arm/string/memset.S +++ b/lib/libc/arm/string/memset.S @@ -103,15 +103,15 @@ ENTRY(memset) #ifndef _BZERO orr r3, r3, r3, lsl #8 /* Extend value to 16-bits */ #endif -#ifdef __XSCALE__ - tst ip, #0x04 /* Quad-align for Xscale */ +#ifdef _ARM_ARCH_5E + tst ip, #0x04 /* Quad-align for armv5e */ #else cmp r1, #0x10 #endif #ifndef _BZERO orr r3, r3, r3, lsl #16 /* Extend value to 32-bits */ #endif -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E subne r1, r1, #0x04 /* Quad-align if necessary */ strne r3, [ip], #0x04 cmp r1, #0x10 @@ -124,7 +124,7 @@ ENTRY(memset) /* Do 128 bytes at a time */ .Lmemset_loop128: subs r1, r1, #0x80 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -167,7 +167,7 @@ ENTRY(memset) /* Do 32 bytes at a time */ .Lmemset_loop32: subs r1, r1, #0x20 -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 strged r2, [ip], #0x08 @@ -184,7 +184,7 @@ ENTRY(memset) adds r1, r1, #0x10 /* Partially adjust for extra sub */ /* Deal with 16 bytes or more */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E strged r2, [ip], #0x08 strged r2, [ip], #0x08 #else @@ -202,7 +202,7 @@ ENTRY(memset) bgt .Lmemset_loop4 RETeq /* Zero length so just exit */ -#ifdef __XSCALE__ +#ifdef _ARM_ARCH_5E /* Compensate for 64-bit alignment check */ adds r1, r1, #0x04 RETeq |
