mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +00:00
35281b18b8
fcntl.h defines struct timespec if __USE_XOPEN || __USE_XOPEN2K8. But (a) the subsequent bits/stat.h include only needs it if __USE_XOPEN2K8 and (b) older standards did not allow struct timespec here. (It's allowed for newer standards by virtue of the permission to include symbols from sys/stat.h. But sys/stat.h is only required to provide struct timespec from the 2008 edition of POSIX onwards, and permitted by the 2004 TC to the 2001 edition in anticipation of the addition of nanosecond timestamp support to struct stat in the 2008 edition.) This patch limits the timespec definition to the __USE_XOPEN2K8 case, that being the only case where it is actually needed for the <bits/stat.h> include. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #20023] * io/fcntl.h [__USE_XOPEN && !__USE_XOPEN2K8]: Do not include <time.h>. * conform/Makefile (test-xfail-UNIX98/fcntl.h/conform): Remove variable. (test-xfail-XOPEN2K/fcntl.h/conform): Likewise.
278 lines
12 KiB
Makefile
278 lines
12 KiB
Makefile
# Copyright (C) 1999-2016 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 conform portion of the library.
|
|
#
|
|
subdir := conform
|
|
|
|
include ../Makeconfig
|
|
|
|
conformtest-headers-data := $(wildcard data/*.h-data) \
|
|
$(wildcard data/*/*.h-data)
|
|
|
|
conformtest-standards := ISO ISO99 ISO11 POSIX XPG3 XPG4 UNIX98 XOPEN2K \
|
|
POSIX2008 XOPEN2K8
|
|
|
|
conformtest-headers-ISO := assert.h ctype.h errno.h float.h limits.h locale.h \
|
|
math.h setjmp.h signal.h stdarg.h stddef.h stdio.h \
|
|
stdlib.h string.h time.h
|
|
conformtest-headers-ISO99 := $(conformtest-headers-ISO) complex.h fenv.h \
|
|
inttypes.h iso646.h stdbool.h stdint.h tgmath.h \
|
|
wchar.h wctype.h
|
|
# Missing ISO11 expectations for: stdatomic.h threads.h.
|
|
conformtest-headers-ISO11 := $(conformtest-headers-ISO99) stdalign.h \
|
|
stdnoreturn.h uchar.h
|
|
conformtest-headers-POSIX := $(conformtest-headers-ISO) aio.h dirent.h \
|
|
fcntl.h fnmatch.h glob.h grp.h mqueue.h \
|
|
pthread.h pwd.h regex.h sched.h semaphore.h \
|
|
sys/mman.h sys/stat.h sys/times.h sys/types.h \
|
|
sys/utsname.h sys/wait.h tar.h termios.h \
|
|
unistd.h utime.h wordexp.h
|
|
# Missing XPG3 expectations for: regexp.h wchar.h.
|
|
conformtest-headers-XPG3 := $(conformtest-headers-ISO) cpio.h dirent.h \
|
|
fcntl.h fnmatch.h ftw.h glob.h grp.h iconv.h \
|
|
langinfo.h monetary.h nl_types.h pwd.h regex.h \
|
|
search.h sys/ipc.h sys/msg.h sys/sem.h sys/shm.h \
|
|
sys/stat.h sys/times.h sys/types.h sys/utsname.h \
|
|
sys/wait.h tar.h termios.h ulimit.h unistd.h \
|
|
utime.h varargs.h wordexp.h
|
|
# Missing XPG4 expectations for: re_comp.h regexp.h wchar.h.
|
|
# XPG4 includes XTI, but xti.h is outside the scope of these tests.
|
|
conformtest-headers-XPG4 := $(conformtest-headers-XPG3) arpa/inet.h fmtmsg.h \
|
|
libgen.h ndbm.h netdb.h netinet/in.h poll.h \
|
|
strings.h stropts.h sys/mman.h sys/resource.h \
|
|
sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h \
|
|
sys/uio.h sys/un.h syslog.h ucontext.h utmpx.h
|
|
# Missing UNIX98 expectations for: inttypes.h re_comp.h regexp.h.
|
|
# The online UNIX98 includes XCURSES, but curses.h, term.h and
|
|
# unctrl.h are outside the scope of these tests. It also includes
|
|
# XTI, but xti.h is outside the scope of these tests.
|
|
conformtest-headers-UNIX98 := $(conformtest-headers-POSIX) arpa/inet.h cpio.h \
|
|
dlfcn.h fmtmsg.h ftw.h iconv.h iso646.h \
|
|
langinfo.h libgen.h monetary.h ndbm.h netdb.h \
|
|
netinet/in.h nl_types.h poll.h search.h \
|
|
strings.h stropts.h sys/ipc.h sys/msg.h \
|
|
sys/resource.h sys/sem.h sys/shm.h sys/socket.h \
|
|
sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \
|
|
sys/un.h syslog.h ucontext.h ulimit.h utmpx.h \
|
|
varargs.h wchar.h wctype.h
|
|
# Missing XOPEN2K expectations for: trace.h.
|
|
conformtest-headers-XOPEN2K := $(conformtest-headers-POSIX) arpa/inet.h \
|
|
complex.h cpio.h dlfcn.h fenv.h fmtmsg.h ftw.h \
|
|
iconv.h inttypes.h iso646.h langinfo.h \
|
|
libgen.h monetary.h ndbm.h net/if.h netdb.h \
|
|
netinet/in.h netinet/tcp.h nl_types.h poll.h \
|
|
search.h spawn.h stdbool.h stdint.h strings.h \
|
|
stropts.h sys/ipc.h sys/msg.h sys/resource.h \
|
|
sys/select.h sys/sem.h sys/shm.h sys/socket.h \
|
|
sys/statvfs.h sys/time.h sys/timeb.h sys/uio.h \
|
|
sys/un.h syslog.h tgmath.h ucontext.h ulimit.h \
|
|
utmpx.h wchar.h wctype.h
|
|
# Missing POSIX2008 expectations for: trace.h.
|
|
conformtest-headers-POSIX2008 := $(conformtest-headers-POSIX) arpa/inet.h \
|
|
complex.h cpio.h dlfcn.h fenv.h iconv.h \
|
|
inttypes.h iso646.h langinfo.h monetary.h \
|
|
net/if.h netdb.h netinet/in.h netinet/tcp.h \
|
|
nl_types.h poll.h spawn.h stdbool.h stdint.h \
|
|
strings.h stropts.h sys/select.h \
|
|
sys/socket.h sys/statvfs.h sys/un.h tgmath.h \
|
|
wchar.h wctype.h
|
|
# Missing XOPEN2K8 expectations for: trace.h.
|
|
conformtest-headers-XOPEN2K8 := $(conformtest-headers-POSIX2008) fmtmsg.h \
|
|
ftw.h libgen.h ndbm.h search.h sys/ipc.h \
|
|
sys/msg.h sys/resource.h sys/sem.h sys/shm.h \
|
|
sys/time.h sys/uio.h syslog.h ulimit.h utmpx.h
|
|
|
|
conformtest-header-list-base := $(foreach std,$(conformtest-standards),\
|
|
header-list-$(std).out)
|
|
conformtest-header-list-tests := $(addprefix $(objpfx),\
|
|
$(conformtest-header-list-base))
|
|
tests-special += $(conformtest-header-list-tests)
|
|
generated += $(conformtest-header-list-base)
|
|
|
|
conformtest-header-base := $(foreach std,\
|
|
$(conformtest-standards),\
|
|
$(foreach h,\
|
|
$(conformtest-headers-$(std)),\
|
|
$(std)/$(h)/conform.out))
|
|
conformtest-header-tests := $(addprefix $(objpfx),$(conformtest-header-base))
|
|
ifneq (yes,$(fast-check))
|
|
ifeq (no,$(cross-compiling))
|
|
tests-special += $(conformtest-header-tests)
|
|
generated += $(conformtest-header-base)
|
|
endif
|
|
endif
|
|
|
|
linknamespace-symlists-base := $(foreach std,$(conformtest-standards),\
|
|
symlist-$(std))
|
|
linknamespace-symlists-tests := $(addprefix $(objpfx),\
|
|
$(linknamespace-symlists-base))
|
|
tests-special += $(linknamespace-symlists-tests)
|
|
|
|
linknamespace-symlist-stdlibs-base := $(foreach std,$(conformtest-standards),\
|
|
symlist-stdlibs-$(std))
|
|
linknamespace-symlist-stdlibs-tests := \
|
|
$(addprefix $(objpfx),\
|
|
$(linknamespace-symlist-stdlibs-base))
|
|
|
|
tests-special += $(linknamespace-symlist-stdlibs-tests)
|
|
|
|
linknamespace-header-base := $(foreach std,\
|
|
$(conformtest-standards),\
|
|
$(foreach h,\
|
|
$(conformtest-headers-$(std)),\
|
|
$(std)/$(h)/linknamespace.out))
|
|
linknamespace-header-tests := $(addprefix $(objpfx),\
|
|
$(linknamespace-header-base))
|
|
tests-special += $(linknamespace-header-tests)
|
|
|
|
include ../Rules
|
|
|
|
$(conformtest-header-list-tests): $(objpfx)header-list-%.out: \
|
|
check-header-lists.sh \
|
|
$(conformtest-headers-data)
|
|
$(SHELL) $< "$*" "$(CC)" "$(strip $(conformtest-headers-$*))" \
|
|
"$(conformtest-headers-data)" > $@; \
|
|
$(evaluate-test)
|
|
|
|
# Pre-standard C feature no longer supported by GCC (obsoleted in
|
|
# newer POSIX standards).
|
|
test-xfail-XPG3/varargs.h/conform = yes
|
|
test-xfail-XPG4/varargs.h/conform = yes
|
|
test-xfail-UNIX98/varargs.h/conform = yes
|
|
|
|
# Header not provided by glibc.
|
|
test-xfail-XPG4/ndbm.h/conform = yes
|
|
test-xfail-UNIX98/ndbm.h/conform = yes
|
|
test-xfail-XOPEN2K/ndbm.h/conform = yes
|
|
test-xfail-XOPEN2K8/ndbm.h/conform = yes
|
|
|
|
# Unsorted expected failures.
|
|
test-xfail-XPG3/fcntl.h/conform = yes
|
|
test-xfail-XPG3/ftw.h/conform = yes
|
|
test-xfail-XPG3/limits.h/conform = yes
|
|
test-xfail-XPG3/pwd.h/conform = yes
|
|
test-xfail-XPG3/search.h/conform = yes
|
|
test-xfail-XPG3/signal.h/conform = yes
|
|
test-xfail-XPG3/stdlib.h/conform = yes
|
|
test-xfail-XPG3/string.h/conform = yes
|
|
test-xfail-XPG3/sys/stat.h/conform = yes
|
|
test-xfail-XPG3/sys/types.h/conform = yes
|
|
test-xfail-XPG3/sys/wait.h/conform = yes
|
|
test-xfail-XPG3/termios.h/conform = yes
|
|
test-xfail-XPG3/time.h/conform = yes
|
|
test-xfail-XPG3/unistd.h/conform = yes
|
|
test-xfail-XPG4/arpa/inet.h/conform = yes
|
|
test-xfail-XPG4/fcntl.h/conform = yes
|
|
test-xfail-XPG4/netdb.h/conform = yes
|
|
test-xfail-XPG4/netinet/in.h/conform = yes
|
|
test-xfail-XPG4/signal.h/conform = yes
|
|
test-xfail-XPG4/stdlib.h/conform = yes
|
|
test-xfail-XPG4/sys/stat.h/conform = yes
|
|
test-xfail-XPG4/sys/time.h/conform = yes
|
|
test-xfail-XPG4/sys/types.h/conform = yes
|
|
test-xfail-XPG4/sys/wait.h/conform = yes
|
|
test-xfail-XPG4/termios.h/conform = yes
|
|
test-xfail-XPG4/ucontext.h/conform = yes
|
|
test-xfail-XPG4/unistd.h/conform = yes
|
|
test-xfail-XPG4/utmpx.h/conform = yes
|
|
test-xfail-POSIX/sys/wait.h/conform = yes
|
|
test-xfail-UNIX98/arpa/inet.h/conform = yes
|
|
test-xfail-UNIX98/netdb.h/conform = yes
|
|
test-xfail-UNIX98/netinet/in.h/conform = yes
|
|
test-xfail-UNIX98/signal.h/conform = yes
|
|
test-xfail-UNIX98/stdlib.h/conform = yes
|
|
test-xfail-UNIX98/sys/time.h/conform = yes
|
|
test-xfail-UNIX98/sys/wait.h/conform = yes
|
|
test-xfail-UNIX98/ucontext.h/conform = yes
|
|
test-xfail-UNIX98/unistd.h/conform = yes
|
|
test-xfail-UNIX98/utmpx.h/conform = yes
|
|
test-xfail-XOPEN2K/semaphore.h/conform = yes
|
|
test-xfail-XOPEN2K/signal.h/conform = yes
|
|
test-xfail-XOPEN2K/sys/wait.h/conform = yes
|
|
test-xfail-XOPEN2K/ucontext.h/conform = yes
|
|
test-xfail-POSIX2008/arpa/inet.h/conform = yes
|
|
test-xfail-POSIX2008/netdb.h/conform = yes
|
|
test-xfail-POSIX2008/netinet/in.h/conform = yes
|
|
test-xfail-POSIX2008/signal.h/conform = yes
|
|
test-xfail-POSIX2008/sys/socket.h/conform = yes
|
|
test-xfail-POSIX2008/sys/wait.h/conform = yes
|
|
test-xfail-XOPEN2K8/signal.h/conform = yes
|
|
test-xfail-XOPEN2K8/sys/wait.h/conform = yes
|
|
|
|
conformtest-cc-flags = -I../include $(+sysdep-includes) $(sysincludes) -I..
|
|
$(conformtest-header-tests): $(objpfx)%/conform.out: \
|
|
conformtest.pl $(conformtest-headers-data)
|
|
(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
|
|
mkdir -p $(@D)/scratch; \
|
|
$(PERL) conformtest.pl --tmpdir=$(@D)/scratch --cc='$(CC)' \
|
|
--flags='$(conformtest-cc-flags)' --standard=$$std \
|
|
--headers=$$hdr > $@); \
|
|
$(evaluate-test)
|
|
|
|
$(linknamespace-symlists-tests): $(objpfx)symlist-%: list-header-symbols.pl
|
|
$(PERL) -w $< --tmpdir=$(objpfx) --cc='$(CC)' \
|
|
--flags='$(conformtest-cc-flags)' --standard=$* \
|
|
--headers="$(strip $(conformtest-headers-$*))" \
|
|
> $@ 2> $@.err; \
|
|
$(evaluate-test)
|
|
|
|
linknamespace-libs-isoc = $(common-objpfx)libc.a $(common-objpfx)math/libm.a
|
|
linknamespace-libs = $(linknamespace-libs-isoc) \
|
|
$(common-objpfx)rt/librt.a $(static-thread-library)
|
|
linknamespace-libs-ISO = $(linknamespace-libs-isoc)
|
|
linknamespace-libs-ISO99 = $(linknamespace-libs-isoc)
|
|
linknamespace-libs-ISO11 = $(linknamespace-libs-isoc)
|
|
linknamespace-libs-XPG3 = $(linknamespace-libs-isoc)
|
|
linknamespace-libs-XPG4 = $(linknamespace-libs-isoc)
|
|
linknamespace-libs-POSIX = $(linknamespace-libs)
|
|
linknamespace-libs-UNIX98 = $(linknamespace-libs)
|
|
linknamespace-libs-XOPEN2K = $(linknamespace-libs)
|
|
linknamespace-libs-POSIX2008 = $(linknamespace-libs)
|
|
linknamespace-libs-XOPEN2K8 = $(linknamespace-libs)
|
|
|
|
$(linknamespace-symlist-stdlibs-tests): $(objpfx)symlist-stdlibs-%: \
|
|
$(linknamespace-libs)
|
|
LC_ALL=C $(READELF) -W -s $(linknamespace-libs-$*) > $@; \
|
|
$(evaluate-test)
|
|
|
|
$(linknamespace-header-tests): $(objpfx)%/linknamespace.out: \
|
|
linknamespace.pl \
|
|
$(linknamespace-symlist-stdlibs-tests)
|
|
(set -e; std_hdr=$*; std=$${std_hdr%%/*}; hdr=$${std_hdr#*/}; \
|
|
mkdir -p $(@D)/scratch; \
|
|
$(PERL) -w $< --tmpdir=$(@D)/scratch --cc='$(CC)' \
|
|
--flags='$(conformtest-cc-flags)' --standard=$$std \
|
|
--stdsyms=$(objpfx)symlist-$$std --header=$$hdr \
|
|
--libsyms=$(objpfx)symlist-stdlibs-$$std \
|
|
--readelf='$(READELF)' \
|
|
> $@ 2>&1); \
|
|
$(evaluate-test)
|
|
|
|
# Pre-standard C feature no longer supported by GCC (obsoleted in
|
|
# newer POSIX standards).
|
|
test-xfail-XPG3/varargs.h/linknamespace = yes
|
|
test-xfail-XPG4/varargs.h/linknamespace = yes
|
|
test-xfail-UNIX98/varargs.h/linknamespace = yes
|
|
|
|
# Header not provided by glibc.
|
|
test-xfail-XPG4/ndbm.h/linknamespace = yes
|
|
test-xfail-UNIX98/ndbm.h/linknamespace = yes
|
|
test-xfail-XOPEN2K/ndbm.h/linknamespace = yes
|
|
test-xfail-XOPEN2K8/ndbm.h/linknamespace = yes
|