From bd224d495e5704daf7f55d3929483d35212755a7 Mon Sep 17 00:00:00 2001 From: Daniel Eischen Date: Fri, 30 Jan 2004 12:13:17 +0000 Subject: [PATCH] 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@ --- lib/libc_r/Makefile | 10 ++++++++++ lib/libkse/Makefile | 4 ++++ lib/libpthread/Makefile | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index 5599634f1846..6db3fff59346 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 diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index 38711b260991..469d00761d7f 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 38711b260991..469d00761d7f 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 \