Add weak definitions for wrapped system calls. In general:

	_foo - wrapped system call
	foo - weak definition to _foo

and for cancellation points:

	_foo - wrapped system call
	__foo - enter cancellation point, call _foo(), leave
	        cancellation point
	foo - weak definition to __foo

Change use of global _thread_run to call a function to get the
currently running thread.

Make all pthread_foo functions weak definitions to _pthread_foo,
where _pthread_foo is the implementation.  This allows an application
to provide its own pthread functions.

Provide slightly different versions of pthread_mutex_lock and
pthread_mutex_init so that we can tell the difference between
a libc mutex and an application mutex.  Threads holding mutexes
internal to libc should never be allowed to exit, call signal
handlers, or cancel.

Approved by:	-arch

1 files changed, 3 insertions, 5 deletions

diff --git a/lib/libc_r/uthread/uthread_getsockopt.c b/lib/libc_r/uthread/uthread_getsockopt.c
index 3222dbd..cc90ae1 100644
--- a/lib/libc_r/uthread/uthread_getsockopt.c
+++ b/lib/libc_r/uthread/uthread_getsockopt.c
@@ -33,10 +33,11 @@
  */
 #include <sys/types.h>
 #include <sys/socket.h>
-#ifdef _THREAD_SAFE
 #include <pthread.h>
 #include "pthread_private.h"
 
+#pragma weak	getsockopt=_getsockopt
+
 int
 _getsockopt(int fd, int level, int optname, void *optval, socklen_t
     *optlen)
@@ -44,11 +45,8 @@ _getsockopt(int fd, int level, int optname, void *optval, socklen_t
 	int             ret;
 
 	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = _thread_sys_getsockopt(fd, level, optname, optval, optlen);
+		ret = __sys_getsockopt(fd, level, optname, optval, optlen);
 		_FD_UNLOCK(fd, FD_RDWR);
 	}
 	return ret;
 }
-
-__strong_reference(_getsockopt, getsockopt);
-#endif