Merge from trunk.

7 files changed, 7 insertions, 16 deletions

diff --git a/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries b/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries
index 5bc2def06..0089b7235 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/pthread/CVS/Entries
@@ -1,5 +1,4 @@
 D/bits////
-/Subdirs/1.1/Tue Nov 15 14:20:47 2005//
 /errno-loc.c/1.4/Tue Nov 15 14:20:47 2005//
 /flockfile.c/1.2/Tue Nov 15 14:20:47 2005//
 /ftrylockfile.c/1.1/Tue Nov 15 14:20:47 2005//
@@ -24,4 +23,5 @@ D/bits////
 /timer_settime.c/1.5/Tue Nov 15 14:20:47 2005//
 /tst-timer.c/1.5/Tue Nov 15 14:20:47 2005//
 /sigaction.c/1.2/Thu Dec 29 06:43:12 2005//
-/Makefile/1.7/Tue Jan 31 05:06:14 2006//
+/Makefile/1.7/Thu Mar  9 20:32:31 2006//
+/Subdirs/1.2/Fri Mar 10 00:41:53 2006//
diff --git a/libpthread/linuxthreads/sysdeps/pthread/CVS/Repository b/libpthread/linuxthreads/sysdeps/pthread/CVS/Repository
index 1203c7c61..409dca86d 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/pthread/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/pthread
+linuxthreads/linuxthreads/sysdeps/pthread
diff --git a/libpthread/linuxthreads/sysdeps/pthread/Subdirs b/libpthread/linuxthreads/sysdeps/pthread/Subdirs
deleted file mode 100644
index 2c5649784..000000000
--- a/libpthread/linuxthreads/sysdeps/pthread/Subdirs
+++ /dev/null
@@ -1 +0,0 @@
-linuxthreads_db
diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Entries b/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Entries
index a90faa843..810317450 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Entries
+++ b/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Entries
@@ -1,6 +1,6 @@
 /initspin.h/1.3/Tue Nov 15 14:20:47 2005//
 /pthreadtypes.h/1.12/Tue Nov 15 15:32:00 2005//
 /typesizes.h/1.2/Tue Nov 15 14:20:47 2005//
-/libc-tsd.h/1.9/Tue Nov 29 20:26:59 2005//
 /libc-lock.h/1.33/Fri Jan 20 14:26:50 2006//
+/libc-tsd.h/1.10/Thu Mar  9 20:32:31 2006//
 D
diff --git a/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Repository b/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Repository
index 8eabf3c06..fd1677d3e 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Repository
+++ b/libpthread/linuxthreads/sysdeps/pthread/bits/CVS/Repository
@@ -1 +1 @@
-ports/linuxthreads/sysdeps/pthread/bits
+linuxthreads/linuxthreads/sysdeps/pthread/bits
diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h b/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
index 9bc2f88a8..359e1a67b 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/pthread-functions.h
@@ -33,7 +33,7 @@ struct pthread_functions
 {
   pid_t (*ptr_pthread_fork) (struct fork_block *);
   int (*ptr_pthread_attr_destroy) (pthread_attr_t *);
-  int (*ptr___pthread_attr_init) (pthread_attr_t *);
+  int (*ptr_pthread_attr_init) (pthread_attr_t *);
   int (*ptr_pthread_attr_getdetachstate) (const pthread_attr_t *, int *);
   int (*ptr_pthread_attr_setdetachstate) (pthread_attr_t *, int);
   int (*ptr_pthread_attr_getinheritsched) (const pthread_attr_t *, int *);
diff --git a/libpthread/linuxthreads/sysdeps/pthread/pthread.h b/libpthread/linuxthreads/sysdeps/pthread/pthread.h
index 0dacfed1c..08843d18d 100644
--- a/libpthread/linuxthreads/sysdeps/pthread/pthread.h
+++ b/libpthread/linuxthreads/sysdeps/pthread/pthread.h
@@ -24,7 +24,7 @@
 #include <signal.h>
 #include <bits/pthreadtypes.h>
 #include <bits/initspin.h>
-#if defined _LIBC && ( defined IS_IN_libc && defined NOT_IN_libc )
+#if defined _LIBC && ( defined IS_IN_libc || defined NOT_IN_libc )
 #include <bits/uClibc_pthread.h>
 #endif
 
@@ -320,14 +320,6 @@ extern int pthread_getconcurrency (void) __THROW;
 extern int pthread_setconcurrency (int __level) __THROW;
 #endif
 
-#ifdef __USE_GNU
-/* Yield the processor to another thread or process.
-   This function is similar to the POSIX `sched_yield' function but
-   might be differently implemented in the case of a m-on-n thread
-   implementation.  */
-extern int pthread_yield (void) __THROW;
-#endif
-
 /* Functions for mutex handling.  */
 
 /* Initialize MUTEX using attributes in *MUTEX_ATTR, or use the