From 5f60c7ab2316b9b4c61294b754a08e4cb1a9c4e6 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 1 Jan 2008 04:07:14 +0000
Subject: 2008-01-01  Samuel Thibault  <samuel.thibault@ens-lyon.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* include/pthread/pthread.h (pthread_spin_destroy, pthread_spin_init,
	pthread_spin_lock, pthread_spin_trylock, pthread_spin_unlock): Use
	__extern_inline macro instead of extern __inline.
	* sysdeps/i386/bits/spin-lock.h (__PT_SPIN_INLINE,
	__pthread_spin_lock): Likewise
	* sysdeps/mach/bits/spin-lock.h (__PT_SPIN_INLINE,
	__pthread_spin_lock): Likewise
	* sysdeps/generic/bits/pthread.h (pthread_equal): Declare ; only
	provide inline when __USE_EXTERN_INLINES is defined. Use __extern_inline
	macro instead of extern __inline.
	* sysdeps/i386/bits/memory.h (__memory_barrier): Add static to inline.
---
 sysdeps/generic/bits/pthread.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h
index 3f9df13d..5e239d67 100644
--- a/sysdeps/generic/bits/pthread.h
+++ b/sysdeps/generic/bits/pthread.h
@@ -24,10 +24,15 @@ typedef int pthread_t;
 
 /* Return true if __T1 and __T2 both name the same thread.  Otherwise,
    false.  */
-extern __inline int
+extern int
+pthread_equal (pthread_t __t1, pthread_t __t2);
+
+#ifdef __USE_EXTERN_INLINES
+__extern_inline int
 pthread_equal (pthread_t __t1, pthread_t __t2)
 {
   return __t1 == __t2;
 }
+#endif
 
 #endif /* bits/pthread.h */
-- 
cgit v1.2.3


From 05ec15bddd06d4790adb7dd27df03b5cf226d386 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Sun, 22 Jun 2008 09:05:31 +0000
Subject: 2008-06-22  Neal H. Walfield  <neal@gnu.org>

	* sysdeps/generic/pt-mutex-timedlock.c
	(__pthread_mutex_timedlock_internal) [! NDEBUG]: Set MUTEX->OWNER
	appropriately and assert that it is consistent.
	* sysdeps/generic/pt-mutex-unlock.c (__pthread_mutex_unlock) [!
	NDEBUG]: Set MUTEX->OWNER appropriately and assert that it is
	consistent.
	* sysdeps/generic/pt-mutex-trylock.c (__pthread_mutex_trylock) [!
	NDEBUG]: Set MUTEX->OWNER.
