diff options
| author | deischen <deischen@FreeBSD.org> | 2004-01-30 12:13:17 +0000 |
|---|---|---|
| committer | deischen <deischen@FreeBSD.org> | 2004-01-30 12:13:17 +0000 |
| commit | 674bc2cc3f8367cff374b28808cc340aaedbaf39 (patch) | |
| tree | 3cf1e39567cd0b9cfa479d94c8f87ad6f598c41e /lib | |
| parent | 91983f91e1038ac72fd2cde1e3ad69bf99024597 (diff) | |
| download | FreeBSD-src-674bc2cc3f8367cff374b28808cc340aaedbaf39.zip FreeBSD-src-674bc2cc3f8367cff374b28808cc340aaedbaf39.tar.gz | |
Change libkse back to libpthread and make it the default
thread library for i386, amd64, and ia64. For alpha
and sparc64 the library is not changed and remains libkse,
and links are installed so that libpthread -> libc_r.
The gcc -pthread option will be changed in a separate
commit so that it links to -lpthread instead of -lc_r.
Approved by: re@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc_r/Makefile | 10 | ||||
| -rw-r--r-- | lib/libkse/Makefile | 4 | ||||
| -rw-r--r-- | lib/libpthread/Makefile | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index 5599634..6db3fff 100644 --- a/lib/libc_r/Makefile +++ b/lib/libc_r/Makefile @@ -25,4 +25,14 @@ PRECIOUSLIB= yes .include "${.CURDIR}/uthread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" +SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a +.if !defined(NOPIC) +SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libpthread.so +.endif +.if !defined(NOPROFILE) +SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread.a +.endif +.endif + .include <bsd.lib.mk> diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index 38711b2..469d007 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -7,7 +7,11 @@ # 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. +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" LIB=kse +.else +LIB=pthread +.endif SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index 38711b2..469d007 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -7,7 +7,11 @@ # 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. +.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" LIB=kse +.else +LIB=pthread +.endif SHLIB_MAJOR= 1 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ |
