diff options
| author | Anton Kolesov <Anton.Kolesov@synopsys.com> | 2015-12-15 20:54:58 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-12-18 00:48:16 +0300 |
| commit | 06537f05d4b6a0d2db01c6afda1d2a0ea2588126 (patch) | |
| tree | 21087b5c996c9d5fed46a56ced03693475205a80 /newlib/libc/machine/arc/strncpy-bs.S | |
| parent | 088f7a723962dd18dcae09e8e8fa168bbea6ed0b (diff) | |
ARC: Use new definitions for optional ARC CPU features
GCC for ARC has been updated to provide consistent naming of preprocessor
definitions for different optional architecture features:
* __ARC_BARREL_SHIFTER__ instead of __Xbarrel_shifter for
-mbarrel-shifter
* __ARC_LL64__ instead of __LL64__ for -mll64
* __ARCEM__ instead of __EM__ for -mcpu=arcem
* __ARCHS__ instead of __HS__ for -mcpu=archs
* etc (not used in newlib)
This patch updates assembly routines for ARC to use new definitions instead
of a deprecated ones. To ensure compatibility with older compiler new
definitions are also defined in asm.h if needed, based on deprecated
preprocessor definitions.
*** newlib/ChangeLog ***
2015-12-15 Anton Kolesov <Anton.Kolesov@synopsys.com>
* libc/machine/arc/asm.h: Define new GCC definition for old compiler.
* libc/machine/arc/memcmp-bs-norm.S: Use new GCC defines to detect
processor features.
* libc/machine/arc/memcmp.S: Likewise.
* libc/machine/arc/memcpy-archs.S: Likewise.
* libc/machine/arc/memcpy-bs.S: Likewise.
* libc/machine/arc/memcpy.S: Likewise.
* libc/machine/arc/memset-archs.S: Likewise.
* libc/machine/arc/memset-bs.S: Likewise.
* libc/machine/arc/memset.S: Likewise.
* libc/machine/arc/setjmp.S: Likewise.
* libc/machine/arc/strchr-bs-norm.S: Likewise.
* libc/machine/arc/strchr-bs.S: Likewise.
* libc/machine/arc/strchr.S: Likewise.
* libc/machine/arc/strcmp-archs.S: Likewise.
* libc/machine/arc/strcmp.S: Likewise.
* libc/machine/arc/strcpy-bs-arc600.S: Likewise.
* libc/machine/arc/strcpy-bs.S: Likewise.
* libc/machine/arc/strcpy.S: Likewise.
* libc/machine/arc/strlen-bs-norm.S: Likewise.
* libc/machine/arc/strlen-bs.S: Likewise.
* libc/machine/arc/strlen.S: Likewise.
* libc/machine/arc/strncpy-bs.S: Likewise.
* libc/machine/arc/strncpy.S: Likewise.
Signed-off-by: Anton Kolesov <Anton.Kolesov@synopsys.com>
Diffstat (limited to 'newlib/libc/machine/arc/strncpy-bs.S')
| -rw-r--r-- | newlib/libc/machine/arc/strncpy-bs.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/newlib/libc/machine/arc/strncpy-bs.S b/newlib/libc/machine/arc/strncpy-bs.S index c146ce060..ec991524e 100644 --- a/newlib/libc/machine/arc/strncpy-bs.S +++ b/newlib/libc/machine/arc/strncpy-bs.S @@ -45,9 +45,9 @@ there, but the it is not likely to be taken often, and it would also be likey to cost an unaligned mispredict at the next call. */ -#if !defined (__ARC601__) && defined (__Xbarrel_shifter) +#if !defined (__ARC601__) && defined (__ARC_BARREL_SHIFTER__) -#if defined (__ARC700___) || defined (__EM__) || defined (__HS__) +#if defined (__ARC700___) || defined (__ARCEM__) || defined (__ARCHS__) #define BRand(a,b,l) tst a,b ` bne_l l #else #define BRand(a,b,l) and a,a,b ` brne_s a,0,l @@ -112,7 +112,7 @@ ENTRY (strncpy) .Lr4z: mov_l r3,r4 .Lr3z: -#if defined (__ARC700__) || defined (__EM__) || defined (__HS__) +#if defined (__ARC700__) || defined (__ARCEM__) || defined (__ARCHS__) #ifdef __LITTLE_ENDIAN__ bmsk.f r1,r3,7 lsr_s r3,r3,8 @@ -166,6 +166,6 @@ ENTRY (strncpy) j_s.d [blink] stb_l r12,[r3] ENDFUNC (strncpy) -#endif /* !__ARC601__ && __Xbarrel_shifter */ +#endif /* !__ARC601__ && __ARC_BARREL_SHIFTER__ */ #endif /* !__OPTIMIZE_SIZE__ && !PREFER_SIZE_OVER_SPEED */ |