aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libkse/Makefile2
-rw-r--r--lib/libkse/test/Makefile4
-rw-r--r--lib/libkse/test/README6
-rw-r--r--lib/libkse/test/propagate_s.pl2
-rw-r--r--lib/libpthread/Makefile2
-rw-r--r--lib/libpthread/man/pthread_attr.32
-rw-r--r--lib/libpthread/man/pthread_cancel.32
-rw-r--r--lib/libpthread/man/pthread_cleanup_pop.32
-rw-r--r--lib/libpthread/man/pthread_cleanup_push.32
-rw-r--r--lib/libpthread/man/pthread_cond_broadcast.32
-rw-r--r--lib/libpthread/man/pthread_cond_destroy.32
-rw-r--r--lib/libpthread/man/pthread_cond_init.32
-rw-r--r--lib/libpthread/man/pthread_cond_signal.32
-rw-r--r--lib/libpthread/man/pthread_cond_timedwait.32
-rw-r--r--lib/libpthread/man/pthread_cond_wait.32
-rw-r--r--lib/libpthread/man/pthread_condattr.32
-rw-r--r--lib/libpthread/man/pthread_create.32
-rw-r--r--lib/libpthread/man/pthread_detach.32
-rw-r--r--lib/libpthread/man/pthread_equal.32
-rw-r--r--lib/libpthread/man/pthread_exit.32
-rw-r--r--lib/libpthread/man/pthread_getspecific.32
-rw-r--r--lib/libpthread/man/pthread_join.32
-rw-r--r--lib/libpthread/man/pthread_key_create.32
-rw-r--r--lib/libpthread/man/pthread_key_delete.32
-rw-r--r--lib/libpthread/man/pthread_kill.32
-rw-r--r--lib/libpthread/man/pthread_mutex_destroy.32
-rw-r--r--lib/libpthread/man/pthread_mutex_init.32
-rw-r--r--lib/libpthread/man/pthread_mutex_lock.32
-rw-r--r--lib/libpthread/man/pthread_mutex_trylock.32
-rw-r--r--lib/libpthread/man/pthread_mutex_unlock.32
-rw-r--r--lib/libpthread/man/pthread_mutexattr.32
-rw-r--r--lib/libpthread/man/pthread_once.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_destroy.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_init.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_rdlock.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_unlock.32
-rw-r--r--lib/libpthread/man/pthread_rwlock_wrlock.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_destroy.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_getpshared.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_init.32
-rw-r--r--lib/libpthread/man/pthread_rwlockattr_setpshared.32
-rw-r--r--lib/libpthread/man/pthread_schedparam.32
-rw-r--r--lib/libpthread/man/pthread_self.32
-rw-r--r--lib/libpthread/man/pthread_setspecific.32
-rw-r--r--lib/libpthread/man/pthread_sigmask.32
-rw-r--r--lib/libpthread/man/pthread_testcancel.32
-rw-r--r--lib/libpthread/man/sem_destroy.32
-rw-r--r--lib/libpthread/man/sem_getvalue.32
-rw-r--r--lib/libpthread/man/sem_init.32
-rw-r--r--lib/libpthread/man/sem_open.32
-rw-r--r--lib/libpthread/man/sem_post.32
-rw-r--r--lib/libpthread/man/sem_wait.32
-rw-r--r--lib/libpthread/man/sigwait.32
-rw-r--r--lib/libpthread/test/Makefile4
-rw-r--r--lib/libpthread/test/README6
-rwxr-xr-xlib/libpthread/test/propagate_s.pl2
56 files changed, 62 insertions, 62 deletions
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index 6d281af9b016..a250757a567f 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -14,7 +14,7 @@ CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
-# Uncomment this if you want libc_r to contain debug information for
+# Uncomment this if you want libpthread to contain debug information for
# thread locking.
CFLAGS+=-D_LOCK_DEBUG
diff --git a/lib/libkse/test/Makefile b/lib/libkse/test/Makefile
index 0eb530c3ef14..d34e3e72c7fb 100644
--- a/lib/libkse/test/Makefile
+++ b/lib/libkse/test/Makefile
@@ -1,7 +1,7 @@
#
# $FreeBSD$
#
-# Automated test suite for libc_r (pthreads).
+# Automated test suite for libpthread (pthreads).
#
# File lists.
@@ -26,7 +26,7 @@ CFLAGS := -Wall -pipe -g3
LDFLAGS_A := -static
LDFLAGS_P := -pg
LDFLAGS_S :=
-LIBS := -lc_r
+LIBS := -lpthread
# Flags passed to verify. "-v" or "-u" may be useful.
VFLAGS :=
diff --git a/lib/libkse/test/README b/lib/libkse/test/README
index 507ea4e19f74..8f625a1438e7 100644
--- a/lib/libkse/test/README
+++ b/lib/libkse/test/README
@@ -3,10 +3,10 @@ $FreeBSD$
This test suite is meant to test general functionality of pthreads, as well as
provide a simple framework for regression tests. In general, this test suite
can be used with any pthreads library, but in reality there are a number of
-libc_r-specific aspects to this test suite which would require some effort to
-get around if testing another pthreads library.
+libpthread-specific aspects to this test suite which would require some
+effort to get around if testing another pthreads library.
-This test suite assumes that libc_r is installed.
+This test suite assumes that libpthread is installed.
There are two forms of test that the 'verify' script understands. The simpler
form is the diff format, where the output of the test program is diff'ed with
diff --git a/lib/libkse/test/propagate_s.pl b/lib/libkse/test/propagate_s.pl
index 9cd5fb054ae1..6b8509043d98 100644
--- a/lib/libkse/test/propagate_s.pl
+++ b/lib/libkse/test/propagate_s.pl
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# Verify that no cancellation points are propagated inside of libc_r.
+# Verify that no cancellation points are propagated inside of libpthread.
#
# $FreeBSD$
#
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index 6d281af9b016..a250757a567f 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -14,7 +14,7 @@ CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE
CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
-I${.CURDIR}/../../include
-# Uncomment this if you want libc_r to contain debug information for
+# Uncomment this if you want libpthread to contain debug information for
# thread locking.
CFLAGS+=-D_LOCK_DEBUG
diff --git a/lib/libpthread/man/pthread_attr.3 b/lib/libpthread/man/pthread_attr.3
index ff692e2ba77f..9208fe58d74c 100644
--- a/lib/libpthread/man/pthread_attr.3
+++ b/lib/libpthread/man/pthread_attr.3
@@ -50,7 +50,7 @@
.Nm pthread_attr_getscope
.Nd thread attribute operations
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cancel.3 b/lib/libpthread/man/pthread_cancel.3
index 1b998e6eee1d..a64e3d7fd72d 100644
--- a/lib/libpthread/man/pthread_cancel.3
+++ b/lib/libpthread/man/pthread_cancel.3
@@ -6,7 +6,7 @@
.Nm pthread_cancel
.Nd cancel execution of a thread
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cleanup_pop.3 b/lib/libpthread/man/pthread_cleanup_pop.3
index 532130320136..85c22db21a01 100644
--- a/lib/libpthread/man/pthread_cleanup_pop.3
+++ b/lib/libpthread/man/pthread_cleanup_pop.3
@@ -34,7 +34,7 @@
.Nm pthread_cleanup_pop
.Nd call the first cleanup routine
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft void
diff --git a/lib/libpthread/man/pthread_cleanup_push.3 b/lib/libpthread/man/pthread_cleanup_push.3
index b7d797edfe62..f7cf663470ac 100644
--- a/lib/libpthread/man/pthread_cleanup_push.3
+++ b/lib/libpthread/man/pthread_cleanup_push.3
@@ -34,7 +34,7 @@
.Nm pthread_cleanup_push
.Nd add a cleanup function for thread exit
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft void
diff --git a/lib/libpthread/man/pthread_cond_broadcast.3 b/lib/libpthread/man/pthread_cond_broadcast.3
index b3947bd8ac00..4852615367da 100644
--- a/lib/libpthread/man/pthread_cond_broadcast.3
+++ b/lib/libpthread/man/pthread_cond_broadcast.3
@@ -34,7 +34,7 @@
.Nm pthread_cond_broadcast
.Nd unblock all threads waiting for a condition variable
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cond_destroy.3 b/lib/libpthread/man/pthread_cond_destroy.3
index ab1ea0f8d2c3..92c8392d98c5 100644
--- a/lib/libpthread/man/pthread_cond_destroy.3
+++ b/lib/libpthread/man/pthread_cond_destroy.3
@@ -34,7 +34,7 @@
.Nm pthread_cond_destroy
.Nd destroy a condition variable
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cond_init.3 b/lib/libpthread/man/pthread_cond_init.3
index 542110bbd6ad..70894108c04f 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -34,7 +34,7 @@
.Nm pthread_cond_init
.Nd create a condition variable
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cond_signal.3 b/lib/libpthread/man/pthread_cond_signal.3
index 4bb85c942b39..dac3dde2ae2d 100644
--- a/lib/libpthread/man/pthread_cond_signal.3
+++ b/lib/libpthread/man/pthread_cond_signal.3
@@ -34,7 +34,7 @@
.Nm pthread_cond_signal
.Nd unblock a thread waiting for a condition variable
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cond_timedwait.3 b/lib/libpthread/man/pthread_cond_timedwait.3
index afd16b5f0d02..dc1394548e1e 100644
--- a/lib/libpthread/man/pthread_cond_timedwait.3
+++ b/lib/libpthread/man/pthread_cond_timedwait.3
@@ -34,7 +34,7 @@
.Nm pthread_cond_timedwait
.Nd "wait on a condition variable for a specific amount of time"
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_cond_wait.3 b/lib/libpthread/man/pthread_cond_wait.3
index e464a1e524a5..dd84a633595b 100644
--- a/lib/libpthread/man/pthread_cond_wait.3
+++ b/lib/libpthread/man/pthread_cond_wait.3
@@ -34,7 +34,7 @@
.Nm pthread_cond_wait
.Nd wait on a condition variable
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_condattr.3 b/lib/libpthread/man/pthread_condattr.3
index 478e11264daf..4891089e1eb3 100644
--- a/lib/libpthread/man/pthread_condattr.3
+++ b/lib/libpthread/man/pthread_condattr.3
@@ -34,7 +34,7 @@
.Nm pthread_condattr_destroy
.Nd condition attribute operations
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_create.3 b/lib/libpthread/man/pthread_create.3
index 35f783c3ce9b..1998122e825e 100644
--- a/lib/libpthread/man/pthread_create.3
+++ b/lib/libpthread/man/pthread_create.3
@@ -37,7 +37,7 @@
.Nm pthread_create
.Nd create a new thread
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_detach.3 b/lib/libpthread/man/pthread_detach.3
index 15729af692c3..3147f64d4aa1 100644
--- a/lib/libpthread/man/pthread_detach.3
+++ b/lib/libpthread/man/pthread_detach.3
@@ -37,7 +37,7 @@
.Nm pthread_detach
.Nd detach a thread
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_equal.3 b/lib/libpthread/man/pthread_equal.3
index 8b733dabdf4d..1d1984356823 100644
--- a/lib/libpthread/man/pthread_equal.3
+++ b/lib/libpthread/man/pthread_equal.3
@@ -37,7 +37,7 @@
.Nm pthread_equal
.Nd compare thread IDs
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_exit.3 b/lib/libpthread/man/pthread_exit.3
index 0bfdad666029..9d9c730e90a3 100644
--- a/lib/libpthread/man/pthread_exit.3
+++ b/lib/libpthread/man/pthread_exit.3
@@ -37,7 +37,7 @@
.Nm pthread_exit
.Nd terminate the calling thread
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft void
diff --git a/lib/libpthread/man/pthread_getspecific.3 b/lib/libpthread/man/pthread_getspecific.3
index c7a04fadb646..515982eff77e 100644
--- a/lib/libpthread/man/pthread_getspecific.3
+++ b/lib/libpthread/man/pthread_getspecific.3
@@ -37,7 +37,7 @@
.Nm pthread_getspecific
.Nd get a thread-specific data value
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft void *
diff --git a/lib/libpthread/man/pthread_join.3 b/lib/libpthread/man/pthread_join.3
index 98ae70d888ef..005a94a30d75 100644
--- a/lib/libpthread/man/pthread_join.3
+++ b/lib/libpthread/man/pthread_join.3
@@ -37,7 +37,7 @@
.Nm pthread_join
.Nd wait for thread termination
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_key_create.3 b/lib/libpthread/man/pthread_key_create.3
index 7075dcc53d8a..81da624c84cf 100644
--- a/lib/libpthread/man/pthread_key_create.3
+++ b/lib/libpthread/man/pthread_key_create.3
@@ -37,7 +37,7 @@
.Nm pthread_key_create
.Nd thread-specific data key creation
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_key_delete.3 b/lib/libpthread/man/pthread_key_delete.3
index bc0cf8a38aad..b71142bed0d0 100644
--- a/lib/libpthread/man/pthread_key_delete.3
+++ b/lib/libpthread/man/pthread_key_delete.3
@@ -37,7 +37,7 @@
.Nm pthread_key_delete
.Nd delete a thread-specific data key
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_kill.3 b/lib/libpthread/man/pthread_kill.3
index e46e2b26013d..277467dc325c 100644
--- a/lib/libpthread/man/pthread_kill.3
+++ b/lib/libpthread/man/pthread_kill.3
@@ -33,7 +33,7 @@
.Nm pthread_kill
.Nd send a signal to a specified thread
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.In signal.h
diff --git a/lib/libpthread/man/pthread_mutex_destroy.3 b/lib/libpthread/man/pthread_mutex_destroy.3
index 59d2b48980c5..64b902775894 100644
--- a/lib/libpthread/man/pthread_mutex_destroy.3
+++ b/lib/libpthread/man/pthread_mutex_destroy.3
@@ -34,7 +34,7 @@
.Nm pthread_mutex_destroy
.Nd free resources allocated for a mutex
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_mutex_init.3 b/lib/libpthread/man/pthread_mutex_init.3
index c3fb60cd7a5f..fe491d939b48 100644
--- a/lib/libpthread/man/pthread_mutex_init.3
+++ b/lib/libpthread/man/pthread_mutex_init.3
@@ -34,7 +34,7 @@
.Nm pthread_mutex_init
.Nd create a mutex
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_mutex_lock.3 b/lib/libpthread/man/pthread_mutex_lock.3
index cc35ff21f1ef..cbcfb25e8094 100644
--- a/lib/libpthread/man/pthread_mutex_lock.3
+++ b/lib/libpthread/man/pthread_mutex_lock.3
@@ -34,7 +34,7 @@
.Nm pthread_mutex_lock
.Nd lock a mutex
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_mutex_trylock.3 b/lib/libpthread/man/pthread_mutex_trylock.3
index 5de24cee73c6..a5b1b6e71cf8 100644
--- a/lib/libpthread/man/pthread_mutex_trylock.3
+++ b/lib/libpthread/man/pthread_mutex_trylock.3
@@ -34,7 +34,7 @@
.Nm pthread_mutex_trylock
.Nd attempt to lock a mutex without blocking
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_mutex_unlock.3 b/lib/libpthread/man/pthread_mutex_unlock.3
index f6bc4573d89b..b9c870dd7774 100644
--- a/lib/libpthread/man/pthread_mutex_unlock.3
+++ b/lib/libpthread/man/pthread_mutex_unlock.3
@@ -34,7 +34,7 @@
.Nm pthread_mutex_unlock
.Nd unlock a mutex
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_mutexattr.3 b/lib/libpthread/man/pthread_mutexattr.3
index 7476ae16d6f6..af80c54acb0e 100644
--- a/lib/libpthread/man/pthread_mutexattr.3
+++ b/lib/libpthread/man/pthread_mutexattr.3
@@ -40,7 +40,7 @@
.Nm pthread_mutexattr_gettype
.Nd mutex attribute operations
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index 7ad97fe98985..bb8abc8cf467 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -37,7 +37,7 @@
.Nm pthread_once
.Nd dynamic package initialization
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Pp
diff --git a/lib/libpthread/man/pthread_rwlock_destroy.3 b/lib/libpthread/man/pthread_rwlock_destroy.3
index b65e0656750a..655548501c4c 100644
--- a/lib/libpthread/man/pthread_rwlock_destroy.3
+++ b/lib/libpthread/man/pthread_rwlock_destroy.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlock_destroy
.Nd destroy a read/write lock
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlock_init.3 b/lib/libpthread/man/pthread_rwlock_init.3
index 0360987db1e3..b056740d57c2 100644
--- a/lib/libpthread/man/pthread_rwlock_init.3
+++ b/lib/libpthread/man/pthread_rwlock_init.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlock_init
.Nd initialize a read/write lock
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlock_rdlock.3 b/lib/libpthread/man/pthread_rwlock_rdlock.3
index 88dbb17fa599..b71369c0b693 100644
--- a/lib/libpthread/man/pthread_rwlock_rdlock.3
+++ b/lib/libpthread/man/pthread_rwlock_rdlock.3
@@ -32,7 +32,7 @@
.Nm pthread_rwlock_tryrdlock
.Nd acquire a read/write lock for reading
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlock_unlock.3 b/lib/libpthread/man/pthread_rwlock_unlock.3
index 9391f75df7af..f88897f34a5c 100644
--- a/lib/libpthread/man/pthread_rwlock_unlock.3
+++ b/lib/libpthread/man/pthread_rwlock_unlock.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlock_unlock
.Nd release a read/write lock
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlock_wrlock.3 b/lib/libpthread/man/pthread_rwlock_wrlock.3
index 55ab5f933468..a73c19407994 100644
--- a/lib/libpthread/man/pthread_rwlock_wrlock.3
+++ b/lib/libpthread/man/pthread_rwlock_wrlock.3
@@ -32,7 +32,7 @@
.Nm pthread_rwlock_trywrlock
.Nd acquire a read/write lock for writing
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlockattr_destroy.3 b/lib/libpthread/man/pthread_rwlockattr_destroy.3
index 3ba97cf5e12c..b5965369f4bc 100644
--- a/lib/libpthread/man/pthread_rwlockattr_destroy.3
+++ b/lib/libpthread/man/pthread_rwlockattr_destroy.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlockattr_destroy
.Nd destroy a read/write lock
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlockattr_getpshared.3 b/lib/libpthread/man/pthread_rwlockattr_getpshared.3
index 56bda4409c13..ee1a20e98021 100644
--- a/lib/libpthread/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libpthread/man/pthread_rwlockattr_getpshared.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlockattr_getpshared
.Nd get the process shared attribute
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlockattr_init.3 b/lib/libpthread/man/pthread_rwlockattr_init.3
index a4aef31fc289..44ad18b6d25d 100644
--- a/lib/libpthread/man/pthread_rwlockattr_init.3
+++ b/lib/libpthread/man/pthread_rwlockattr_init.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlockattr_init
.Nd initialize a read/write lock
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_rwlockattr_setpshared.3 b/lib/libpthread/man/pthread_rwlockattr_setpshared.3
index 48b854d21a6b..2ee7d9ec6c99 100644
--- a/lib/libpthread/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libpthread/man/pthread_rwlockattr_setpshared.3
@@ -31,7 +31,7 @@
.Nm pthread_rwlockattr_setpshared
.Nd set the process shared attribute
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_schedparam.3 b/lib/libpthread/man/pthread_schedparam.3
index c76f4d9033ed..831c2ca20f4e 100644
--- a/lib/libpthread/man/pthread_schedparam.3
+++ b/lib/libpthread/man/pthread_schedparam.3
@@ -34,7 +34,7 @@
.Nm pthread_getschedparam
.Nd thread scheduling parameter manipulation
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_self.3 b/lib/libpthread/man/pthread_self.3
index 899af43094f3..82ac89ee935c 100644
--- a/lib/libpthread/man/pthread_self.3
+++ b/lib/libpthread/man/pthread_self.3
@@ -37,7 +37,7 @@
.Nm pthread_self
.Nd get the calling thread's ID
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft pthread_t
diff --git a/lib/libpthread/man/pthread_setspecific.3 b/lib/libpthread/man/pthread_setspecific.3
index 5bc274c6e640..f429fa568997 100644
--- a/lib/libpthread/man/pthread_setspecific.3
+++ b/lib/libpthread/man/pthread_setspecific.3
@@ -37,7 +37,7 @@
.Nm pthread_setspecific
.Nd set a thread-specific data value
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/pthread_sigmask.3 b/lib/libpthread/man/pthread_sigmask.3
index 5efa9256b6a1..489f8541a7aa 100644
--- a/lib/libpthread/man/pthread_sigmask.3
+++ b/lib/libpthread/man/pthread_sigmask.3
@@ -33,7 +33,7 @@
.Nm pthread_sigmask
.Nd examine and/or change a thread's signal mask
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.In signal.h
diff --git a/lib/libpthread/man/pthread_testcancel.3 b/lib/libpthread/man/pthread_testcancel.3
index 6467ac6f94b5..eb945e2872e4 100644
--- a/lib/libpthread/man/pthread_testcancel.3
+++ b/lib/libpthread/man/pthread_testcancel.3
@@ -8,7 +8,7 @@
.Nm pthread_testcancel
.Nd set cancelability state
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In pthread.h
.Ft int
diff --git a/lib/libpthread/man/sem_destroy.3 b/lib/libpthread/man/sem_destroy.3
index 8094a5323888..0496a76baadf 100644
--- a/lib/libpthread/man/sem_destroy.3
+++ b/lib/libpthread/man/sem_destroy.3
@@ -33,7 +33,7 @@
.Nm sem_destroy
.Nd destroy an unnamed semaphore
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In semaphore.h
.Ft int
diff --git a/lib/libpthread/man/sem_getvalue.3 b/lib/libpthread/man/sem_getvalue.3
index d1cc3a4d3296..115355286ade 100644
--- a/lib/libpthread/man/sem_getvalue.3
+++ b/lib/libpthread/man/sem_getvalue.3
@@ -33,7 +33,7 @@
.Nm sem_getvalue
.Nd get the value of a semaphore
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In semaphore.h
.Ft int
diff --git a/lib/libpthread/man/sem_init.3 b/lib/libpthread/man/sem_init.3
index fd517c224a03..8fac8d6019f1 100644
--- a/lib/libpthread/man/sem_init.3
+++ b/lib/libpthread/man/sem_init.3
@@ -33,7 +33,7 @@
.Nm sem_init
.Nd initialize an unnamed semaphore
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In semaphore.h
.Ft int
diff --git a/lib/libpthread/man/sem_open.3 b/lib/libpthread/man/sem_open.3
index 07c9543cec3d..f2b766dbfefa 100644
--- a/lib/libpthread/man/sem_open.3
+++ b/lib/libpthread/man/sem_open.3
@@ -35,7 +35,7 @@
.Nm sem_unlink
.Nd named semaphore operations
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In semaphore.h
.Ft sem_t *
diff --git a/lib/libpthread/man/sem_post.3 b/lib/libpthread/man/sem_post.3
index 71b9f43376a0..c2dd70417d94 100644
--- a/lib/libpthread/man/sem_post.3
+++ b/lib/libpthread/man/sem_post.3
@@ -33,7 +33,7 @@
.Nm sem_post
.Nd increment (unlock) a semaphore
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In semaphore.h
.Ft int
diff --git a/lib/libpthread/man/sem_wait.3 b/lib/libpthread/man/sem_wait.3
index c89ea04a098b..25a0b05a3d75 100644
--- a/lib/libpthread/man/sem_wait.3
+++ b/lib/libpthread/man/sem_wait.3
@@ -34,7 +34,7 @@
.Nm sem_trywait
.Nd decrement (lock) a semaphore
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In semaphore.h
.Ft int
diff --git a/lib/libpthread/man/sigwait.3 b/lib/libpthread/man/sigwait.3
index 76376a6d3131..24c229718b58 100644
--- a/lib/libpthread/man/sigwait.3
+++ b/lib/libpthread/man/sigwait.3
@@ -33,7 +33,7 @@
.Nm sigwait
.Nd select a set of signals
.Sh LIBRARY
-.Lb libc_r
+.Lb libpthread
.Sh SYNOPSIS
.In signal.h
.Ft int
diff --git a/lib/libpthread/test/Makefile b/lib/libpthread/test/Makefile
index 0eb530c3ef14..d34e3e72c7fb 100644
--- a/lib/libpthread/test/Makefile
+++ b/lib/libpthread/test/Makefile
@@ -1,7 +1,7 @@
#
# $FreeBSD$
#
-# Automated test suite for libc_r (pthreads).
+# Automated test suite for libpthread (pthreads).
#
# File lists.
@@ -26,7 +26,7 @@ CFLAGS := -Wall -pipe -g3
LDFLAGS_A := -static
LDFLAGS_P := -pg
LDFLAGS_S :=
-LIBS := -lc_r
+LIBS := -lpthread
# Flags passed to verify. "-v" or "-u" may be useful.
VFLAGS :=
diff --git a/lib/libpthread/test/README b/lib/libpthread/test/README
index 507ea4e19f74..8f625a1438e7 100644
--- a/lib/libpthread/test/README
+++ b/lib/libpthread/test/README
@@ -3,10 +3,10 @@ $FreeBSD$
This test suite is meant to test general functionality of pthreads, as well as
provide a simple framework for regression tests. In general, this test suite
can be used with any pthreads library, but in reality there are a number of
-libc_r-specific aspects to this test suite which would require some effort to
-get around if testing another pthreads library.
+libpthread-specific aspects to this test suite which would require some
+effort to get around if testing another pthreads library.
-This test suite assumes that libc_r is installed.
+This test suite assumes that libpthread is installed.
There are two forms of test that the 'verify' script understands. The simpler
form is the diff format, where the output of the test program is diff'ed with
diff --git a/lib/libpthread/test/propagate_s.pl b/lib/libpthread/test/propagate_s.pl
index 9cd5fb054ae1..6b8509043d98 100755
--- a/lib/libpthread/test/propagate_s.pl
+++ b/lib/libpthread/test/propagate_s.pl
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# Verify that no cancellation points are propagated inside of libc_r.
+# Verify that no cancellation points are propagated inside of libpthread.
#
# $FreeBSD$
#