2008-08-12 Neal H. Walfield <neal@gnu.org>

	Merge in Samuel Thibault's changes from the main line.

	* Makefile.am (libpthread_a_SOURCES): Add pt-getattr.c.
	* headers.m4: Link libpthread/include/pthread/pthreadtypes.h to
	sysroot/include/pthread/pthreadtypes.h and
	libpthread/sysdeps/${arch}/bits/spin-lock-inline.h. to
	sysroot/include/bits/spin-lock-inline.h.

	* include/pthread/pthread.h: Include <sys/cdefs.h>.
	(__extern_inline): If not defined, define appropriately.

2008-08-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* include/pthread/pthreadtypes.h (__pthread_inheritsched): Remove
	comma at end of enumeration.

2008-08-03  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* Makefile (sysdeps_headers): Add spin-lock-inline.h.
	(SYSDEP_PATH): Move sysdeps/ia32 right after
	sysdeps/$(MICROKERNEL)/ia32.
	* include/pthread/pthread.h: Include <bits/spin-lock-inline.h>.
	* sysdeps/ia32/bits/spin-lock.h: Move inlines to...
	* sysdeps/ia32/bits/spin-lock-inline.h: ... new file.

2008-08-02  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* sysdeps/generic/bits/mutex.h: Do not include <errno.h> and
	<stddef.h>
	* sysdeps/ia32/bits/memory.h (__memory_barrier): Add memory clobber.
	* sysdeps/ia32/bits/spin-lock.h (__pthread_spin_trylock,
	__pthread_spin_unlock): Add memory clobbers.
	* sysdeps/l4/hurd/ia32/pt-setup.c (stack_setup): Fix reservation of
	stack room for initial frame.

2008-07-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* Makefile (sysdeps_headers): add pthread/pthreadtypes.h

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.

2008-06-27  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* sysdeps/generic/bits/thread-barrier.h: Remove unused file.

2008-05-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* include/pthread/pthread.h (pthread_getattr_np): New declaration.
	* pthread/pt-getattr.c: New file.
	* Makefile (SRCS): Add pt-getattr.c.

2008-03-16  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* include/libc-symbols.h (HAVE_ASM_PREVIOUS_DIRECTIVE): Define.

2008-02-29  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* sysdeps/l4/hurd/ia32/pt-setup.c (stack_setup): Align stack on 0x10
	for MMX operations.

2008-01-01  Samuel Thibault  <samuel.thibault@ens-lyon.org>

	* 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/ia32/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/ia32/bits/memory.h (__memory_barrier): Add static to inline.

33 files changed, 254 insertions, 199 deletions

diff --git a/sysdeps/generic/bits/barrier-attr.h b/sysdeps/generic/bits/barrier-attr.h
index 86f3cb02..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
@@ -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..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
@@ -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..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
@@ -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 420d5d1c..9161cdab 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/mutex.h b/sysdeps/generic/bits/mutex.h
index e0ae3db1..f5f3fa94 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, 2008 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
@@ -61,11 +64,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 */
diff --git a/sysdeps/generic/bits/pthread.h b/sysdeps/generic/bits/pthread.h
index 3f9df13d..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
@@ -20,14 +20,19 @@
 #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 __inline int
-pthread_equal (pthread_t __t1, pthread_t __t2)
+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 */
diff --git a/sysdeps/generic/bits/rwlock-attr.h b/sysdeps/generic/bits/rwlock-attr.h
index 44765bd6..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
@@ -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/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 31630221..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
@@ -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
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 */
diff --git a/sysdeps/generic/pt-mutex-destroy.c b/sysdeps/generic/pt-mutex-destroy.c
index 0c9d5140..b0ca00f7 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, 2008 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 83f5b185..a818fe3a 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, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000, 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-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-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 995cf099..e34539a9 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, 2008 Free Software Foundation, Inc.
+   Copyright (C) 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/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/ia32/bits/memory.h b/sysdeps/ia32/bits/memory.h
index 201305b9..932c4086 100644
--- a/sysdeps/ia32/bits/memory.h
+++ b/sysdeps/ia32/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
@@ -21,14 +21,14 @@
 #define _BITS_MEMORY_H	1
 
 /* Prevent read and write reordering across this function.  */
