diff options
Diffstat (limited to 'sysdeps/arm/bits')
| -rw-r--r-- | sysdeps/arm/bits/endian.h | 4 | ||||
| -rw-r--r-- | sysdeps/arm/bits/string.h | 125 |
2 files changed, 5 insertions, 124 deletions
diff --git a/sysdeps/arm/bits/endian.h b/sysdeps/arm/bits/endian.h index 7fe486e89d..5e54cc7534 100644 --- a/sysdeps/arm/bits/endian.h +++ b/sysdeps/arm/bits/endian.h @@ -4,5 +4,9 @@ # error "Never use <bits/endian.h> directly; include <endian.h> instead." #endif +#ifdef __ARMEB__ +#define __BYTE_ORDER __BIG_ENDIAN +#else #define __BYTE_ORDER __LITTLE_ENDIAN +#endif #define __FLOAT_WORD_ORDER __BIG_ENDIAN diff --git a/sysdeps/arm/bits/string.h b/sysdeps/arm/bits/string.h index 8dce456f39..4ca2e307a1 100644 --- a/sysdeps/arm/bits/string.h +++ b/sysdeps/arm/bits/string.h @@ -1,5 +1,5 @@ /* Optimized, inlined string functions. ARM version. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,126 +25,3 @@ <bits/string2.h> since they don't work on the ARM. */ #define _HAVE_STRING_ARCH_strcpy 1 #define _HAVE_STRING_ARCH_stpcpy 1 - -/* We only provide optimizations if GNU CC is used and this is a little - endian system (the code below does not work on big endian machines). - With current versions of GCC these optimi\ations produce quite a large - amount of code so we only enable them if the user specifically asked - for it. */ -#if !defined __NO_STRING_INLINES && defined __GNUC__ && __GNUC__ >= 2 \ - && !defined __ARMEB__ && defined __USE_STRING_INLINES - -/* Copy SRC to DEST. */ -#define strcpy(dest, src) \ - (__extension__ (__builtin_constant_p (src) \ - ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8 \ - ? __strcpy_small (dest, src, strlen (src) + 1) \ - : (char *) memcpy (dest, src, strlen (src) + 1)) \ - : strcpy (dest, src))) - -#define __strcpy_small(dest, src, srclen) \ - (__extension__ ({ char *__dest = (char *) (dest); \ - const char *__src = (const char *) (src); \ - size_t __srclen = (srclen); \ - switch (__srclen) \ - { \ - case 5: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 1: \ - *__dest++ = '\0'; \ - break; \ - case 6: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 2: \ - *((unsigned short int *) __dest) = \ - __src[0]; \ - __dest += 2; \ - break; \ - case 7: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 3: \ - *((unsigned short int *) __dest) = \ - *((const unsigned short int *) (__src)); \ - __dest[2] = '\0'; \ - __dest += 3; \ - break; \ - case 8: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 4: \ - *((unsigned long int *) __dest) = \ - *((const unsigned short int *) (__src)) | \ - (__src[2] << 16); \ - __dest += 4; \ - break; \ - } \ - (__dest - __srclen) ; })) - -/* Copy SRC to DEST, returning pointer to final NUL byte. */ -#define __stpcpy(dest, src) \ - (__extension__ (__builtin_constant_p (src) \ - ? (__string2_1bptr_p (src) && strlen (src) + 1 <= 8 \ - ? __stpcpy_small (dest, src, strlen (src) + 1) \ - : ((char *) __mempcpy (dest, src, strlen (src) + 1) - 1))\ - : __stpcpy (dest, src))) - -#define __stpcpy_small(dest, src, srclen) \ - (__extension__ ({ char *__dest = (char *) (dest); \ - const char *__src = (const char *) (src); \ - switch (srclen) \ - { \ - case 5: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 1: \ - *__dest++ = '\0'; \ - break; \ - case 6: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 2: \ - *((unsigned short int *) __dest) = \ - __src[0]; \ - __dest += 2; \ - break; \ - case 7: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 3: \ - *((unsigned short int *) __dest) = \ - *((const unsigned short int *) (__src)); \ - __dest[2] = '\0'; \ - __dest += 3; \ - break; \ - case 8: \ - *((unsigned long int *) __dest) = \ - *((const unsigned long int *) (__src)); \ - __dest += 4; \ - __src += 4; \ - case 4: \ - *((unsigned long int *) __dest) = \ - *((const unsigned short int *) (__src)) | \ - (__src[2] << 16); \ - __dest += 4; \ - break; \ - } \ - __dest; })) - -#endif |