diff options
-rw-r--r-- | lib/libc_r/uthread/pthread_private.h | 6 | ||||
-rw-r--r-- | lib/libc_r/uthread/uthread_exit.c | 7 | ||||
-rw-r--r-- | lib/libc_r/uthread/uthread_fd.c | 3 | ||||
-rw-r--r-- | lib/libkse/thread/thr_exit.c | 7 | ||||
-rw-r--r-- | lib/libkse/thread/thr_private.h | 6 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_exit.c | 7 | ||||
-rw-r--r-- | lib/libpthread/thread/thr_private.h | 6 |
7 files changed, 21 insertions, 21 deletions
diff --git a/lib/libc_r/uthread/pthread_private.h b/lib/libc_r/uthread/pthread_private.h index 688a2b3..66f8121 100644 --- a/lib/libc_r/uthread/pthread_private.h +++ b/lib/libc_r/uthread/pthread_private.h @@ -1281,8 +1281,8 @@ void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); void _thread_cancellation_point(void); -/* #include <aio.h> */ -#ifdef _AIO_H_ +/* #include <sys/aio.h> */ +#ifdef _SYS_AIO_H_ int __sys_aio_suspend(const struct aiocb **, int, const struct timespec); #endif @@ -1349,7 +1349,7 @@ int __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); long __sys_fpathconf(int, int); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); -void __sys__exit(int); +void __sys_exit(int); #endif /* #include <fcntl.h> */ diff --git a/lib/libc_r/uthread/uthread_exit.c b/lib/libc_r/uthread/uthread_exit.c index 42bf025..169aa4f 100644 --- a/lib/libc_r/uthread/uthread_exit.c +++ b/lib/libc_r/uthread/uthread_exit.c @@ -43,10 +43,9 @@ #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) -#pragma weak _exit=__exit #pragma weak pthread_exit=_pthread_exit -void __exit(int status) +void _exit(int status) { int flags; int i; @@ -79,7 +78,7 @@ void __exit(int status) } /* Call the _exit syscall: */ - __sys__exit(status); + __sys_exit(status); } void @@ -104,7 +103,7 @@ _thread_exit(char *fname, int lineno, char *string) #if defined(_PTHREADS_INVARIANTS) abort(); #else - _exit(1); + __sys_exit(1); #endif } diff --git a/lib/libc_r/uthread/uthread_fd.c b/lib/libc_r/uthread/uthread_fd.c index b5b37c3..ef905e3 100644 --- a/lib/libc_r/uthread/uthread_fd.c +++ b/lib/libc_r/uthread/uthread_fd.c @@ -76,6 +76,9 @@ _thread_fd_table_init(int fd) struct fd_table_entry *entry; int saved_errno; + if (_thread_initial == NULL) + _thread_init(); + /* Check if the file descriptor is out of range: */ if (fd < 0 || fd >= _thread_dtablesize) { /* Return a bad file descriptor error: */ diff --git a/lib/libkse/thread/thr_exit.c b/lib/libkse/thread/thr_exit.c index 42bf025..169aa4f 100644 --- a/lib/libkse/thread/thr_exit.c +++ b/lib/libkse/thread/thr_exit.c @@ -43,10 +43,9 @@ #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) -#pragma weak _exit=__exit #pragma weak pthread_exit=_pthread_exit -void __exit(int status) +void _exit(int status) { int flags; int i; @@ -79,7 +78,7 @@ void __exit(int status) } /* Call the _exit syscall: */ - __sys__exit(status); + __sys_exit(status); } void @@ -104,7 +103,7 @@ _thread_exit(char *fname, int lineno, char *string) #if defined(_PTHREADS_INVARIANTS) abort(); #else - _exit(1); + __sys_exit(1); #endif } diff --git a/lib/libkse/thread/thr_private.h b/lib/libkse/thread/thr_private.h index 688a2b3..66f8121 100644 --- a/lib/libkse/thread/thr_private.h +++ b/lib/libkse/thread/thr_private.h @@ -1281,8 +1281,8 @@ void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); void _thread_cancellation_point(void); -/* #include <aio.h> */ -#ifdef _AIO_H_ +/* #include <sys/aio.h> */ +#ifdef _SYS_AIO_H_ int __sys_aio_suspend(const struct aiocb **, int, const struct timespec); #endif @@ -1349,7 +1349,7 @@ int __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); long __sys_fpathconf(int, int); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); -void __sys__exit(int); +void __sys_exit(int); #endif /* #include <fcntl.h> */ diff --git a/lib/libpthread/thread/thr_exit.c b/lib/libpthread/thread/thr_exit.c index 42bf025..169aa4f 100644 --- a/lib/libpthread/thread/thr_exit.c +++ b/lib/libpthread/thread/thr_exit.c @@ -43,10 +43,9 @@ #define FLAGS_IN_SCHEDQ \ (PTHREAD_FLAGS_IN_PRIOQ|PTHREAD_FLAGS_IN_WAITQ|PTHREAD_FLAGS_IN_WORKQ) -#pragma weak _exit=__exit #pragma weak pthread_exit=_pthread_exit -void __exit(int status) +void _exit(int status) { int flags; int i; @@ -79,7 +78,7 @@ void __exit(int status) } /* Call the _exit syscall: */ - __sys__exit(status); + __sys_exit(status); } void @@ -104,7 +103,7 @@ _thread_exit(char *fname, int lineno, char *string) #if defined(_PTHREADS_INVARIANTS) abort(); #else - _exit(1); + __sys_exit(1); #endif } diff --git a/lib/libpthread/thread/thr_private.h b/lib/libpthread/thread/thr_private.h index 688a2b3..66f8121 100644 --- a/lib/libpthread/thread/thr_private.h +++ b/lib/libpthread/thread/thr_private.h @@ -1281,8 +1281,8 @@ void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); void _thread_cancellation_point(void); -/* #include <aio.h> */ -#ifdef _AIO_H_ +/* #include <sys/aio.h> */ +#ifdef _SYS_AIO_H_ int __sys_aio_suspend(const struct aiocb **, int, const struct timespec); #endif @@ -1349,7 +1349,7 @@ int __sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *); long __sys_fpathconf(int, int); ssize_t __sys_read(int, void *, size_t); ssize_t __sys_write(int, const void *, size_t); -void __sys__exit(int); +void __sys_exit(int); #endif /* #include <fcntl.h> */ |