mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
38765ab68f
As described in BZ#20558, bzero and bcopy declaration can only benefit from fortified macros when decl came from string.h and when __USE_MISC is defined (default behaviour). This is due no standard includes those functions in string.h, so they are only declared if __USE_MISC is defined (as pointed out in comment 4). However fortification should be orthogona to other features test macros, i.e, any function should be fortified if that function is declared. To fix this behavior, the patch moved the bzero, bcopy, and __explicit_bzero_chk to a common header (string/bits/strings_fortified.h) and explicit fortified inclusion macros similar to string.h is added on strings.h. This allows to get fortified declarions by only including strings.h. Checked on x86_64-linux-gnu and along on a bootstrap installation to check if the fortified are correctly triggered with example from bug report. [BZ #20558] * string/bits/string3.h [__USE_MISC] (bcopy): Move to strings_fortified.h. [__USE_MISC] (bzero): Likewise. [__USE_MISC] (explicit_bzero): Likewise. * string/strings.h: Include strings_fortified.h. * string/Makefile (headers): Add strings_fortified.h. * string/bits/strings_fortified.h: New file. * include/bits/strings_fortified.h: Likewise.
99 lines
3.5 KiB
Makefile
99 lines
3.5 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 strings.h memory.h endian.h bits/endian.h \
|
|
argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
|
|
bits/string.h bits/string2.h bits/string3.h \
|
|
bits/strings_fortified.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
|
|
|
|
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
|
|
|
|
# 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
|
|
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)
|
|
|
|
endif
|