mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-30 10:45:40 +03:00
09a596cc2c
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.
111 lines
4.1 KiB
Makefile
111 lines
4.1 KiB
Makefile
# Copyright (C) 1991-2017 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
|
|
# modify it under the terms of the GNU Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 of the License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Sub-makefile for string portion of library.
|
|
#
|
|
subdir := string
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := string.h bits/string_fortified.h \
|
|
strings.h bits/strings_fortified.h \
|
|
byteswap.h bits/byteswap.h bits/byteswap-16.h \
|
|
endian.h bits/endian.h bits/uintn-identity.h \
|
|
memory.h argz.h envz.h
|
|
|
|
routines := strcat strchr strcmp strcoll strcpy strcspn \
|
|
strverscmp strdup strndup \
|
|
strerror _strerror strlen strnlen \
|
|
strncat strncmp strncpy \
|
|
strrchr strpbrk strsignal strspn strstr strtok \
|
|
strtok_r strxfrm memchr memcmp memmove memset \
|
|
mempcpy bcopy bzero ffs ffsll stpcpy stpncpy \
|
|
strcasecmp strncase strcasecmp_l strncase_l \
|
|
memccpy memcpy wordcopy strsep strcasestr \
|
|
swab strfry memfrob memmem rawmemchr strchrnul \
|
|
$(addprefix argz-,append count create ctsep next \
|
|
delete extract insert stringify \
|
|
addsep replace) \
|
|
envz basename \
|
|
strcoll_l strxfrm_l string-inlines memrchr \
|
|
xpg-strerror strerror_l explicit_bzero
|
|
|
|
strop-tests := memchr memcmp memcpy memmove mempcpy memset memccpy \
|
|
stpcpy stpncpy strcat strchr strcmp strcpy strcspn \
|
|
strlen strncmp strncpy strpbrk strrchr strspn memmem \
|
|
strstr strcasestr strnlen strcasecmp strncasecmp \
|
|
strncat rawmemchr strchrnul bcopy bzero memrchr \
|
|
explicit_bzero
|
|
tests := tester inl-tester noinl-tester testcopy test-ffs \
|
|
tst-strlen stratcliff tst-svc tst-inlcall \
|
|
bug-strncat1 bug-strspn1 bug-strpbrk1 tst-bswap \
|
|
tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \
|
|
bug-strtok1 $(addprefix test-,$(strop-tests)) \
|
|
bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \
|
|
tst-strtok_r bug-strcoll2 tst-cmp tst-xbzero-opt \
|
|
test-endian-types
|
|
|
|
# This test allocates a lot of memory and can run for a long time.
|
|
xtests = tst-strcoll-overflow
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)tst-svc-cmp.out
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-inl-tester.c = -fno-builtin
|
|
CFLAGS-noinl-tester.c = -fno-builtin
|
|
CFLAGS-tst-strlen.c = -fno-builtin
|
|
CFLAGS-stratcliff.c = -fno-builtin
|
|
CFLAGS-test-ffs.c = -fno-builtin
|
|
CFLAGS-tst-inlcall.c = -fno-builtin
|
|
CFLAGS-tst-xbzero-opt.c = -O3
|
|
# BZ 21006: Resolve all functions but at least explicit_bzero at startup.
|
|
# Otherwise the test fails on s390x as the memcpy in prepare_test_buffer is
|
|
# done by loading r4 / r5 with the test_pattern and using store multiple
|
|
# instruction to store r4 / r5 to buf. If explicit_bzero would be resolved in
|
|
# setup_explicit_clear, r4 / r5 would be stored to stack by _dl_runtime_resolve
|
|
# and the call to memmem in count_test_patterns will find a hit of the
|
|
# test_pattern on the stack.
|
|
LDFLAGS-tst-xbzero-opt = -z now
|
|
|
|
# Called during TLS initialization.
|
|
CFLAGS-memcpy.c = $(no-stack-protector)
|
|
CFLAGS-wordcopy.c = $(no-stack-protector)
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
$(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
|
|
cmp $^ > $@; \
|
|
$(evaluate-test)
|
|
|
|
LOCALES := de_DE.UTF-8 en_US.ISO-8859-1 en_US.UTF-8 \
|
|
tr_TR.ISO-8859-9 tr_TR.UTF-8 cs_CZ.UTF-8 \
|
|
da_DK.ISO-8859-1 en_GB.UTF-8
|
|
include ../gen-locales.mk
|
|
|
|
$(objpfx)test-strcasecmp.out: $(gen-locales)
|
|
$(objpfx)test-strncasecmp.out: $(gen-locales)
|
|
$(objpfx)tst-strxfrm.out: $(gen-locales)
|
|
$(objpfx)tst-strxfrm2.out: $(gen-locales)
|
|
# bug-strcoll2 needs cs_CZ.UTF-8 and da_DK.ISO-8859-1.
|
|
$(objpfx)bug-strcoll2.out: $(gen-locales)
|
|
$(objpfx)tst-strcoll-overflow.out: $(gen-locales)
|
|
|
|
endif
|