diff options
Diffstat (limited to 'string/string-inlines.c')
| -rw-r--r-- | string/string-inlines.c | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/string/string-inlines.c b/string/string-inlines.c index 68aa7d072a..df9d84a464 100644 --- a/string/string-inlines.c +++ b/string/string-inlines.c @@ -15,29 +15,19 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* <bits/string.h> and <bits/string2.h> declare some extern inline - functions. These functions are declared additionally here if - inlining is not possible. */ - -#undef __USE_STRING_INLINES -#define __USE_STRING_INLINES -#define _FORCE_INLINES -#define __STRING_INLINE /* empty */ -#define __NO_INLINE__ +/* This file contains compatibility definitions of functions that were + formerly defined as "extern inline" in string.h; it's conceivable + that old binaries contain references to them. */ +#define __NO_STRING_INLINES #include <string.h> #undef index #undef rindex -#undef __NO_INLINE__ -#include <bits/string.h> - #include "shlib-compat.h" #if SHLIB_COMPAT (libc, GLIBC_2_1_1, GLIBC_2_25) -/* The inline functions are not used from GLIBC 2.25 and forward, however - they are required to provide the symbols through string-inlines.c - (if inlining is not possible for compatibility reasons). */ +/* These functions were removed from string.h in glibc 2.25. */ char * __old_strtok_r_1c (char *__s, char __sep, char **__nextp) @@ -129,9 +119,8 @@ compat_symbol (libc, __old_strsep_3c, __strsep_3c, GLIBC_2_1_1); #endif #if SHLIB_COMPAT (libc, GLIBC_2_1_1, GLIBC_2_24) -/* The inline functions are not used from GLIBC 2.24 and forward, however - they are required to provide the symbols through string-inlines.c - (if inlining is not possible for compatibility reasons). */ +/* These functions were removed from string.h in glibc 2.24. */ + size_t __old_strcspn_c1 (const char *__s, int __reject) { @@ -221,9 +210,13 @@ __old_strpbrk_c3 (const char *__s, int __accept1, int __accept2, int __accept3) } compat_symbol (libc, __old_strpbrk_c3, __strpbrk_c3, GLIBC_2_1_1); +# if defined __mc68020__ || defined __s390__ || defined __i386__ +# define _STRING_INLINE_unaligned 1 +# else +# define _STRING_INLINE_unaligned 0 /* These are a few types we need for the optimizations if we cannot use unaligned memory accesses. */ -# define __STRING2_COPY_TYPE(N) \ +# define __STRING2_COPY_TYPE(N) \ typedef struct { unsigned char __arr[N]; } \ __attribute__ ((__packed__)) __STRING2_COPY_ARR##N __STRING2_COPY_TYPE (2); @@ -233,8 +226,8 @@ __STRING2_COPY_TYPE (5); __STRING2_COPY_TYPE (6); __STRING2_COPY_TYPE (7); __STRING2_COPY_TYPE (8); -# undef __STRING2_COPY_TYPE - +# undef __STRING2_COPY_TYPE +# endif # if _STRING_INLINE_unaligned void * |