---
 sysdeps/generic/pt-mutex-timedlock.c | 24 +++++++++++++++++++++++-
 sysdeps/generic/pt-mutex-trylock.c   | 14 +++++++++++++-
 sysdeps/generic/pt-mutex-unlock.c    | 28 +++++++++++++++++++++++-----
 3 files changed, 59 insertions(+), 7 deletions(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/pt-mutex-timedlock.c b/sysdeps/generic/pt-mutex-timedlock.c
index 5e222bd3..265a4530 100644
--- a/sysdeps/generic/pt-mutex-timedlock.c
+++ b/sysdeps/generic/pt-mutex-timedlock.c
@@ -1,5 +1,5 @@
 /* Lock a mutex with a timeout.  Generic version.
-   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,6 +36,18 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
   if (__pthread_spin_trylock (&mutex->__held) == 0)
     /* Successfully acquired the lock.  */
     {
+#ifndef NDEBUG
+      self = _pthread_self ();
+      if (self)
+	/* The main thread may take a lock before the library is fully
+	   initialized, in particular, before the main thread has a
+	   TCB.  */
+	{
+	  assert (! mutex->owner);
+	  mutex->owner = _pthread_self ();
+	}
+#endif
+
       if (mutex->attr)
 	switch (mutex->attr->mutex_type)
 	  {
@@ -59,12 +71,14 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
   /* The lock is busy.  */
 
   self = _pthread_self ();
+  assert (self);
 
   if (mutex->attr)
     {
       switch (mutex->attr->mutex_type)
 	{
 	case PTHREAD_MUTEX_NORMAL:
+	  assert (mutex->owner != self);
 	  break;
 
 	case PTHREAD_MUTEX_ERRORCHECK:
@@ -88,6 +102,10 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
 	  LOSE;
 	}
     }
+  else
+    assert (mutex->owner != self);
+
+  assert (mutex->owner);
 
   if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000))
     return EINVAL;
@@ -123,6 +141,10 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
   else
     __pthread_block (self);
 
+#ifndef NDEBUG
+  assert (mutex->owner == self);
+#endif
+
   if (mutex->attr)
     switch (mutex->attr->mutex_type)
       {
diff --git a/sysdeps/generic/pt-mutex-trylock.c b/sysdeps/generic/pt-mutex-trylock.c
index d56f6e1c..5264dc7b 100644
--- a/sysdeps/generic/pt-mutex-trylock.c
+++ b/sysdeps/generic/pt-mutex-trylock.c
@@ -1,5 +1,5 @@
 /* Try to Lock a mutex.  Generic version.
-   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,6 +34,18 @@ __pthread_mutex_trylock (struct __pthread_mutex *mutex)
   if (__pthread_spin_trylock (&mutex->__held) == 0)
     /* Acquired the lock.  */
     {
+#ifndef NDEBUG
+      self = _pthread_self ();
+      if (self)
+	/* The main thread may take a lock before the library is fully
+	   initialized, in particular, before the main thread has a
+	   TCB.  */
+	{
+	  assert (! mutex->owner);
+	  mutex->owner = _pthread_self ();
+	}
+#endif
+
       if (mutex->attr)
 	switch (mutex->attr->mutex_type)
 	  {
diff --git a/sysdeps/generic/pt-mutex-unlock.c b/sysdeps/generic/pt-mutex-unlock.c
index 2f719d3e..d2a42570 100644
--- a/sysdeps/generic/pt-mutex-unlock.c
+++ b/sysdeps/generic/pt-mutex-unlock.c
@@ -1,5 +1,5 @@
 /* Unlock a mutex.  Generic version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -31,12 +31,25 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
   
   __pthread_spin_lock (&mutex->__lock);
 
-  if (mutex->attr)
+  if (! mutex->attr || mutex->attr->mutex_type == PTHREAD_MUTEX_NORMAL)
+    {
+#ifndef NDEBUG
+      if (_pthread_self ())
+	{
+	  assert (mutex->owner);
+	  assertx (mutex->owner == _pthread_self (),
+		   "%p(%x) != %p(%x)",
+		   mutex->owner,
+		   ((struct __pthread *) mutex->owner)->threadid,
+		   _pthread_self (),
+		   _pthread_self ()->threadid);
+	  mutex->owner = NULL;
+	}
+#endif
+    }
+  else
     switch (mutex->attr->mutex_type)
       {
-      case PTHREAD_MUTEX_NORMAL:
-	break;
-
       case PTHREAD_MUTEX_ERRORCHECK:
       case PTHREAD_MUTEX_RECURSIVE:
 	if (mutex->owner != _pthread_self ())
@@ -59,6 +72,7 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
 	LOSE;
       }
 
+
   if (mutex->__queue == NULL)
     {
       __pthread_spin_unlock (&mutex->__held);
@@ -69,6 +83,10 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
   wakeup = mutex->__queue;
   __pthread_dequeue (wakeup);
 
+#ifndef NDEBUG
+  mutex->owner = wakeup;
+#endif
+
   /* We do not unlock MUTEX->held: we are transferring the ownership
      to the thread that we are waking up.  */
 
-- 
cgit v1.2.3


From c50decbb1e33f0b16cce1fa53e8c72c88315289e Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Fri, 27 Jun 2008 22:35:16 +0000
Subject: 2008-06-27  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* sysdeps/generic/bits/thread-barrier.h: Remove unused file.
---
 sysdeps/generic/bits/thread-barrier.h | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 sysdeps/generic/bits/thread-barrier.h

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/bits/thread-barrier.h b/sysdeps/generic/bits/thread-barrier.h
deleted file mode 100644
index 23d51ae5..00000000
--- a/sysdeps/generic/bits/thread-barrier.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Thread barrier attribute type.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#ifndef _BITS_THREAD_BARRIER_H
-#define _BITS_THREAD_BARRIER_H	1
-
-/* This structure describes the attributes of a POSIX thread barrier.
-   Note that not all of them are supported on all systems.  */
-struct __pthread_attr
-{
-  enum __
-};
-
-#endif /* bits/thread-barrier.h */
-- 
cgit v1.2.3


From 0acb426838244a35d632eb5030b3ffcc293414e2 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 28 Jun 2008 00:06:52 +0000
Subject: 2008-06-27  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* include/pthread/pthread.h: Do not define __need_clockid_t, include
	<time.h>, and define clockid_t if __clockid_defined is not defined.
	Include <pthread/pthreadtypes.h>
	(pthread_equal): New extern inline.
	(pthread_cleanup_push, pthread_cleanup_pop): New macros.
	(__pthread_process_shared, __pthread_inheritsched,
	__pthread_contentionscope, __pthread_detachstate,
	__pthread_mutex_protocol, __pthread_mutex_type,
	pthread_attr_t, pthread_mutex_attr_t, pthread_mutex_t,
	pthread_condattr_t, pthread_cond_t, pthread_spinlock_t,
	pthread_rwlockattr_t, pthread_rwlock_t, pthread_barrierattr_t,
	pthread_barrier_t, pthread_key_t, pthread_once_t): Move enums and
	typedefs to...
	* include/pthread/pthreadtypes.h: ... new file.
	* sysdeps/generic/bits/cancelation.h (pthread_cleanup_push): Rename
	macro to __pthread_cleanup_push.
	(pthread_cleanup_pop): Rename macro to __pthread_cleanup_pop.
	* sysdeps/generic/bits/barrier-attr.h (__pthread_process_shared):
	Forward-declare enum.
	* sysdeps/generic/bits/condition-attr.h (__pthread_process_shared):
	Likewise.
	* sysdeps/generic/bits/mutex-attr.h (__pthread_mutex_protocol,
	__pthread_process_shared, __pthread_mutex_type):
	Likewise.
	* sysdeps/generic/bits/rwlock-attr.h (__pthread_process_shared):
	Likewise.
	* sysdeps/generic/bits/thread-attr.h (__pthread_detachstate,
	__pthread_inheritsched, __pthread_contentionscope):
	Likewise.
	* sysdeps/generic/bits/pthread.h (pthread_t): Rename type to
	__pthread_t.
	(pthread_equal): Rename to __pthread_equal.
---
 sysdeps/generic/bits/barrier-attr.h   | 2 ++
 sysdeps/generic/bits/cancelation.h    | 4 ++--
 sysdeps/generic/bits/condition-attr.h | 2 ++
 sysdeps/generic/bits/mutex-attr.h     | 4 ++++
 sysdeps/generic/bits/pthread.h        | 6 +++---
 sysdeps/generic/bits/rwlock-attr.h    | 2 ++
 sysdeps/generic/bits/thread-attr.h    | 4 ++++
 7 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/bits/barrier-attr.h b/sysdeps/generic/bits/barrier-attr.h
index 86f3cb02..d8d09db9 100644
--- a/sysdeps/generic/bits/barrier-attr.h
+++ b/sysdeps/generic/bits/barrier-attr.h
@@ -20,6 +20,8 @@
 #ifndef _BITS_BARRIER_ATTR_H
 #define _BITS_BARRIER_ATTR_H	1
 
+enum __pthread_process_shared;
+
 /* This structure describes the attributes of a POSIX thread barrier.
    Note that not all of them are supported on all systems.  */
 struct __pthread_barrierattr
diff --git a/sysdeps/generic/bits/cancelation.h b/sysdeps/generic/bits/cancelation.h
index bb6b58a1..f94b6e34 100644
--- a/sysdeps/generic/bits/cancelation.h
+++ b/sysdeps/generic/bits/cancelation.h
@@ -32,7 +32,7 @@ struct __pthread_cancelation_handler
 /* Returns the thread local location of the cleanup handler stack.  */
 struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
 
-#define pthread_cleanup_push(rt, rtarg) \
+#define __pthread_cleanup_push(rt, rtarg) \
 	{ \
 	  struct __pthread_cancelation_handler **__handlers \
 	    = __pthread_get_cleanup_stack (); \
@@ -44,7 +44,7 @@ struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
 	    }; \
 	  *__handlers = &__handler;
 	  
-#define pthread_cleanup_pop(execute) \
+#define __pthread_cleanup_pop(execute) \
 	  if (execute) \
 	    __handler.handler (__handler.arg); \
 	  assert (*__handlers == &__handler); \
diff --git a/sysdeps/generic/bits/condition-attr.h b/sysdeps/generic/bits/condition-attr.h
index 2d48dfb6..49bbf7f1 100644
--- a/sysdeps/generic/bits/condition-attr.h
+++ b/sysdeps/generic/bits/condition-attr.h
@@ -22,6 +22,8 @@
 
 #include <time.h>
 
+enum __pthread_process_shared;
+
 /* User visible part of a condition attribute variable.  */
 struct __pthread_condattr
   {
diff --git a/sysdeps/generic/bits/mutex-attr.h b/sysdeps/generic/bits/mutex-attr.h
index 883b0746..5d3d611a 100644
--- a/sysdeps/generic/bits/mutex-attr.h
+++ b/sysdeps/generic/bits/mutex-attr.h
@@ -20,6 +20,10 @@
 #ifndef _BITS_MUTEX_ATTR_H
 #define _BITS_MUTEX_ATTR_H	1
 
+enum __pthread_mutex_protocol;
+enum __pthread_process_shared;
+enum __pthread_mutex_type;
+
 /* This structure describes the attributes of a POSIX mutex
    attribute.  */
 struct __pthread_mutexattr
diff --git a/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h
index 5e239d67..0e8ad9e9 100644
--- a/sysdeps/generic/bits/pthread.h
+++ b/sysdeps/generic/bits/pthread.h
@@ -20,16 +20,16 @@
 #ifndef _BITS_PTHREAD_H
 #define _BITS_PTHREAD_H	1
 
-typedef int pthread_t;
+typedef int __pthread_t;
 
 /* Return true if __T1 and __T2 both name the same thread.  Otherwise,
    false.  */
 extern int
-pthread_equal (pthread_t __t1, pthread_t __t2);
+__pthread_equal (__pthread_t __t1, __pthread_t __t2);
 
 #ifdef __USE_EXTERN_INLINES
 __extern_inline int
-pthread_equal (pthread_t __t1, pthread_t __t2)
+__pthread_equal (__pthread_t __t1, __pthread_t __t2)
 {
   return __t1 == __t2;
 }
diff --git a/sysdeps/generic/bits/rwlock-attr.h b/sysdeps/generic/bits/rwlock-attr.h
index 44765bd6..b4f26c46 100644
--- a/sysdeps/generic/bits/rwlock-attr.h
+++ b/sysdeps/generic/bits/rwlock-attr.h
@@ -20,6 +20,8 @@
 #ifndef _BITS_RWLOCK_ATTR_H
 #define _BITS_RWLOCK_ATTR_H	1
 
+enum __pthread_process_shared;
+
 /* This structure describes the attributes of a POSIX thread rwlock.
    Note that not all of them are supported on all systems.  */
 struct __pthread_rwlockattr
diff --git a/sysdeps/generic/bits/thread-attr.h b/sysdeps/generic/bits/thread-attr.h
index 31630221..3250f515 100644
--- a/sysdeps/generic/bits/thread-attr.h
+++ b/sysdeps/generic/bits/thread-attr.h
@@ -22,6 +22,10 @@
 
 #include <sched.h>
 
+enum __pthread_detachstate;
+enum __pthread_inheritsched;
+enum __pthread_contentionscope;
+
 /* This structure describes the attributes of a POSIX thread.  Note
    that not all of them are supported on all systems.  */
 struct __pthread_attr
-- 
cgit v1.2.3


From 531acb4bc4f8c16a5e202a9ce702b012f923ac7b Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 29 Jun 2008 02:43:00 +0000
Subject: 2008-06-29  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* sysdeps/generic/pt-mutex-unlock.c (__pthread_mutex_unlock):
	Do not use assertx and threadid.
---
 sysdeps/generic/pt-mutex-unlock.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/pt-mutex-unlock.c b/sysdeps/generic/pt-mutex-unlock.c
index d2a42570..bfb9803e 100644
--- a/sysdeps/generic/pt-mutex-unlock.c
+++ b/sysdeps/generic/pt-mutex-unlock.c
@@ -37,12 +37,16 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
       if (_pthread_self ())
 	{
 	  assert (mutex->owner);
+#if 0
 	  assertx (mutex->owner == _pthread_self (),
 		   "%p(%x) != %p(%x)",
 		   mutex->owner,
 		   ((struct __pthread *) mutex->owner)->threadid,
 		   _pthread_self (),
 		   _pthread_self ()->threadid);
+#else
+	  assert (mutex->owner == _pthread_self ());
+#endif
 	  mutex->owner = NULL;
 	}
 #endif
-- 
cgit v1.2.3


From ee8a3f2e096d10bca782d78be24b12562e73d935 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Tue, 1 Jul 2008 11:43:18 +0000
Subject: Update copyright years.

---
 pthread/pt-internal.h                 | 2 +-
 sysdeps/generic/bits/barrier-attr.h   | 2 +-
 sysdeps/generic/bits/cancelation.h    | 2 +-
 sysdeps/generic/bits/condition-attr.h | 2 +-
 sysdeps/generic/bits/mutex-attr.h     | 2 +-
 sysdeps/generic/bits/mutex.h          | 2 +-
 sysdeps/generic/bits/pthread.h        | 2 +-
 sysdeps/generic/bits/rwlock-attr.h    | 2 +-
 sysdeps/generic/bits/rwlock.h         | 2 +-
 sysdeps/generic/bits/thread-attr.h    | 2 +-
 sysdeps/generic/pt-mutex-destroy.c    | 2 +-
 sysdeps/generic/pt-mutex-init.c       | 2 +-
 sysdeps/generic/pt-mutex-lock.c       | 2 +-
 sysdeps/generic/pt-mutex-trylock.c    | 2 +-
 sysdeps/generic/pt-mutex-unlock.c     | 2 +-
 sysdeps/generic/pt-rwlock-destroy.c   | 2 +-
 sysdeps/generic/pt-rwlock-init.c      | 2 +-
 sysdeps/generic/sem-destroy.c         | 2 +-
 sysdeps/generic/sem-getvalue.c        | 2 +-
 sysdeps/generic/sem-init.c            | 2 +-
 sysdeps/generic/sem-open.c            | 2 +-
 sysdeps/generic/sem-post.c            | 2 +-
 sysdeps/generic/sem-timedwait.c       | 2 +-
 sysdeps/generic/sem-trywait.c         | 2 +-
 sysdeps/generic/sem-unlink.c          | 2 +-
 sysdeps/generic/sem-wait.c            | 2 +-
 sysdeps/i386/bits/memory.h            | 2 +-
 sysdeps/i386/bits/spin-lock.h         | 2 +-
 sysdeps/i386/machine-sp.h             | 2 +-
 sysdeps/l4/hurd/i386/pt-setup.c       | 2 +-
 sysdeps/mach/bits/spin-lock.h         | 2 +-
 sysdeps/mach/hurd/i386/pt-setup.c     | 2 +-
 32 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'sysdeps/generic')

diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h
index d9bf7bc1..e7c85fda 100644
--- a/pthread/pt-internal.h
+++ b/pthread/pt-internal.h
@@ -1,5 +1,5 @@
 /* Internal defenitions for pthreads library.
-   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005, 2006, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/barrier-attr.h b/sysdeps/generic/bits/barrier-attr.h
index d8d09db9..a9900b71 100644
--- a/sysdeps/generic/bits/barrier-attr.h
+++ b/sysdeps/generic/bits/barrier-attr.h
@@ -1,5 +1,5 @@
 /* Thread barrier attribute type.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/cancelation.h b/sysdeps/generic/bits/cancelation.h
index f94b6e34..f446d595 100644
--- a/sysdeps/generic/bits/cancelation.h
+++ b/sysdeps/generic/bits/cancelation.h
@@ -1,5 +1,5 @@
 /* Cancelation.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/condition-attr.h b/sysdeps/generic/bits/condition-attr.h
index 49bbf7f1..a1311286 100644
--- a/sysdeps/generic/bits/condition-attr.h
+++ b/sysdeps/generic/bits/condition-attr.h
@@ -1,5 +1,5 @@
 /* Condition attribute type.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/mutex-attr.h b/sysdeps/generic/bits/mutex-attr.h
index 5d3d611a..7a5c45c2 100644
--- a/sysdeps/generic/bits/mutex-attr.h
+++ b/sysdeps/generic/bits/mutex-attr.h
@@ -1,5 +1,5 @@
 /* Mutex attribute type.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
index 1aaf80ed..b44fa6df 100644
--- a/sysdeps/generic/bits/mutex.h
+++ b/sysdeps/generic/bits/mutex.h
@@ -1,5 +1,5 @@
 /* Mutex type.  Generic version.
-   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h
index 0e8ad9e9..80e6b096 100644
--- a/sysdeps/generic/bits/pthread.h
+++ b/sysdeps/generic/bits/pthread.h
@@ -1,5 +1,5 @@
 /* Pthread data structures.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/rwlock-attr.h b/sysdeps/generic/bits/rwlock-attr.h
index b4f26c46..dba99f1d 100644
--- a/sysdeps/generic/bits/rwlock-attr.h
+++ b/sysdeps/generic/bits/rwlock-attr.h
@@ -1,5 +1,5 @@
 /* Thread rwlock attribute type.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/rwlock.h b/sysdeps/generic/bits/rwlock.h
index 696f9c25..3d600ec3 100644
--- a/sysdeps/generic/bits/rwlock.h
+++ b/sysdeps/generic/bits/rwlock.h
@@ -1,5 +1,5 @@
 /* rwlock type.  Generic version.
-   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/bits/thread-attr.h b/sysdeps/generic/bits/thread-attr.h
index 3250f515..c3a93fde 100644
--- a/sysdeps/generic/bits/thread-attr.h
+++ b/sysdeps/generic/bits/thread-attr.h
@@ -1,5 +1,5 @@
 /* Thread attribute type.  Generic version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-mutex-destroy.c b/sysdeps/generic/pt-mutex-destroy.c
index 72faefe6..71fc692f 100644
--- a/sysdeps/generic/pt-mutex-destroy.c
+++ b/sysdeps/generic/pt-mutex-destroy.c
@@ -1,5 +1,5 @@
 /* Destroy a mutex.  Generic version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-mutex-init.c b/sysdeps/generic/pt-mutex-init.c
index da1781bf..94076730 100644
--- a/sysdeps/generic/pt-mutex-init.c
+++ b/sysdeps/generic/pt-mutex-init.c
@@ -1,5 +1,5 @@
 /* Initialize a mutex.  Generic version.
-   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-mutex-lock.c b/sysdeps/generic/pt-mutex-lock.c
index 60fc55ab..528e593f 100644
--- a/sysdeps/generic/pt-mutex-lock.c
+++ b/sysdeps/generic/pt-mutex-lock.c
@@ -1,5 +1,5 @@
 /* Lock a mutex.  Generic version.
-   Copyright (C) 2000,02 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-mutex-trylock.c b/sysdeps/generic/pt-mutex-trylock.c
index 5264dc7b..d523205e 100644
--- a/sysdeps/generic/pt-mutex-trylock.c
+++ b/sysdeps/generic/pt-mutex-trylock.c
@@ -1,5 +1,5 @@
 /* Try to Lock a mutex.  Generic version.
-   Copyright (C) 2002, 2005, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-mutex-unlock.c b/sysdeps/generic/pt-mutex-unlock.c
index bfb9803e..4352042e 100644
--- a/sysdeps/generic/pt-mutex-unlock.c
+++ b/sysdeps/generic/pt-mutex-unlock.c
@@ -1,5 +1,5 @@
 /* Unlock a mutex.  Generic version.
-   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2006, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-rwlock-destroy.c b/sysdeps/generic/pt-rwlock-destroy.c
index 034d9300..045eebd8 100644
--- a/sysdeps/generic/pt-rwlock-destroy.c
+++ b/sysdeps/generic/pt-rwlock-destroy.c
@@ -1,5 +1,5 @@
 /* Destroy a rwlock.  Generic version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/pt-rwlock-init.c b/sysdeps/generic/pt-rwlock-init.c
index 8aa495ec..c9ff9b28 100644
--- a/sysdeps/generic/pt-rwlock-init.c
+++ b/sysdeps/generic/pt-rwlock-init.c
@@ -1,5 +1,5 @@
 /* Initialize a rwlock.  Generic version.
-   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-destroy.c b/sysdeps/generic/sem-destroy.c
index 985f4ad3..6486599c 100644
--- a/sysdeps/generic/sem-destroy.c
+++ b/sysdeps/generic/sem-destroy.c
@@ -1,5 +1,5 @@
 /* Destroy a semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-getvalue.c b/sysdeps/generic/sem-getvalue.c
index 8e418e38..7762089b 100644
--- a/sysdeps/generic/sem-getvalue.c
+++ b/sysdeps/generic/sem-getvalue.c
@@ -1,5 +1,5 @@
 /* Get the value of a semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-init.c b/sysdeps/generic/sem-init.c
index 6c6d79e7..d2414f5d 100644
--- a/sysdeps/generic/sem-init.c
+++ b/sysdeps/generic/sem-init.c
@@ -1,5 +1,5 @@
 /* Initialize a semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-open.c b/sysdeps/generic/sem-open.c
index 9eb13aae..bae87ed0 100644
--- a/sysdeps/generic/sem-open.c
+++ b/sysdeps/generic/sem-open.c
@@ -1,5 +1,5 @@
 /* Open a named semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-post.c b/sysdeps/generic/sem-post.c
index 0e20ea7a..6d438bf2 100644
--- a/sysdeps/generic/sem-post.c
+++ b/sysdeps/generic/sem-post.c
@@ -1,5 +1,5 @@
 /* Post a semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-timedwait.c b/sysdeps/generic/sem-timedwait.c
index d01bfdb0..f9040009 100644
--- a/sysdeps/generic/sem-timedwait.c
+++ b/sysdeps/generic/sem-timedwait.c
@@ -1,5 +1,5 @@
 /* Wait on a semaphore with a timeout.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-trywait.c b/sysdeps/generic/sem-trywait.c
index 199f317b..437e2822 100644
--- a/sysdeps/generic/sem-trywait.c
+++ b/sysdeps/generic/sem-trywait.c
@@ -1,5 +1,5 @@
 /* Lock a semaphore if it does not require blocking.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-unlink.c b/sysdeps/generic/sem-unlink.c
index 519f4f7b..570ed614 100644
--- a/sysdeps/generic/sem-unlink.c
+++ b/sysdeps/generic/sem-unlink.c
@@ -1,5 +1,5 @@
 /* Unlink a named semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/generic/sem-wait.c b/sysdeps/generic/sem-wait.c
index 50752f32..8347480c 100644
--- a/sysdeps/generic/sem-wait.c
+++ b/sysdeps/generic/sem-wait.c
@@ -1,5 +1,5 @@
 /* Wait on a semaphore.  Generic version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/i386/bits/memory.h b/sysdeps/i386/bits/memory.h
index 57c1463c..e47a8e2d 100644
--- a/sysdeps/i386/bits/memory.h
+++ b/sysdeps/i386/bits/memory.h
@@ -1,5 +1,5 @@
 /* Memory barrier operations.  i386 version.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/i386/bits/spin-lock.h b/sysdeps/i386/bits/spin-lock.h
index d893654d..30b0c64b 100644
--- a/sysdeps/i386/bits/spin-lock.h
+++ b/sysdeps/i386/bits/spin-lock.h
@@ -1,5 +1,5 @@
 /* Machine-specific definitions for spin locks.  i386 version.
-   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/i386/machine-sp.h b/sysdeps/i386/machine-sp.h
index 945a36b8..cef6ab72 100644
--- a/sysdeps/i386/machine-sp.h
+++ b/sysdeps/i386/machine-sp.h
@@ -1,5 +1,5 @@
 /* Machine-specific function to return the stack pointer.  i386 version.
-   Copyright (C) 1994,97,2001 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 2001, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/l4/hurd/i386/pt-setup.c b/sysdeps/l4/hurd/i386/pt-setup.c
index 6afcd141..6540ee5b 100644
--- a/sysdeps/l4/hurd/i386/pt-setup.c
+++ b/sysdeps/l4/hurd/i386/pt-setup.c
@@ -1,5 +1,5 @@
 /* Setup thread stack.  Hurd/i386 version.
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/bits/spin-lock.h b/sysdeps/mach/bits/spin-lock.h
index 031e9cec..0cbf11ed 100644
--- a/sysdeps/mach/bits/spin-lock.h
+++ b/sysdeps/mach/bits/spin-lock.h
@@ -1,5 +1,5 @@
 /* Definitions of user-visible names for spin locks.
-   Copyright (C) 1994, 1997, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 2002, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/sysdeps/mach/hurd/i386/pt-setup.c b/sysdeps/mach/hurd/i386/pt-setup.c
index 71f60e23..5abbcfcd 100644
--- a/sysdeps/mach/hurd/i386/pt-setup.c
+++ b/sysdeps/mach/hurd/i386/pt-setup.c
@@ -1,5 +1,5 @@
 /* Setup thread stack.  Hurd/i386 version.
-   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2005, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-- 
cgit v1.2.3


From 9a5c2e448de0531aa59f909667b9b55cc9d66c4c Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 2 Aug 2008 20:21:20 +0000
Subject: 2008-08-02  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* sysdeps/generic/bits/mutex.h: Do not include <errno.h> and
	<stddef.h>
---
 sysdeps/generic/bits/mutex.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
index b44fa6df..5c7fedec 100644
--- a/sysdeps/generic/bits/mutex.h
+++ b/sysdeps/generic/bits/mutex.h
@@ -57,11 +57,4 @@ struct __pthread_mutex
 # endif
 #endif /* Not __pthread_mutex_defined.  */
 
-#ifdef _BITS_MUTEX_H
-
-#include <errno.h>
-#include <stddef.h>
-
-#endif
-
 #endif /* bits/mutex.h */
-- 
cgit v1.2.3


From ae95cbb0720fa57dfca6113ee940e2d8ff2af074 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <tschwinge@gnu.org>
Date: Sun, 3 Aug 2008 07:02:36 +0000
Subject: Update copyright year.

---
 sysdeps/generic/bits/mutex.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/bits/mutex.h b/sysdeps/generic/bits/mutex.h
index 5c7fedec..7c77a8d2 100644
--- a/sysdeps/generic/bits/mutex.h
+++ b/sysdeps/generic/bits/mutex.h
@@ -1,5 +1,8 @@
 /* Mutex type.  Generic version.
-   Copyright (C) 2000, 2002, 2005, 2006, 2007 Free Software Foundation, Inc.
+
+   Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008
+     Free Software Foundation, Inc.
+
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-- 
cgit v1.2.3


From 1b52c5eb6e185eeef966f67a96a2c44146abfbd7 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Tue, 12 Aug 2008 07:10:31 +0000
Subject: 2008-08-12  Neal H. Walfield  <neal@gnu.org>

	* sysdeps/generic/pt-mutex-unlock.c (__pthread_mutex_unlock):
	Remove dead code.
---
 sysdeps/generic/pt-mutex-unlock.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'sysdeps/generic')

diff --git a/sysdeps/generic/pt-mutex-unlock.c b/sysdeps/generic/pt-mutex-unlock.c
index 4352042e..d1ef23a3 100644
--- a/sysdeps/generic/pt-mutex-unlock.c
+++ b/sysdeps/generic/pt-mutex-unlock.c
@@ -37,16 +37,7 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
       if (_pthread_self ())
 	{
 	  assert (mutex->owner);
-#if 0
-	  assertx (mutex->owner == _pthread_self (),
-		   "%p(%x) != %p(%x)",
-		   mutex->owner,
-		   ((struct __pthread *) mutex->owner)->threadid,
-		   _pthread_self (),
-		   _pthread_self ()->threadid);
-#else
 	  assert (mutex->owner == _pthread_self ());
-#endif
 	  mutex->owner = NULL;
 	}
 #endif
-- 
cgit v1.2.3