-inline void
+static inline void
 __memory_barrier (void)
 {
   int i;
 
   /* Any lock'ed instruction will do.  We just do a simple
      increment.  */
-  __asm__ __volatile ("lock; incl %0" : "=m" (i) : "m" (i));
+  __asm__ __volatile ("lock; incl %0" : "=m" (i) : "m" (i) : "memory");
 }
 
 /* Prevent read reordering across this function.  */
diff --git a/sysdeps/ia32/bits/spin-lock-inline.h b/sysdeps/ia32/bits/spin-lock-inline.h
new file mode 100644
index 00000000..0f3ca581
--- /dev/null
+++ b/sysdeps/ia32/bits/spin-lock-inline.h
@@ -0,0 +1,98 @@
+/* Machine-specific definitions for spin locks.  i386 version.
+   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
+   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.  */
+
+/*
+ * Never include this file directly; use <pthread.h> or <cthreads.h> instead.
+ */
+
+#ifndef _BITS_SPIN_LOCK_INLINE_H
+#define _BITS_SPIN_LOCK_INLINE_H	1
+
+#include <features.h>
+#include <bits/spin-lock.h>
+
+__BEGIN_DECLS
+
+#if defined __USE_EXTERN_INLINES || defined _FORCE_INLINES
+
+# ifndef __EBUSY
+#  include <errno.h>
+#  define __EBUSY EBUSY
+# endif
+
+# ifndef __PT_SPIN_INLINE
+#  define __PT_SPIN_INLINE __extern_inline
+# endif
+
+__PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock);
+
+__PT_SPIN_INLINE int
+__pthread_spin_destroy (__pthread_spinlock_t *__lock)
+{
+  return 0;
+}
+
+__PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
+					  int __pshared);
+
+__PT_SPIN_INLINE int
+__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
+{
+  *__lock = __SPIN_LOCK_INITIALIZER;
+  return 0;
+}
+
+__PT_SPIN_INLINE int __pthread_spin_trylock (__pthread_spinlock_t *__lock);
+
+__PT_SPIN_INLINE int
+__pthread_spin_trylock (__pthread_spinlock_t *__lock)
+{
+  int __locked;
+  __asm__ __volatile ("xchgl %0, %1"
+		      : "=&r" (__locked), "=m" (*__lock) : "0" (1) : "memory");
+  return __locked ? __EBUSY : 0;
+}
+
+__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock);
+extern int _pthread_spin_lock (__pthread_spinlock_t *__lock);
+
+__extern_inline int
+__pthread_spin_lock (__pthread_spinlock_t *__lock)
+{
+  if (__pthread_spin_trylock (__lock))
+    return _pthread_spin_lock (__lock);
+  return 0;
+}
+
+__PT_SPIN_INLINE int __pthread_spin_unlock (__pthread_spinlock_t *__lock);
+
+__PT_SPIN_INLINE int
+__pthread_spin_unlock (__pthread_spinlock_t *__lock)
+{
+  int __unlocked;
+  __asm__ __volatile ("xchgl %0, %1"
+		      : "=&r" (__unlocked), "=m" (*__lock) : "0" (0) : "memory");
+  return 0;
+}
+
+#endif /* Use extern inlines or force inlines.  */
+
+__END_DECLS
+
+#endif /* bits/spin-lock.h */
diff --git a/sysdeps/ia32/bits/spin-lock.h b/sysdeps/ia32/bits/spin-lock.h
index 175656ef..71af1631 100644
--- a/sysdeps/ia32/bits/spin-lock.h
+++ b/sysdeps/ia32/bits/spin-lock.h
@@ -1,5 +1,5 @@
 /* Machine-specific definitions for spin locks.  i386 version.
-   Copyright (C) 2000 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
@@ -34,70 +34,6 @@ typedef __volatile int __pthread_spinlock_t;
 /* Initializer for a spin lock object.  */
 # define __SPIN_LOCK_INITIALIZER ((__pthread_spinlock_t) 0)
 
