Differential D18988 Diff 53407 head/lib/libthr/Makefile

Changeset View

Standalone View

head/lib/libthr/Makefile

	Show All 21 Lines
	CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include			CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
	CFLAGS+=-I${.CURDIR}/sys			CFLAGS+=-I${.CURDIR}/sys
	CFLAGS+=-I${SRCTOP}/libexec/rtld-elf			CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
	CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}			CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
	CFLAGS+=-I${SRCTOP}/lib/libthread_db			CFLAGS+=-I${SRCTOP}/lib/libthread_db
	CFLAGS+=-Winline			CFLAGS+=-Winline

	CFLAGS.thr_stack.c+= -Wno-cast-align			CFLAGS.thr_stack.c+= -Wno-cast-align
				CFLAGS.malloc.c+= -Wno-cast-align
	.include <bsd.compiler.mk>			.include <bsd.compiler.mk>
	.if !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 40300)			.if !(${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 40300)
	CFLAGS.thr_symbols.c+= -Wno-missing-variable-declarations			CFLAGS.thr_symbols.c+= -Wno-missing-variable-declarations
	.endif			.endif

	.ifndef NO_THREAD_UNWIND_STACK			.ifndef NO_THREAD_UNWIND_STACK
	CFLAGS+=-fexceptions			CFLAGS+=-fexceptions
	CFLAGS+=-D_PTHREAD_FORCED_UNWIND			CFLAGS+=-D_PTHREAD_FORCED_UNWIND
	.endif			.endif

	LDFLAGS+=-Wl,-znodelete			LDFLAGS+=-Wl,-znodelete

	VERSION_DEF=${SRCTOP}/lib/libc/Versions.def			VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
	SYMBOL_MAPS=${.CURDIR}/pthread.map			SYMBOL_MAPS=${.CURDIR}/pthread.map

	MAN= libthr.3			MAN= libthr.3

	# enable extra internal consistency checks			# enable extra internal consistency checks
	CFLAGS+=-D_PTHREADS_INVARIANTS			CFLAGS+=-D_PTHREADS_INVARIANTS

	PRECIOUSLIB=			PRECIOUSLIB=

	.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}			.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
				.PATH: ${SRCTOP}/libexec/rtld-elf

	.if exists(${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc)			.if exists(${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc)
	.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"			.include "${.CURDIR}/arch/${MACHINE_CPUARCH}/Makefile.inc"
	.endif			.endif
	.include "${.CURDIR}/sys/Makefile.inc"			.include "${.CURDIR}/sys/Makefile.inc"
	.include "${.CURDIR}/thread/Makefile.inc"			.include "${.CURDIR}/thread/Makefile.inc"
				SRCS+= malloc.c
				arichardsonUnsubmitted Not Done Inline Actions Unlikely to make a big code size difference, but couldn't we use the version from rtld when building a shared library? arichardson: Unlikely to make a big code size difference, but couldn't we use the version from rtld when…
				kibAuthorUnsubmitted Done Inline Actions Do you mean exporting __crt_ symbols from rtld and sharing the allocator between rtld and libthr ? I evaluated this option. The main argument against it is that rtld purpose is to do the dynamic linking and thats all. It should not provide any other runtime services. Of course this is somewhat blurry since e.g. rtld implements runtime part of TLS support, but it is significantly intertwined with dynamic libraries loading anyway. Secondary objection is that I would need to use rtld bind lock to synchronize libthr allocations. Argument pro is that we would use the single arena for both rtld and libthr causing less fragmenation and other overhead.. So I decided to not over-complicate the setup. kib: Do you mean exporting __crt_ symbols from rtld and sharing the allocator between rtld and…

	.if ${MK_INSTALLLIB} != "no"			.if ${MK_INSTALLLIB} != "no"
	SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a			SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
	.endif			.endif
	.if !defined(NO_PIC)			.if !defined(NO_PIC)
	SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so			SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
	.endif			.endif
	.if ${MK_PROFILE} != "no"			.if ${MK_PROFILE} != "no"
	SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a			SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
	.endif			.endif

	HAS_TESTS=			HAS_TESTS=
	SUBDIR.${MK_TESTS}+= tests			SUBDIR.${MK_TESTS}+= tests

	.include <bsd.lib.mk>			.include <bsd.lib.mk>