From 09a596cc2cf4e0f9f8e9f3bba4b1a97efcb13bcb Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 17 Nov 2016 09:26:27 -0500 Subject: Remove bits/string.h. These machine-dependent inline string functions have never been on by default, and even if they were a good idea at the time they were introduced, they haven't really been touched in ten to fifteen years and probably aren't a good idea on current-gen processors. Current thinking is that this class of optimization is best left to the compiler. * bits/string.h, string/bits/string.h * sysdeps/aarch64/bits/string.h * sysdeps/m68k/m680x0/m68020/bits/string.h * sysdeps/s390/bits/string.h, sysdeps/sparc/bits/string.h * sysdeps/x86/bits/string.h: Delete file. * string/string.h: Don't include bits/string.h. * string/bits/string3.h: Rename to bits/string_fortified.h. No need to undef various symbols that the removed headers might have defined as macros. * string/Makefile (headers): Remove bits/string.h, change bits/string3.h to bits/string_fortified.h. * string/string-inlines.c: Update commentary. Remove definitions of various macros that nothing looks at anymore. Don't directly include bits/string.h. Set _STRING_INLINE_unaligned here, based on compiler-predefined macros. * string/strncat.c: If STRNCAT is not defined, or STRNCAT_PRIMARY _is_ defined, provide internal hidden alias __strncat. * include/string.h: Declare internal hidden alias __strncat. Only forward __stpcpy to __builtin_stpcpy if __NO_STRING_INLINES is not defined. * include/bits/string3.h: Rename to bits/string_fortified.h, update to match above. * sysdeps/i386/string-inlines.c: Define compat symbols for everything formerly defined by sysdeps/x86/bits/string.h. Make existing definitions into compat symbols as well. Remove some no-longer-necessary messing around with macros. * sysdeps/powerpc/powerpc32/power4/multiarch/mempcpy.c * sysdeps/powerpc/powerpc64/multiarch/mempcpy.c * sysdeps/powerpc/powerpc64/multiarch/stpcpy.c * sysdeps/s390/multiarch/mempcpy.c No need to define _HAVE_STRING_ARCH_mempcpy. Do define __NO_STRING_INLINES and NO_MEMPCPY_STPCPY_REDIRECT. * sysdeps/i386/i686/multiarch/strncat-c.c * sysdeps/s390/multiarch/strncat-c.c * sysdeps/x86_64/multiarch/strncat-c.c Define STRNCAT_PRIMARY. Don't change definition of libc_hidden_def. --- sysdeps/s390/multiarch/mempcpy.c | 4 ++-- sysdeps/s390/multiarch/strncat-c.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sysdeps/s390/multiarch') diff --git a/sysdeps/s390/multiarch/mempcpy.c b/sysdeps/s390/multiarch/mempcpy.c index bf111a3aea..ba59062956 100644 --- a/sysdeps/s390/multiarch/mempcpy.c +++ b/sysdeps/s390/multiarch/mempcpy.c @@ -20,8 +20,8 @@ #if defined SHARED && IS_IN (libc) # define mempcpy __redirect_mempcpy # define __mempcpy __redirect___mempcpy -/* Omit the mempcpy inline definitions because it would redefine mempcpy. */ -# define _HAVE_STRING_ARCH_mempcpy 1 +# define __NO_STRING_INLINES +# define NO_MEMPCPY_STPCPY_REDIRECT # include # undef mempcpy # undef __mempcpy diff --git a/sysdeps/s390/multiarch/strncat-c.c b/sysdeps/s390/multiarch/strncat-c.c index e72d778fb4..d894811e83 100644 --- a/sysdeps/s390/multiarch/strncat-c.c +++ b/sysdeps/s390/multiarch/strncat-c.c @@ -18,6 +18,6 @@ #if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) # define STRNCAT __strncat_c - +# define STRNCAT_PRIMARY # include #endif -- cgit 1.4.1