mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
2e274cd8c1
Similar to ppoll, the poll.h header needs to redirect the poll call to a proper fortified ppoll with 64 bit time_t support. The implementation is straightforward, just need to add a similar check as __poll_chk and call the 64 bit time_t ppoll version. The debug fortify tests are also extended to cover 64 bit time_t for affected ABIs. Unfortunately it requires an aditional symbol, which makes backport tricky. One possibility is to add a static inline version if compiler supports is and call abort instead of __chk_fail, so fortified version will call __poll64 in the end. Another possibility is to just remove the fortify support for _TIME_BITS=64. Checked on i686-linux-gnu.
269 lines
9.5 KiB
Makefile
269 lines
9.5 KiB
Makefile
# Copyright (C) 1998-2022 Free Software Foundation, Inc.
|
|
# Copyright The GNU Toolchain Authors.
|
|
# 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
|
|
# <https://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Sub-makefile for debug portion of the library.
|
|
#
|
|
subdir := debug
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := execinfo.h
|
|
|
|
# Note that ptsname_r_chk and getlogin_r are not here, but in
|
|
# login/Makefile instead. If that subdir is omitted from the
|
|
# build, its _FORTIFY_SOURCE support will be too.
|
|
routines = backtrace backtracesyms backtracesymsfd noophooks \
|
|
memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \
|
|
strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \
|
|
sprintf_chk vsprintf_chk snprintf_chk vsnprintf_chk \
|
|
printf_chk fprintf_chk vprintf_chk vfprintf_chk \
|
|
gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \
|
|
read_chk pread_chk pread64_chk recv_chk recvfrom_chk \
|
|
readlink_chk readlinkat_chk getwd_chk getcwd_chk \
|
|
realpath_chk fread_chk fread_u_chk \
|
|
wctomb_chk wcscpy_chk wmemcpy_chk wmemmove_chk wmempcpy_chk \
|
|
wcpcpy_chk wcsncpy_chk wcscat_chk wcsncat_chk wmemset_chk \
|
|
wcpncpy_chk \
|
|
swprintf_chk vswprintf_chk wprintf_chk fwprintf_chk \
|
|
vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \
|
|
confstr_chk getgroups_chk ttyname_r_chk \
|
|
gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \
|
|
wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \
|
|
wcstombs_chk asprintf_chk vasprintf_chk dprintf_chk \
|
|
vdprintf_chk obprintf_chk vobprintf_chk \
|
|
longjmp_chk ____longjmp_chk \
|
|
fdelt_chk poll_chk ppoll_chk \
|
|
explicit_bzero_chk \
|
|
stack_chk_fail fortify_fail \
|
|
$(static-only-routines)
|
|
static-only-routines := stack_chk_fail_local
|
|
|
|
# Don't add stack_chk_fail_local.o to libc.a since __stack_chk_fail_local
|
|
# is an alias of __stack_chk_fail in stack_chk_fail.o.
|
|
elide-routines.o := stack_chk_fail_local
|
|
|
|
# Building the stack-protector failure routines with stack protection
|
|
# is not required since we have already failed a stack check and are
|
|
# exiting the process. However, the local aliases which jump to the
|
|
# real routines should still be compiled with stack protection
|
|
# (stack_chk_fail_local.c), so that the statically linked parts of the
|
|
# library have the expected flags.
|
|
|
|
CFLAGS-stack_chk_fail.c += $(no-stack-protector)
|
|
|
|
CFLAGS-backtrace.c += -fno-omit-frame-pointer -funwind-tables
|
|
CFLAGS-sprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-snprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-vsprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-vsnprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-asprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-vasprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-obprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-dprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-vdprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-printf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-vprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-vfprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-gets_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fgets_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fgets_u_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fread_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fread_u_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-swprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-vswprintf_chk.c += $(libio-mtsafe)
|
|
CFLAGS-wprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fwprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-vwprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-vfwprintf_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fgetws_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-fgetws_u_chk.c += $(libio-mtsafe) -fexceptions
|
|
CFLAGS-read_chk.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread_chk.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pread64_chk.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-recv_chk.c += -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-recvfrom_chk.c += -fexceptions -fasynchronous-unwind-tables
|
|
|
|
# Need to make sure the settings here override what configure might have
|
|
# set up for us, so keep the CFLAGS/CPPFLAGS split logical as the order is:
|
|
# <user CFLAGS> <test CFLAGS> <user CPPFLAGS> <test CPPFLAGS>
|
|
CFLAGS-tst-longjmp_chk.c += -fexceptions -fasynchronous-unwind-tables
|
|
CPPFLAGS-tst-longjmp_chk.c += -D_FORTIFY_SOURCE=1
|
|
CFLAGS-tst-longjmp_chk2.c += -fexceptions -fasynchronous-unwind-tables
|
|
CPPFLAGS-tst-longjmp_chk2.c += -D_FORTIFY_SOURCE=1
|
|
CFLAGS-tst-longjmp_chk3.c += -fexceptions -fasynchronous-unwind-tables
|
|
CPPFLAGS-tst-longjmp_chk3.c += -D_FORTIFY_SOURCE=1
|
|
CPPFLAGS-tst-realpath-chk.c += -D_FORTIFY_SOURCE=2
|
|
CPPFLAGS-tst-chk-cancel.c += -D_FORTIFY_SOURCE=2
|
|
|
|
# _FORTIFY_SOURCE tests.
|
|
# Auto-generate tests for _FORTIFY_SOURCE for different levels, compilers and
|
|
# preprocessor conditions based on tst-fortify.c.
|
|
#
|
|
# To add a new test condition, define a cflags-$(cond) make variable to set
|
|
# CFLAGS for the file.
|
|
|
|
tests-all-chk = tst-fortify
|
|
tests-c-def-chk =
|
|
tests-cc-def-chk =
|
|
tests-c-time64-chk =
|
|
tests-cc-time64-chk =
|
|
|
|
CFLAGS-tst-fortify.c += -Wno-format -Wno-deprecated-declarations -Wno-error
|
|
|
|
# No additional flags for the default tests.
|
|
define cflags-default
|
|
endef
|
|
|
|
define cflags-lfs
|
|
CFLAGS-tst-fortify-$(1)-lfs-$(2)-$(3).$(1) += -D_FILE_OFFSET_BITS=64
|
|
endef
|
|
|
|
define cflags-nongnu
|
|
CFLAGS-tst-fortify-$(1)-nongnu-$(2)-$(3).$(1) += -D_LARGEFILE64_SOURCE=1
|
|
endef
|
|
|
|
src-chk-nongnu = \#undef _GNU_SOURCE
|
|
|
|
# We know these tests have problems with format strings, this is what
|
|
# we are testing. Disable that warning. They are also testing
|
|
# deprecated functions (notably gets) so disable that warning as well.
|
|
# And they also generate warnings from warning attributes, which
|
|
# cannot be disabled via pragmas, so require -Wno-error to be used.
|
|
define gen-chk-test
|
|
tests-$(1)-$(4)-chk += tst-fortify-$(1)-$(2)-$(3)-$(4)
|
|
CFLAGS-tst-fortify-$(1)-$(2)-$(3)-$(4).$(1) += -D_FORTIFY_SOURCE=$(3) -Wno-format \
|
|
-Wno-deprecated-declarations \
|
|
-Wno-error
|
|
$(eval $(call cflags-$(2),$(1),$(3),$(4)))
|
|
$(objpfx)tst-fortify-$(1)-$(2)-$(3)-$(4).$(1): tst-fortify.c Makefile
|
|
( echo "/* Autogenerated from Makefile. */"; \
|
|
echo "$(src-chk-$(2))"; \
|
|
echo "#include \"tst-fortify.c\"" ) > $$@.tmp
|
|
mv $$@.tmp $$@
|
|
endef
|
|
|
|
chk-extensions = c cc
|
|
chk-types = default lfs nongnu
|
|
# 64 bit time_t implies LFS.
|
|
chk-types-time64 = default nongnu
|
|
chk-levels = 1 2 3
|
|
|
|
$(foreach e,$(chk-extensions), \
|
|
$(foreach t,$(chk-types), \
|
|
$(foreach l,$(chk-levels), \
|
|
$(eval $(call gen-chk-test,$(e),$(t),$(l),def)))))
|
|
|
|
tests-all-chk += $(tests-c-def-chk) $(tests-cc-def-chk)
|
|
|
|
$(foreach e,$(chk-extensions), \
|
|
$(foreach t,$(chk-types-time64), \
|
|
$(foreach l,$(chk-levels), \
|
|
$(eval $(call gen-chk-test,$(e),$(t),$(l),time64)))))
|
|
|
|
tests-all-time64-chk += $(tests-c-time64-chk) $(tests-cc-time64-chk)
|
|
|
|
define link-cc
|
|
LDLIBS-$(1) = -lstdc++
|
|
endef
|
|
$(foreach t,$(tests-cc-def-chk), $(eval $(call link-cc,$(t))))
|
|
$(foreach t,$(tests-cc-time64-chk), $(eval $(call link-cc,$(t))))
|
|
|
|
# backtrace_symbols only works if we link with -rdynamic. backtrace
|
|
# requires unwind tables on most architectures.
|
|
CFLAGS-tst-backtrace2.c += -funwind-tables
|
|
CFLAGS-tst-backtrace3.c += -funwind-tables
|
|
CFLAGS-tst-backtrace4.c += -funwind-tables
|
|
CFLAGS-tst-backtrace5.c += -funwind-tables
|
|
CFLAGS-tst-backtrace6.c += -funwind-tables
|
|
LDFLAGS-tst-backtrace2 = -rdynamic
|
|
LDFLAGS-tst-backtrace3 = -rdynamic
|
|
LDFLAGS-tst-backtrace4 = -rdynamic
|
|
LDFLAGS-tst-backtrace5 = -rdynamic
|
|
LDFLAGS-tst-backtrace6 = -rdynamic
|
|
|
|
CFLAGS-tst-ssp-1.c += -fstack-protector-all
|
|
|
|
tests = backtrace-tst \
|
|
tst-longjmp_chk \
|
|
test-strcpy_chk \
|
|
test-stpcpy_chk \
|
|
tst-longjmp_chk2 \
|
|
tst-backtrace2 \
|
|
tst-backtrace3 \
|
|
tst-backtrace4 \
|
|
tst-backtrace5 \
|
|
tst-backtrace6 \
|
|
tst-realpath-chk \
|
|
$(tests-all-chk)
|
|
|
|
tests-time64 += \
|
|
$(tests-all-time64-chk) \
|
|
# tests-time64
|
|
|
|
ifeq ($(have-ssp),yes)
|
|
tests += tst-ssp-1
|
|
endif
|
|
|
|
ifeq ($(have-thread-library), yes)
|
|
tests += tst-chk-cancel
|
|
endif
|
|
|
|
ifeq (,$(CXX))
|
|
tests-unsupported = $(tests-cc-def-chk) $(test-cc-time64-chk)
|
|
endif
|
|
|
|
extra-libs = libpcprofile
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libpcprofile-routines = pcprofile
|
|
libpcprofile-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
|
|
others = pcprofiledump
|
|
install-bin = pcprofiledump
|
|
install-bin-script = xtrace
|
|
|
|
generated += xtrace
|
|
|
|
include ../Rules
|
|
|
|
ifeq ($(run-built-tests),yes)
|
|
LOCALES := de_DE.UTF-8
|
|
include ../gen-locales.mk
|
|
|
|
define chk-gen-locales
|
|
$(objpfx)$(1).out: $(gen-locales)
|
|
endef
|
|
$(foreach t, $(tests-all-chk), $(eval $(call chk-gen-locales,$(t))))
|
|
$(foreach t, $(tests-all-time64-chk), $(eval $(call chk-gen-locales,$(t))))
|
|
endif
|
|
|
|
sLIBdir := $(shell echo $(slibdir) | sed 's,lib\(\|64\)$$,\\\\$$LIB,')
|
|
|
|
$(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o
|
|
|
|
$(objpfx)xtrace: xtrace.sh
|
|
rm -f $@.new
|
|
sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \
|
|
-e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \
|
|
-e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \
|
|
&& rm -f $@ && mv $@.new $@ && chmod +x $@
|
|
|
|
$(objpfx)tst-chk-cancel: $(shared-thread-library)
|