diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 8 | ||||
| -rw-r--r-- | lib/libkse/Makefile | 10 | ||||
| -rw-r--r-- | lib/libkse/kse.map (renamed from lib/libpthread/pthread.map) | 4 | ||||
| -rw-r--r-- | lib/libkse/test/guard_b.exp | 1 | ||||
| -rw-r--r-- | lib/libkse/test/hello_d.exp | 1 | ||||
| -rw-r--r-- | lib/libkse/test/join_leak_d.exp | 1 | ||||
| -rw-r--r-- | lib/libkse/test/mutex_d.exp | 1 | ||||
| -rw-r--r-- | lib/libkse/test/sem_d.exp | 1 | ||||
| -rw-r--r-- | lib/libkse/test/sigsuspend_d.exp | 1 | ||||
| -rw-r--r-- | lib/libkse/test/sigwait_d.exp | 1 | ||||
| -rw-r--r-- | lib/libpthread/Makefile | 60 |
11 files changed, 18 insertions, 71 deletions
diff --git a/lib/Makefile b/lib/Makefile index 890c3bc6cad0d..0f4515133c041 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -34,7 +34,7 @@ SUBDIR= ${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \ libgssapi libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ - libpmc ${_libpthread} librt ${_libsdp} ${_libsm} ${_libsmb} \ + libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} @@ -101,11 +101,13 @@ _libsmb= libsmb .endif .if ${MK_LIBPTHREAD} != "no" -_libpthread= libpthread +.if ${MK_LIBKSE} != "no" +_libkse= libkse .endif .if ${MK_LIBTHR} != "no" -_libthr= libthr +_libthr= libthr +.endif .endif .if ${MACHINE_ARCH} != "arm" diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index ed80d758acca9..7c7f8f285a09b 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -10,13 +10,13 @@ .include <bsd.own.mk> -.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \ +.if (${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no") && \ ${SHLIBDIR} == "/usr/lib" SHLIBDIR= /lib .endif LIB=kse -SHLIB_MAJOR= 3 +SHLIB_MAJOR= 0 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ -I${.CURDIR}/../../include @@ -26,7 +26,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} CFLAGS+=-fno-builtin -# Uncomment this if you want libpthread to contain debug information for +# Uncomment this if you want libkse to contain debug information for # thread locking. CFLAGS+=-D_LOCK_DEBUG WARNS?=2 @@ -38,7 +38,7 @@ WARNS?=2 # Enable extra internal consistancy checks. CFLAGS+=-D_PTHREADS_INVARIANTS -Wall -VERSION_MAP=${.CURDIR}/pthread.map +VERSION_MAP=${.CURDIR}/kse.map PRECIOUSLIB= @@ -47,7 +47,7 @@ PRECIOUSLIB= .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" -.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no" +.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so diff --git a/lib/libpthread/pthread.map b/lib/libkse/kse.map index 1f2787ca25fd7..e8888df5fba75 100644 --- a/lib/libpthread/pthread.map +++ b/lib/libkse/kse.map @@ -1,6 +1,4 @@ -/* - * $FreeBSD$ - */ +/* $FreeBSD$ */ /* * Use the same naming scheme as libc. diff --git a/lib/libkse/test/guard_b.exp b/lib/libkse/test/guard_b.exp index 8e5b9e426a214..cc6747094a154 100644 --- a/lib/libkse/test/guard_b.exp +++ b/lib/libkse/test/guard_b.exp @@ -1,3 +1,4 @@ +# $FreeBSD$ Test begin No overflow: Overflow: diff --git a/lib/libkse/test/hello_d.exp b/lib/libkse/test/hello_d.exp index 802992c4220de..47be080f357ad 100644 --- a/lib/libkse/test/hello_d.exp +++ b/lib/libkse/test/hello_d.exp @@ -1 +1,2 @@ +# $FreeBSD$ Hello world diff --git a/lib/libkse/test/join_leak_d.exp b/lib/libkse/test/join_leak_d.exp index 369a88dd24049..a54de72b8908b 100644 --- a/lib/libkse/test/join_leak_d.exp +++ b/lib/libkse/test/join_leak_d.exp @@ -1,2 +1,3 @@ +# $FreeBSD$ Test begin Test end diff --git a/lib/libkse/test/mutex_d.exp b/lib/libkse/test/mutex_d.exp index de8a4e42d8e2a..dd2f7bd1e5260 100644 --- a/lib/libkse/test/mutex_d.exp +++ b/lib/libkse/test/mutex_d.exp @@ -1,3 +1,4 @@ +# $FreeBSD$ Testing pthread_mutex_init -------------------------- diff --git a/lib/libkse/test/sem_d.exp b/lib/libkse/test/sem_d.exp index b0de3da1f5e66..cd86f12411092 100644 --- a/lib/libkse/test/sem_d.exp +++ b/lib/libkse/test/sem_d.exp @@ -1,3 +1,4 @@ +# $FreeBSD$ Test begin Got semaphore Got semaphore diff --git a/lib/libkse/test/sigsuspend_d.exp b/lib/libkse/test/sigsuspend_d.exp index 901fa50dd2d14..03c9a727799e9 100644 --- a/lib/libkse/test/sigsuspend_d.exp +++ b/lib/libkse/test/sigsuspend_d.exp @@ -1,3 +1,4 @@ +# $FreeBSD$ -> Suspender thread signal handler caught signal 16 Sigsuspend woke up by signal 16 -> Suspender thread signal handler caught signal 16 diff --git a/lib/libkse/test/sigwait_d.exp b/lib/libkse/test/sigwait_d.exp index 2e9b2c4925255..b9245be31f0ec 100644 --- a/lib/libkse/test/sigwait_d.exp +++ b/lib/libkse/test/sigwait_d.exp @@ -1,3 +1,4 @@ +# $FreeBSD$ Sigwait caught signal 16 Sigwait caught signal 16 Sigwait caught signal 30 diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile deleted file mode 100644 index ed80d758acca9..0000000000000 --- a/lib/libpthread/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# $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. - -.include <bsd.own.mk> - -.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \ - ${SHLIBDIR} == "/usr/lib" -SHLIBDIR= /lib -.endif - -LIB=kse -SHLIB_MAJOR= 3 -CFLAGS+=-DPTHREAD_KERNEL -CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ - -I${.CURDIR}/../../include -CFLAGS+=-I${.CURDIR}/arch/${MACHINE_ARCH}/include -CFLAGS+=-I${.CURDIR}/sys -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf -CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_ARCH} -CFLAGS+=-fno-builtin - -# Uncomment this if you want libpthread to contain debug information for -# thread locking. -CFLAGS+=-D_LOCK_DEBUG -WARNS?=2 - -# Uncomment this if you want to build a 1:1 threading mode library -# however it is no longer strictly conformed to POSIX -# CFLAGS+=-DSYSTEM_SCOPE_ONLY - -# Enable extra internal consistancy checks. -CFLAGS+=-D_PTHREADS_INVARIANTS -Wall - -VERSION_MAP=${.CURDIR}/pthread.map - -PRECIOUSLIB= - -.include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" -.include "${.CURDIR}/support/Makefile.inc" -.include "${.CURDIR}/sys/Makefile.inc" -.include "${.CURDIR}/thread/Makefile.inc" - -.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no" -SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a -.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 -.endif - -.include <bsd.lib.mk> |