8495e8b1e9
(or loading a dso linked to libthr.so into process which was not linked against threading library). - Remove libthr interposers of the libc functions, including __error(). Instead, functions calls are indirected through the interposing table, similar to how pthread stubs in libc are already done. Libc by default points either to syscall trampolines or to existing libc implementations. On libthr load, libthr rewrites the pointers to the cancellable implementations already in libthr. The interposition table is separate from pthreads stubs indirection table to not pull pthreads stubs into static binaries. - Postpone the malloc(3) internal mutexes initialization until libthr is loaded. This avoids recursion between calloc(3) and static pthread_mutex_t initialization. - Reinstall signal handlers with wrapper on libthr load. The _rtld_is_dlopened(3) is used to avoid useless calls to sigaction(2) when libthr is statically referenced from the main binary. In the process, fix openat(2), swapcontext(2) and setcontext(2) interposing. The libc symbols were exported at different versions than libthr interposers. Export both libc and libthr versions from libc now, with default set to the higher version from libthr. Remove unused and disconnected swapcontext(3) userspace implementation from libc/gen. No objections from: deischen Tested by: pho, antoine (exp-run) (previous versions) Sponsored by: The FreeBSD Foundation MFC after: 1 week
69 lines
1.8 KiB
Makefile
69 lines
1.8 KiB
Makefile
# $FreeBSD$
|
|
#
|
|
# All library objects contain FreeBSD revision strings by default; they may be
|
|
# excluded as a space-saving measure. To produce a library that does
|
|
# not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
|
|
# below. Note, there are no IDs for syscall stubs whose sources are generated.
|
|
# To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
|
|
# (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the
|
|
# system call stubs.
|
|
|
|
SHLIBDIR?= /lib
|
|
|
|
.include <src.opts.mk>
|
|
MK_SSP= no
|
|
|
|
LIB=thr
|
|
SHLIB_MAJOR= 3
|
|
WARNS?= 3
|
|
CFLAGS+=-DPTHREAD_KERNEL
|
|
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
|
|
-I${.CURDIR}/../../include
|
|
CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
|
|
CFLAGS+=-I${.CURDIR}/sys
|
|
CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
|
|
CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
|
|
CFLAGS+=-I${.CURDIR}/../libthread_db
|
|
CFLAGS+=-Winline
|
|
|
|
.ifndef NO_THREAD_UNWIND_STACK
|
|
CFLAGS+=-fexceptions
|
|
CFLAGS+=-D_PTHREAD_FORCED_UNWIND
|
|
.endif
|
|
|
|
LDFLAGS+=-Wl,-znodelete
|
|
|
|
VERSION_DEF=${.CURDIR}/../libc/Versions.def
|
|
SYMBOL_MAPS=${.CURDIR}/pthread.map
|
|
|
|
MAN= libthr.3
|
|
|
|
# enable extra internal consistancy checks
|
|
CFLAGS+=-D_PTHREADS_INVARIANTS
|
|
|
|
PRECIOUSLIB=
|
|
|
|
.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
|
|
|
|
.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
|
|
.include "${.CURDIR}/sys/Makefile.inc"
|
|
.include "${.CURDIR}/thread/Makefile.inc"
|
|
|
|
.if ${MK_INSTALLLIB} != "no"
|
|
SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
|
|
.endif
|
|
.if !defined(NO_PIC)
|
|
SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
|
|
.endif
|
|
.if ${MK_PROFILE} != "no"
|
|
SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
|
|
.endif
|
|
|
|
.if ${MK_SYSCALL_COMPAT} != "no"
|
|
CFLAGS+=-DSYSCALL_COMPAT
|
|
.endif
|
|
|
|
.include <bsd.arch.inc.mk>
|
|
|
|
.include <bsd.lib.mk>
|