diff options
Diffstat (limited to 'string')
| -rw-r--r-- | string/Makefile | 2 | ||||
| -rw-r--r-- | string/bits/string_fortified.h (renamed from string/bits/string3.h) | 29 | ||||
| -rw-r--r-- | string/string-inlines.c | 35 | ||||
| -rw-r--r-- | string/string.h | 27 | ||||
| -rw-r--r-- | string/strncat.c | 5 |
5 files changed, 27 insertions, 71 deletions
diff --git a/string/Makefile b/string/Makefile index 8a6322babb..50e245f308 100644 --- a/string/Makefile +++ b/string/Makefile @@ -24,7 +24,7 @@ include ../Makeconfig headers := string.h strings.h memory.h argz.h envz.h byteswap.h \ endian.h bits/byteswap.h bits/byteswap-16.h bits/endian.h \ - bits/string.h bits/string3.h bits/strings_fortified.h \ + bits/string_fortified.h bits/strings_fortified.h \ bits/uintn-identity.h routines := strcat strchr strcmp strcoll strcpy strcspn \ diff --git a/string/bits/string3.h b/string/bits/string_fortified.h index 738226d49b..a89e757c9d 100644 --- a/string/bits/string3.h +++ b/string/bits/string_fortified.h @@ -15,8 +15,11 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef _BITS_STRING_FORTIFIED_H +#define _BITS_STRING_FORTIFIED_H 1 + #ifndef _STRING_H -# error "Never use <bits/string3.h> directly; include <string.h> instead." +# error "Never use <bits/string_fortified.h> directly; include <string.h> instead." #endif #if !__GNUC_PREREQ (5,0) @@ -24,28 +27,6 @@ __warndecl (__warn_memset_zero_len, "memset used with constant zero length parameter; this could be due to transposed parameters"); #endif -#ifndef __cplusplus -/* XXX This is temporarily. We should not redefine any of the symbols - and instead integrate the error checking into the original - definitions. */ -# undef memcpy -# undef memmove -# undef memset -# undef strcat -# undef strcpy -# undef strncat -# undef strncpy -# ifdef __USE_GNU -# undef mempcpy -# undef stpcpy -# endif -# ifdef __USE_MISC -# undef bcopy -# undef bzero -# endif -#endif - - __fortify_function void * __NTH (memcpy (void *__restrict __dest, const void *__restrict __src, size_t __len)) @@ -154,3 +135,5 @@ __NTH (strncat (char *__restrict __dest, const char *__restrict __src, { return __builtin___strncat_chk (__dest, __src, __len, __bos (__dest)); } + +#endif /* bits/string_fortified.h */ 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 * diff --git a/string/string.h b/string/string.h index ac872ff283..5aec0efe7f 100644 --- a/string/string.h +++ b/string/string.h @@ -487,35 +487,10 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1)); # endif #endif - #if __GNUC_PREREQ (3,4) -# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \ - && !defined __NO_INLINE__ && !defined __cplusplus -/* When using GNU CC we provide some optimized versions of selected - functions from this header. There are two kinds of optimizations: - - - machine-dependent optimizations, most probably using inline - assembler code; these might be quite expensive since the code - size can increase significantly. - These optimizations are not used unless the symbol - __USE_STRING_INLINES - is defined before including this header. - - - machine-independent optimizations which do not increase the - code size significantly and which optimize mainly situations - where one or more arguments are compile-time constants. - These optimizations are used always when the compiler is - taught to optimize. - - One can inhibit all optimizations by defining __NO_STRING_INLINES. */ - -/* Get the machine-dependent optimizations (if any). */ -# include <bits/string.h> -# endif - # if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function /* Functions with security checks. */ -# include <bits/string3.h> +# include <bits/string_fortified.h> # endif #endif diff --git a/string/strncat.c b/string/strncat.c index 71a13eec0b..1904811709 100644 --- a/string/strncat.c +++ b/string/strncat.c @@ -20,6 +20,7 @@ #ifndef STRNCAT # undef strncat # define STRNCAT strncat +# define STRNCAT_PRIMARY #endif char * @@ -37,3 +38,7 @@ STRNCAT (char *s1, const char *s2, size_t n) return s; } +#ifdef STRNCAT_PRIMARY +strong_alias (STRNCAT, __strncat) +libc_hidden_def (__strncat) +#endif |