20fe2c9465
The amd64, i386, and sparc64 versions were identical, with the one difference where the former two used inline asm instead of _tcb_get. I have compared the function before and after replacing the asm with _tcb_get and found the object files to be identical. The arm, mips, and powerpc versions were almost identical. The only difference was the powerpc version used an alignment of 1 where arm and mips used 16. As this is an increase in alignment is will be safe. Along with this arm, mips, and powerpc all passed, when initial was true, the value returned from _tcb_get as the first argument to _rtld_allocate_tls. This would then return this pointer back to the caller. We can remove these extra calls by checking if initial is set and setting the thread control block directly. As this is what the sparc64 code does we can use it directly. As after these observations all the architectures can now have identical code we can merge them into a common file. Differential Revision: https://reviews.freebsd.org/D1556 Reviewed by: kib Sponsored by: The FreeBSD Foundation
71 lines
1.8 KiB
Makefile
71 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}
|
|
|
|
.if exists(${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc)
|
|
.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
|
|
.endif
|
|
.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>
|