-#if defined __USE_EXTERN_INLINES || defined _FORCE_INLINES
-
-# ifndef __EBUSY
-#  include <errno.h>
-#  define __EBUSY EBUSY
-# endif
-
-# ifndef __PT_SPIN_INLINE
-#  define __PT_SPIN_INLINE extern __inline
-# endif
-
-__PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_destroy (__pthread_spinlock_t *__lock)
-{
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
-					  int __pshared);
-
-__PT_SPIN_INLINE int
-__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
-{
-  *__lock = __SPIN_LOCK_INITIALIZER;
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_trylock (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_trylock (__pthread_spinlock_t *__lock)
-{
-  int __locked;
-  __asm__ __volatile ("xchgl %0, %1"
-		      : "=&r" (__locked), "=m" (*__lock) : "0" (1));
-  return __locked ? __EBUSY : 0;
-}
-
-extern inline int __pthread_spin_lock (__pthread_spinlock_t *__lock);
-extern int _pthread_spin_lock (__pthread_spinlock_t *__lock);
-
-extern inline int
-__pthread_spin_lock (__pthread_spinlock_t *__lock)
-{
-  if (__pthread_spin_trylock (__lock))
-    return _pthread_spin_lock (__lock);
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_unlock (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_unlock (__pthread_spinlock_t *__lock)
-{
-  int __unlocked;
-  __asm__ __volatile ("xchgl %0, %1"
-		      : "=&r" (__unlocked), "=m" (*__lock) : "0" (0));
-  return 0;
-}
-
-#endif /* Use extern inlines or force inlines.  */
-
 __END_DECLS
 
 #endif /* bits/spin-lock.h */
diff --git a/sysdeps/ia32/machine-sp.h b/sysdeps/ia32/machine-sp.h
index 536f6902..39a8b69a 100644
--- a/sysdeps/ia32/machine-sp.h
+++ b/sysdeps/ia32/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/ia32/pt-setup.c b/sysdeps/l4/hurd/ia32/pt-setup.c
index cc2f0757..579905c9 100644
--- a/sysdeps/l4/hurd/ia32/pt-setup.c
+++ b/sysdeps/l4/hurd/ia32/pt-setup.c
@@ -72,6 +72,9 @@ stack_setup (struct __pthread *thread,
   /* Calculate top of the new stack.  */
   top = (uintptr_t *) ((uintptr_t) thread->stackaddr + thread->stacksize);
 
+  /* Align on 0x10 for MMX operations.  */
+  top = (uintptr_t) top & ~0xf;
+
   if (start_routine)
     {
       /* Set up call frame.  */
diff --git a/sysdeps/mach/bits/spin-lock-inline.h b/sysdeps/mach/bits/spin-lock-inline.h
new file mode 100644
index 00000000..bb066d0b
--- /dev/null
+++ b/sysdeps/mach/bits/spin-lock-inline.h
@@ -0,0 +1,90 @@
+/* Definitions of user-visible names for spin locks.
+   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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _BITS_SPIN_LOCK_INLINE_H
+#define _BITS_SPIN_LOCK_INLINE_H	1
+
+#include <features.h>
+#include <bits/spin-lock.h>
+#include <machine-lock.h>	/* This does all the work.  */
+
+__BEGIN_DECLS
+
+#if defined __USE_EXTERN_INLINES || defined _FORCE_INLINES
+
+# ifndef __EBUSY
+#  include <errno.h>
+#  define __EBUSY EBUSY
+# endif
+
+# ifndef __PT_SPIN_INLINE
+#  define __PT_SPIN_INLINE __extern_inline
+# endif
+
+__PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock);
+
+__PT_SPIN_INLINE int
+__pthread_spin_destroy (__pthread_spinlock_t *__lock)
+{
+  return 0;
+}
+
+__PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
+					  int __pshared);
+
+__PT_SPIN_INLINE int
+__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
+{
+  *__lock = __SPIN_LOCK_INITIALIZER;
+  return 0;
+}
+
+__PT_SPIN_INLINE int __pthread_spin_trylock (__pthread_spinlock_t *__lock);
+
+__PT_SPIN_INLINE int
+__pthread_spin_trylock (__pthread_spinlock_t *__lock)
+{
+  return __spin_try_lock (__lock) ? 0 : __EBUSY;
+}
+
+__extern_inline int __pthread_spin_lock (__pthread_spinlock_t *__lock);
+extern int _pthread_spin_lock (__pthread_spinlock_t *__lock);
+
+__extern_inline int
+__pthread_spin_lock (__pthread_spinlock_t *__lock)
+{
+  if (__pthread_spin_trylock (__lock))
+    return _pthread_spin_lock (__lock);
+  return 0;
+}
+
+__PT_SPIN_INLINE int __pthread_spin_unlock (__pthread_spinlock_t *__lock);
+
+__PT_SPIN_INLINE int
+__pthread_spin_unlock (__pthread_spinlock_t *__lock)
+{
+  __spin_unlock (__lock);
+  return 0;
+}
+
+#endif /* Use extern inlines or force inlines.  */
+
+__END_DECLS
+
+#endif /* bits/spin-lock.h */
diff --git a/sysdeps/mach/bits/spin-lock.h b/sysdeps/mach/bits/spin-lock.h
index e137c244..54425cc6 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
@@ -33,65 +33,6 @@ typedef __spin_lock_t __pthread_spinlock_t;
 #error __SPIN_LOCK_INITIALIZER undefined: should be defined by <lock-intern.h>.
 #endif
 
-#if defined __USE_EXTERN_INLINES || defined _FORCE_INLINES
-
-# ifndef __EBUSY
-#  include <errno.h>
-#  define __EBUSY EBUSY
-# endif
-
-# ifndef __PT_SPIN_INLINE
-#  define __PT_SPIN_INLINE extern __inline
-# endif
-
-__PT_SPIN_INLINE int __pthread_spin_destroy (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_destroy (__pthread_spinlock_t *__lock)
-{
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_init (__pthread_spinlock_t *__lock,
-					  int __pshared);
-
-__PT_SPIN_INLINE int
-__pthread_spin_init (__pthread_spinlock_t *__lock, int __pshared)
-{
-  *__lock = __SPIN_LOCK_INITIALIZER;
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_trylock (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_trylock (__pthread_spinlock_t *__lock)
-{
-  return __spin_try_lock (__lock) ? 0 : __EBUSY;
-}
-
-extern __inline int __pthread_spin_lock (__pthread_spinlock_t *__lock);
-extern int _pthread_spin_lock (__pthread_spinlock_t *__lock);
-
-extern __inline int
-__pthread_spin_lock (__pthread_spinlock_t *__lock)
-{
-  if (__pthread_spin_trylock (__lock))
-    return _pthread_spin_lock (__lock);
-  return 0;
-}
-
-__PT_SPIN_INLINE int __pthread_spin_unlock (__pthread_spinlock_t *__lock);
-
-__PT_SPIN_INLINE int
-__pthread_spin_unlock (__pthread_spinlock_t *__lock)
-{
-  __spin_unlock (__lock);
-  return 0;
-}
-
-#endif /* Use extern inlines or force inlines.  */
-
 __END_DECLS
 
 #endif /* bits/spin-lock.h */
diff --git a/sysdeps/mach/hurd/ia32/pt-setup.c b/sysdeps/mach/hurd/ia32/pt-setup.c
index 32ace6ad..ba438d6a 100644
--- a/sysdeps/mach/hurd/ia32/pt-setup.c
+++ b/sysdeps/mach/hurd/ia32/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
@@ -58,13 +58,15 @@ stack_setup (struct __pthread *thread,
   top -= __hurd_threadvar_max;
 
   /* Save the self pointer.  */
-  top[_HURD_THREADVAR_THREAD] = (void *) thread;
+  top[_HURD_THREADVAR_THREAD] = (uintptr_t) thread;
 
   if (start_routine)
     {
       /* And then the call frame.  */
-      *--top = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
-      *--top = (uintptr_t) start_routine;
+      top -= 2;
+      top = (uintptr_t) top & ~0xf;
+      top[1] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
+      top[0] = (uintptr_t) start_routine;
       *--top = 0;		/* Fake return address.  */
     }
 
diff --git a/sysdeps/mach/hurd/pt-docancel.c b/sysdeps/mach/hurd/pt-docancel.c
index bac62a71..b81a5c70 100644
--- a/sysdeps/mach/hurd/pt-docancel.c
+++ b/sysdeps/mach/hurd/pt-docancel.c
@@ -1,5 +1,5 @@
 /* Cancel a thread.
-   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
@@ -33,7 +33,7 @@ __pthread_do_cancel (struct __pthread *p)
   mach_port_t ktid;
   int me;
 
-  assert (p->cancel_pending = 1);
+  assert (p->cancel_pending == 1);
   assert (p->cancel_state == PTHREAD_CANCEL_ENABLE);
 
   ktid = __mach_thread_self ();