mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-18 00:41:06 +00:00
8082d91e1c
Many of the things defined by bits/signum.h are invariant across all supported operating systems. This patch factors out all of them to a new header bits/signum-generic.h, which each bits/signum.h will include and then override whichever things need adjustment. Normally that will mean, at most, adding or changing a few signal numbers. A user-visible side effect is that the obsolete signal constant SIGUNUSED (which is an alias for SIGSYS on all platforms that define it) is no longer exposed by any version of bits/signum.h. A side effect only relevant to glibc hackers is that _NSIG is now defined in terms of __SIGRTMAX, instead of the other way around. This is because __SIGRTMAX varies from platform to platform, but _NSIG==__SIGRTMAX+1 is true universally. If your platform doesn't support realtime signals, leave __SIGRTMAX equal to __SIGRTMIN. I also added a Linux-specific test to make sure that our signal constants match the ones in <asm/signal.h>, since we can't use that header (it's not even vaguely namespace-clean). * bits/signum-generic.h: Renamed from bits/signum.h. Add proper multiple include guard and misuse check. Define __SIGRTMIN = __SIGRTMAX = 32, and define _NSIG = __SIGRTMAX+1. Move definition of SIGIO to "archaic names for compatibility" section. * bits/signum.h: New file which just includes bits/signum-generic.h. * sysdeps/unix/bsd/bits/signum.h * sysdeps/unix/sysv/linux/bits/signum.h * sysdeps/unix/sysv/linux/alpha/bits/signum.h * sysdeps/unix/sysv/linux/hppa/bits/signum.h * sysdeps/unix/sysv/linux/mips/bits/signum.h * sysdeps/unix/sysv/linux/sparc/bits/signum.h Just include <bits/signum-generic.h> and then add or adjust signal constants. Do not define SIGUNUSED, SIGRTMIN, or SIGRTMAX. * signal/Makefile: Install bits/signum-generic.h. * signal/signal.h: Define SIGRTMIN and SIGRTMAX here. * sysdeps/generic/siglist.h: SIGSYS and SIGWINCH are universal. Prefer SIGPOLL to SIGIO. Simplify #ifdeffage. * sysdeps/unix/sysv/linux/tst-signal-numbers.sh: New test. * sysdeps/unix/sysv/linux/Makefile: Run it.
228 lines
7.6 KiB
Makefile
228 lines
7.6 KiB
Makefile
ifeq ($(subdir),csu)
|
|
sysdep_routines += errno-loc
|
|
endif
|
|
|
|
ifeq ($(subdir),assert)
|
|
CFLAGS-assert.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>'
|
|
CFLAGS-assert-perr.c += -DFATAL_PREPARE_INCLUDE='<fatal-prepare.h>'
|
|
endif
|
|
|
|
ifeq ($(subdir),malloc)
|
|
CFLAGS-malloc.c += -DMORECORE_CLEARS=2
|
|
endif
|
|
|
|
ifeq ($(subdir),misc)
|
|
include $(firstword $(wildcard $(sysdirs:=/sysctl.mk)))
|
|
|
|
sysdep_routines += clone umount umount2 readahead \
|
|
setfsuid setfsgid epoll_pwait signalfd \
|
|
eventfd eventfd_read eventfd_write prlimit \
|
|
personality epoll_wait tee vmsplice splice \
|
|
open_by_handle_at
|
|
|
|
CFLAGS-gethostid.c = -fexceptions
|
|
CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-vmsplice.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-splice.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))"
|
|
|
|
# Note that bits/mman-linux.h is listed here though the file lives in the
|
|
# top-level bits/ subdirectory instead of here in sysdeps/.../linux/bits/.
|
|
# That is just so that other (non-Linux) configurations for whom the
|
|
# bits/mman-linux.h definitions work well do not have to duplicate the
|
|
# contents of the file. The file must still be listed in sysdep_headers
|
|
# here and in any non-Linux configuration that uses it; other
|
|
# configurations will not install the file.
|
|
sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
|
|
sys/klog.h \
|
|
sys/user.h sys/prctl.h \
|
|
sys/kd.h sys/soundcard.h sys/vt.h \
|
|
sys/quota.h sys/fsuid.h \
|
|
scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h sys/pci.h \
|
|
sys/raw.h sys/personality.h sys/epoll.h \
|
|
bits/a.out.h sys/inotify.h sys/signalfd.h sys/eventfd.h \
|
|
sys/timerfd.h sys/fanotify.h bits/eventfd.h bits/inotify.h \
|
|
bits/signalfd.h bits/timerfd.h bits/epoll.h \
|
|
bits/socket_type.h bits/syscall.h bits/sysctl.h \
|
|
bits/mman-linux.h \
|
|
bits/siginfo-arch.h bits/siginfo-consts-arch.h
|
|
|
|
tests += tst-clone tst-clone2 tst-fanotify tst-personality tst-quota \
|
|
tst-sync_file_range test-errno-linux
|
|
|
|
# Generate the list of SYS_* macros for the system calls (__NR_* macros).
|
|
|
|
# If there is more than one syscall list for different architecture
|
|
# variants, the CPU/Makefile defines abi-variants to be a list of names
|
|
# for those variants (e.g. 32 64), and, for each variant, defines
|
|
# abi-$(variant)-options to be compiler options to cause <asm/unistd.h>
|
|
# to define the desired list of syscalls and abi-$(variant)-condition to
|
|
# be the condition for those options to use in a C #if condition.
|
|
# abi-includes may be defined to a list of headers to include
|
|
# in the generated header, if the default does not suffice.
|
|
#
|
|
# The generated header is compiled with `-ffreestanding' to avoid any
|
|
# circular dependencies against the installed implementation headers.
|
|
# Such a dependency would require the implementation header to be
|
|
# installed before the generated header could be built (See bug 15711).
|
|
# In current practice the generated header dependencies do not include
|
|
# any of the implementation headers removed by the use of `-ffreestanding'.
|
|
|
|
$(objpfx)bits/syscall%h $(objpfx)bits/syscall%d: ../sysdeps/unix/sysv/linux/sys/syscall.h
|
|
$(make-target-directory)
|
|
{ \
|
|
echo '/* Generated at libc build time from kernel syscall list. */';\
|
|
echo ''; \
|
|
echo '#ifndef _SYSCALL_H'; \
|
|
echo '# error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."'; \
|
|
echo '#endif'; \
|
|
echo ''; \
|
|
$(foreach h,$(abi-includes), echo '#include <$(h)>';) \
|
|
echo ''; \
|
|
$(if $(abi-variants), \
|
|
$(foreach v,$(abi-variants),\
|
|
$(CC) -ffreestanding -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \
|
|
-x c $(sysincludes) $< $(abi-$(v)-options) \
|
|
-D_LIBC -dM | \
|
|
sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
|
|
LC_ALL=C sort > $(@:.d=.h).new$(v); \
|
|
$(if $(abi-$(v)-condition),\
|
|
echo '#if $(abi-$(v)-condition)';) \
|
|
cat $(@:.d=.h).new$(v); \
|
|
$(if $(abi-$(v)-condition),echo '#endif';) \
|
|
rm -f $(@:.d=.h).new$(v); \
|
|
), \
|
|
$(CC) -ffreestanding -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \
|
|
-x c $(sysincludes) $< \
|
|
-D_LIBC -dM | \
|
|
sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' | \
|
|
LC_ALL=C sort;) \
|
|
} > $(@:.d=.h).new
|
|
mv -f $(@:.d=.h).new $(@:.d=.h)
|
|
ifdef abi-variants
|
|
ifneq (,$(objpfx))
|
|
sed $(sed-remove-objpfx) \
|
|
$(foreach v,$(abi-variants),$(@:.h=.d)-t$(v)) > $(@:.h=.d)-t3
|
|
else
|
|
cat $(foreach v,$(abi-variants),$(@:.h=.d)-t$(v)) \
|
|
> $(@:.h=.d)-t3
|
|
endif
|
|
rm -f $(foreach v,$(abi-variants),$(@:.h=.d)-t$(v))
|
|
mv -f $(@:.h=.d)-t3 $(@:.h=.d)
|
|
else
|
|
mv -f $(@:.h=.d)-t $(@:.h=.d)
|
|
endif
|
|
|
|
ifndef no_deps
|
|
# Get the generated list of dependencies (probably /usr/include/asm/unistd.h).
|
|
-include $(objpfx)bits/syscall.d
|
|
endif
|
|
generated += bits/syscall.h bits/syscall.d
|
|
endif
|
|
|
|
ifeq ($(subdir),time)
|
|
sysdep_headers += sys/timex.h bits/timex.h
|
|
|
|
sysdep_routines += ntp_gettime ntp_gettimex
|
|
endif
|
|
|
|
ifeq ($(subdir),signal)
|
|
tests-special += $(objpfx)tst-signal-numbers.out
|
|
# Depending on signal.o* is a hack. What we actually want is a dependency
|
|
# on signal.h and everything it includes. That's impractical to write
|
|
# in this context, but signal.c includes signal.h and not much else so it'll
|
|
# be conservatively correct.
|
|
$(objpfx)tst-signal-numbers.out: \
|
|
../sysdeps/unix/sysv/linux/tst-signal-numbers.sh \
|
|
$(objpfx)signal.o*
|
|
AWK=$(AWK) $(SHELL) ../sysdeps/unix/sysv/linux/tst-signal-numbers.sh \
|
|
$(CC) $(patsubst -DMODULE_NAME=%,-DMODULE_NAME=testsuite,$(CPPFLAGS)) \
|
|
< /dev/null > $@; $(evaluate-test)
|
|
endif
|
|
|
|
ifeq ($(subdir),socket)
|
|
sysdep_headers += net/if_ppp.h net/ppp-comp.h \
|
|
net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
|
|
net/if_slip.h net/if_packet.h net/if_shaper.h
|
|
sysdep_routines += cmsg_nxthdr
|
|
CFLAGS-recvmmsg.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-sendmmsg.c = -fexceptions -fasynchronous-unwind-tables
|
|
endif
|
|
|
|
ifeq ($(subdir),sunrpc)
|
|
sysdep_headers += nfs/nfs.h
|
|
endif
|
|
|
|
ifeq ($(subdir),termios)
|
|
sysdep_headers += termio.h
|
|
endif
|
|
|
|
ifeq ($(subdir),posix)
|
|
sysdep_headers += bits/initspin.h
|
|
|
|
sysdep_routines += sched_getcpu
|
|
|
|
tests += tst-affinity tst-affinity-pid
|
|
|
|
CFLAGS-fork.c = $(libio-mtsafe)
|
|
CFLAGS-getpid.o = -fomit-frame-pointer
|
|
CFLAGS-getpid.os = -fomit-frame-pointer
|
|
endif
|
|
|
|
ifeq ($(subdir),inet)
|
|
sysdep_headers += netinet/if_fddi.h netinet/if_tr.h \
|
|
netipx/ipx.h netash/ash.h netax25/ax25.h netatalk/at.h \
|
|
netrom/netrom.h netpacket/packet.h netrose/rose.h \
|
|
neteconet/ec.h netiucv/iucv.h
|
|
sysdep_routines += netlink_assert_response
|
|
endif
|
|
|
|
# Don't compile the ctype glue code, since there is no old non-GNU C library.
|
|
inhibit-glue = yes
|
|
|
|
ifeq ($(subdir),dirent)
|
|
sysdep_routines += getdirentries getdirentries64
|
|
endif
|
|
|
|
ifeq ($(subdir),nis)
|
|
CFLAGS-ypclnt.c = -DUSE_BINDINGDIR=1
|
|
endif
|
|
|
|
ifeq ($(subdir),io)
|
|
sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
|
|
sync_file_range fallocate fallocate64
|
|
sysdep_headers += bits/fcntl-linux.h
|
|
|
|
tests += tst-fallocate tst-fallocate64
|
|
endif
|
|
|
|
ifeq ($(subdir),elf)
|
|
sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
|
|
dl-fxstatat64
|
|
|
|
libof-lddlibc4 = lddlibc4
|
|
|
|
others += pldd
|
|
install-bin += pldd
|
|
$(objpfx)pldd: $(objpfx)xmalloc.o
|
|
endif
|
|
|
|
ifeq ($(subdir),rt)
|
|
CFLAGS-mq_send.c += -fexceptions
|
|
CFLAGS-mq_receive.c += -fexceptions
|
|
endif
|
|
|
|
ifeq ($(subdir),nscd)
|
|
sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
|
|
CFLAGS-gai.c += -DNEED_NETLINK
|
|
endif
|
|
|
|
ifeq ($(subdir),nptl)
|
|
tests += tst-align-clone tst-getpid1 \
|
|
tst-thread-affinity-pthread tst-thread-affinity-pthread2 \
|
|
tst-thread-affinity-sched
|
|
tests-internal += tst-setgetname
|
|
endif
|