[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r5224 - glibc-package/trunk/debian/patches/hurd-i386



Author: sthibault
Date: 2012-04-27 14:17:34 +0000 (Fri, 27 Apr 2012)
New Revision: 5224

Modified:
   glibc-package/trunk/debian/patches/hurd-i386/libpthread.diff
Log:
revert r5219 too, it's not ready either

Modified: glibc-package/trunk/debian/patches/hurd-i386/libpthread.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/libpthread.diff	2012-04-27 11:17:09 UTC (rev 5223)
+++ glibc-package/trunk/debian/patches/hurd-i386/libpthread.diff	2012-04-27 14:17:34 UTC (rev 5224)
@@ -1,11 +1,11 @@
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/.cvsignore src/libpthread/.cvsignore
---- src/libpthread.empty/.cvsignore	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/.cvsignore	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/.cvsignore eglibc-2.13/libpthread/.cvsignore
+--- eglibc-2.13.nolibpthread/libpthread/.cvsignore	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/.cvsignore	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1 @@
 +Makefile.in
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/ChangeLog src/libpthread/ChangeLog
---- src/libpthread.empty/ChangeLog	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/ChangeLog	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/ChangeLog eglibc-2.13/libpthread/ChangeLog
+--- eglibc-2.13.nolibpthread/libpthread/ChangeLog	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/ChangeLog	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,6 @@
 +51839d398b0f9885a17ab5c0768b8dec4dd9eb79 is the last commit imported from CVS.
 +All commits after that one have valid author and committer information.
@@ -13,9 +13,9 @@
 +Use this to examine the change log for earlier changes:
 +
 +    $ git show 51839d398b0f9885a17ab5c0768b8dec4dd9eb79:ChangeLog
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/Makeconfig src/libpthread/Makeconfig
---- src/libpthread.empty/Makeconfig	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/Makeconfig	2012-04-23 02:22:48.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/Makeconfig eglibc-2.13/libpthread/Makeconfig
+--- eglibc-2.13.nolibpthread/libpthread/Makeconfig	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/Makeconfig	2012-04-22 14:21:33.000000000 +0000
 @@ -0,0 +1,12 @@
 +# Makeconfig fragment for Hurd libpthread add-on.
 +# This gets included at the end of the main glibc Makeconfig.
@@ -29,9 +29,9 @@
 +rpath-dirs += libpthread
 +
 ++includes += -I$(..)libpthread/include
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/Makefile src/libpthread/Makefile
---- src/libpthread.empty/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/Makefile	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/Makefile eglibc-2.13/libpthread/Makefile
+--- eglibc-2.13.nolibpthread/libpthread/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/Makefile	2012-04-22 23:39:43.000000000 +0000
 @@ -0,0 +1,337 @@
 +#
 +#   Copyright (C) 1994, 1995, 1996, 1997, 2000, 2002, 2004, 2005, 2006, 2007,
@@ -310,7 +310,7 @@
 +ifeq ($(IN_GLIBC),yes)
 +$(inst_libdir)/libpthread.so: $(objpfx)libpthread.so$(libpthread.so-version) \
 +			      $(+force)
-+	ln -sf libpthread.so$(libpthread.so-version) $@
++	ln -sf $(slibdir)/libpthread.so$(libpthread.so-version) $@
 +
 +libc-link.so = $(common-objpfx)libc.so
 +
@@ -370,9 +370,9 @@
 +#  
 +#  endif
 +endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/Makefile.am src/libpthread/Makefile.am
---- src/libpthread.empty/Makefile.am	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/Makefile.am	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/Makefile.am eglibc-2.13/libpthread/Makefile.am
+--- eglibc-2.13.nolibpthread/libpthread/Makefile.am	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/Makefile.am	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,170 @@
 +# Makefile.am - Makefile template for libpthread.
 +# Copyright (C) 2003, 2008 Free Software Foundation, Inc.
@@ -544,9 +544,9 @@
 +	sigprocmask.c
 +
 +libpthread_a_LDADD = -lrt
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/TODO src/libpthread/TODO
---- src/libpthread.empty/TODO	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/TODO	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/TODO eglibc-2.13/libpthread/TODO
+--- eglibc-2.13.nolibpthread/libpthread/TODO	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/TODO	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,177 @@
 +-*- Mode: outline -*-
 +
@@ -725,9 +725,9 @@
 +
 +** Paging
 +  We set the pager to the root server. Evil.  Fix this in pt-start.c.
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/Versions src/libpthread/Versions
---- src/libpthread.empty/Versions	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/Versions	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/Versions eglibc-2.13/libpthread/Versions
+--- eglibc-2.13.nolibpthread/libpthread/Versions	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/Versions	2012-04-21 22:39:25.000000000 +0000
 @@ -0,0 +1,132 @@
 +libc {
 +  GLIBC_2.13 {
@@ -861,23 +861,23 @@
 +    _pthread_spin_lock;
 +  }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/configure src/libpthread/configure
---- src/libpthread.empty/configure	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/configure	2012-04-21 16:18:06.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/configure eglibc-2.13/libpthread/configure
+--- eglibc-2.13.nolibpthread/libpthread/configure	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/configure	2012-04-21 16:18:06.000000000 +0000
 @@ -0,0 +1,2 @@
 +libc_add_on_canonical=libpthread
 +libc_add_on_subdirs=.
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/configure.in src/libpthread/configure.in
---- src/libpthread.empty/configure.in	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/configure.in	2012-04-21 16:15:12.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/configure.in eglibc-2.13/libpthread/configure.in
+--- eglibc-2.13.nolibpthread/libpthread/configure.in	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/configure.in	2012-04-21 16:15:12.000000000 +0000
 @@ -0,0 +1,4 @@
 +GLIBC_PROVIDES
 +
 +libc_add_on_canonical=libpthread
 +libc_add_on_subdirs=.
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/forward.c src/libpthread/forward.c
---- src/libpthread.empty/forward.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/forward.c	2012-04-21 19:28:19.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/forward.c eglibc-2.13/libpthread/forward.c
+--- eglibc-2.13.nolibpthread/libpthread/forward.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/forward.c	2012-04-21 19:28:19.000000000 +0000
 @@ -0,0 +1,127 @@
 +/* Copyright (C) 2002, 2003, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -1006,9 +1006,9 @@
 +
 +struct __pthread_cancelation_handler *dummy_list;
 +FORWARD2 (__pthread_get_cleanup_stack, struct __pthread_cancelation_handler **, (void), (), return &dummy_list);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/headers.m4 src/libpthread/headers.m4
---- src/libpthread.empty/headers.m4	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/headers.m4	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/headers.m4 eglibc-2.13/libpthread/headers.m4
+--- eglibc-2.13.nolibpthread/libpthread/headers.m4	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/headers.m4	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,45 @@
 +# headers.m4 - Autoconf snippets to install links for header files.
 +# Copyright 2003, 2008 Free Software Foundation, Inc.
@@ -1055,9 +1055,9 @@
 +  ln -sf ../../libpthread/libpthread.a sysroot/lib/ &&
 +  touch libpthread/libpthread.a
 +])
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/include/libc-symbols.h src/libpthread/include/libc-symbols.h
---- src/libpthread.empty/include/libc-symbols.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/include/libc-symbols.h	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/include/libc-symbols.h eglibc-2.13/libpthread/include/libc-symbols.h
+--- eglibc-2.13.nolibpthread/libpthread/include/libc-symbols.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/include/libc-symbols.h	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,395 @@
 +/* Support macros for making weak and strong aliases for symbols,
 +   and for using symbol sets and linker warnings with GNU ld.
@@ -1454,9 +1454,9 @@
 +#endif
 +
 +#endif /* libc-symbols.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/include/pthread/pthread.h src/libpthread/include/pthread/pthread.h
---- src/libpthread.empty/include/pthread/pthread.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/include/pthread/pthread.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/include/pthread/pthread.h eglibc-2.13/libpthread/include/pthread/pthread.h
+--- eglibc-2.13.nolibpthread/libpthread/include/pthread/pthread.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/include/pthread/pthread.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,755 @@
 +/* Copyright (C) 2000, 2002, 2005, 2006, 2007, 2008, 2009, 2010
 +     Free Software Foundation, Inc.
@@ -2213,9 +2213,9 @@
 +__END_DECLS
 +
 +#endif /* pthread.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/include/pthread/pthreadtypes.h src/libpthread/include/pthread/pthreadtypes.h
---- src/libpthread.empty/include/pthread/pthreadtypes.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/include/pthread/pthreadtypes.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/include/pthread/pthreadtypes.h eglibc-2.13/libpthread/include/pthread/pthreadtypes.h
+--- eglibc-2.13.nolibpthread/libpthread/include/pthread/pthreadtypes.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/include/pthread/pthreadtypes.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,125 @@
 +/* Copyright (C) 2000, 2002, 2005, 2008 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -2342,9 +2342,9 @@
 +__END_DECLS
 +
 +#endif /* pthreadtypes.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/include/pthread.h src/libpthread/include/pthread.h
---- src/libpthread.empty/include/pthread.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/include/pthread.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/include/pthread.h eglibc-2.13/libpthread/include/pthread.h
+--- eglibc-2.13.nolibpthread/libpthread/include/pthread.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/include/pthread.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,7 @@
 +#ifndef _PTHREAD_H
 +#include <pthread/pthread.h>
@@ -2353,9 +2353,9 @@
 +extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
 +
 +#endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/include/semaphore.h src/libpthread/include/semaphore.h
---- src/libpthread.empty/include/semaphore.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/include/semaphore.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/include/semaphore.h eglibc-2.13/libpthread/include/semaphore.h
+--- eglibc-2.13.nolibpthread/libpthread/include/semaphore.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/include/semaphore.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,69 @@
 +/* Copyright (C) 2005, 2007 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -2426,9 +2426,9 @@
 +__END_DECLS
 +
 +#endif /* semaphore.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/include/set-hooks.h src/libpthread/include/set-hooks.h
---- src/libpthread.empty/include/set-hooks.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/include/set-hooks.h	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/include/set-hooks.h eglibc-2.13/libpthread/include/set-hooks.h
+--- eglibc-2.13.nolibpthread/libpthread/include/set-hooks.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/include/set-hooks.h	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,72 @@
 +/* Macros for using symbol sets for running lists of functions.
 +   Copyright (C) 1994, 1995, 1997, 2000 Free Software Foundation, Inc.
@@ -2502,9 +2502,9 @@
 +#endif
 +
 +#endif /* set-hooks.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/libc_pthread_init.c src/libpthread/libc_pthread_init.c
---- src/libpthread.empty/libc_pthread_init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/libc_pthread_init.c	2012-04-21 19:57:24.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/libc_pthread_init.c eglibc-2.13/libpthread/libc_pthread_init.c
+--- eglibc-2.13.nolibpthread/libpthread/libc_pthread_init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/libc_pthread_init.c	2012-04-21 19:57:24.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Copyright (C) 2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -2540,9 +2540,9 @@
 +	  sizeof (__libc_pthread_functions));
 +#endif
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/libpthread.a src/libpthread/libpthread.a
---- src/libpthread.empty/libpthread.a	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/libpthread.a	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/libpthread.a eglibc-2.13/libpthread/libpthread.a
+--- eglibc-2.13.nolibpthread/libpthread/libpthread.a	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/libpthread.a	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,20 @@
 +/* pthread initializer is weak in glibc.  It must be included if glibc
 +   is to start threading. */
@@ -2564,9 +2564,9 @@
 +EXTERN(_cthreads_ftrylockfile)
 +
 +GROUP(-lpthread2 -lihash)
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/libpthread_pic.a src/libpthread/libpthread_pic.a
---- src/libpthread.empty/libpthread_pic.a	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/libpthread_pic.a	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/libpthread_pic.a eglibc-2.13/libpthread/libpthread_pic.a
+--- eglibc-2.13.nolibpthread/libpthread/libpthread_pic.a	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/libpthread_pic.a	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,20 @@
 +/* pthread initializer is weak in glibc.  It must be included if glibc
 +   is to start threading. */
@@ -2588,9 +2588,9 @@
 +EXTERN(_cthreads_ftrylockfile)
 +
 +GROUP(-lpthread2_pic -lihash_pic)
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/lockfile.c src/libpthread/lockfile.c
---- src/libpthread.empty/lockfile.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/lockfile.c	2012-04-21 17:54:59.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/lockfile.c eglibc-2.13/libpthread/lockfile.c
+--- eglibc-2.13.nolibpthread/libpthread/lockfile.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/lockfile.c	2012-04-21 17:54:59.000000000 +0000
 @@ -0,0 +1,65 @@
 +/* lockfile - Handle locking and unlocking of streams.  Hurd cthreads version.
 +   Copyright (C) 2000,01,02 Free Software Foundation, Inc.
@@ -2657,9 +2657,9 @@
 +     __attribute__ ((alias ("_cthreads_ftrylockfile")));
 +
 +#endif /* _STDIO_USES_IOSTREAM */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/not-in-libc.h src/libpthread/not-in-libc.h
---- src/libpthread.empty/not-in-libc.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/not-in-libc.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/not-in-libc.h eglibc-2.13/libpthread/not-in-libc.h
+--- eglibc-2.13.nolibpthread/libpthread/not-in-libc.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/not-in-libc.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,11 @@
 +#define __mach_port_insert_right mach_port_insert_right
 +#define __mach_port_allocate	mach_port_allocate
@@ -2672,9 +2672,9 @@
 +#define __vm_allocate		vm_allocate
 +#define __vm_deallocate		vm_deallocate
 +#define __sched_yield           sched_yield
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/Versions src/libpthread/pthread/Versions
---- src/libpthread.empty/pthread/Versions	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/Versions	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/Versions eglibc-2.13/libpthread/pthread/Versions
+--- eglibc-2.13.nolibpthread/libpthread/pthread/Versions	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/Versions	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,15 @@
 +libc {
 +  GLIBC_2.2 {
@@ -2691,9 +2691,9 @@
 +    pthread_spin_trylock; pthread_spin_unlock;
 +  }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/cthreads-compat.c src/libpthread/pthread/cthreads-compat.c
---- src/libpthread.empty/pthread/cthreads-compat.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/cthreads-compat.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/cthreads-compat.c eglibc-2.13/libpthread/pthread/cthreads-compat.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/cthreads-compat.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/cthreads-compat.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,107 @@
 +/* Compatibility routines for cthreads.
 +   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
@@ -2802,9 +2802,9 @@
 +    return;
 +  __pthread_mutex_unlock (lock);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-alloc.c src/libpthread/pthread/pt-alloc.c
---- src/libpthread.empty/pthread/pt-alloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-alloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-alloc.c eglibc-2.13/libpthread/pthread/pt-alloc.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-alloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-alloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,215 @@
 +/* Allocate a new thread structure.
 +   Copyright (C) 2000, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
@@ -3021,9 +3021,9 @@
 +  *pthread = new;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-cancel.c src/libpthread/pthread/pt-cancel.c
---- src/libpthread.empty/pthread/pt-cancel.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-cancel.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-cancel.c eglibc-2.13/libpthread/pthread/pt-cancel.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-cancel.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-cancel.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,40 @@
 +/* Cancel a thread.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3065,9 +3065,9 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-cleanup.c src/libpthread/pthread/pt-cleanup.c
---- src/libpthread.empty/pthread/pt-cleanup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-cleanup.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-cleanup.c eglibc-2.13/libpthread/pthread/pt-cleanup.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-cleanup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-cleanup.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* Add a cancelation handler to the stack.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3097,10 +3097,10 @@
 +{
 +  return &_pthread_self ()->cancelation_handlers;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-create.c src/libpthread/pthread/pt-create.c
---- src/libpthread.empty/pthread/pt-create.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-create.c	2012-04-27 01:32:33.000000000 +0000
-@@ -0,0 +1,221 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-create.c eglibc-2.13/libpthread/pthread/pt-create.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-create.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-create.c	2012-04-21 17:01:42.000000000 +0000
+@@ -0,0 +1,217 @@
 +/* Thread creation.
 +   Copyright (C) 2000, 2002, 2005, 2007 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -3141,12 +3141,8 @@
 +
 +/* The entry-point for new threads.  */
 +static void
-+entry_point (struct __pthread *self, void *(*start_routine)(void *), void *arg)
++entry_point (void *(*start_routine)(void *), void *arg)
 +{
-+#ifdef ENABLE_TLS
-+  ___pthread_self = self;
-+#endif
-+
 +#ifdef HAVE_USELOCALE
 +  /* A fresh thread needs to be bound to the global locale.  */
 +  uselocale (LC_GLOBAL_LOCALE);
@@ -3322,9 +3318,9 @@
 + failed:
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-dealloc.c src/libpthread/pthread/pt-dealloc.c
---- src/libpthread.empty/pthread/pt-dealloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-dealloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-dealloc.c eglibc-2.13/libpthread/pthread/pt-dealloc.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-dealloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-dealloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,64 @@
 +/* Deallocate a thread structure.
 +   Copyright (C) 2000, 2008 Free Software Foundation, Inc.
@@ -3390,9 +3386,9 @@
 +     which reads this variable.  */
 +  pthread->state = PTHREAD_TERMINATED;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-detach.c src/libpthread/pthread/pt-detach.c
---- src/libpthread.empty/pthread/pt-detach.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-detach.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-detach.c eglibc-2.13/libpthread/pthread/pt-detach.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-detach.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-detach.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,92 @@
 +/* Detach a thread.
 +   Copyright (C) 2000, 2005 Free Software Foundation, Inc.
@@ -3486,9 +3482,9 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-exit.c src/libpthread/pthread/pt-exit.c
---- src/libpthread.empty/pthread/pt-exit.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-exit.c	2012-04-21 20:27:03.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-exit.c eglibc-2.13/libpthread/pthread/pt-exit.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-exit.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-exit.c	2012-04-21 20:27:03.000000000 +0000
 @@ -0,0 +1,124 @@
 +/* Thread termination.
 +   Copyright (C) 2000, 2002, 2005, 2007, 2011 Free Software Foundation, Inc.
@@ -3614,9 +3610,9 @@
 +}
 +
 +strong_alias (__pthread_exit, pthread_exit);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-getattr.c src/libpthread/pthread/pt-getattr.c
---- src/libpthread.empty/pthread/pt-getattr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-getattr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-getattr.c eglibc-2.13/libpthread/pthread/pt-getattr.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-getattr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-getattr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,49 @@
 +/* Thread attributes retrieval.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -3667,9 +3663,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-initialize.c src/libpthread/pthread/pt-initialize.c
---- src/libpthread.empty/pthread/pt-initialize.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-initialize.c	2012-04-23 22:25:04.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-initialize.c eglibc-2.13/libpthread/pthread/pt-initialize.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-initialize.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-initialize.c	2012-04-21 22:56:05.000000000 +0000
 @@ -0,0 +1,78 @@
 +/* Initialize pthreads library.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -3749,10 +3745,10 @@
 +#endif
 +  RUN_HOOK (__pthread_init, ());
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-internal.h src/libpthread/pthread/pt-internal.h
---- src/libpthread.empty/pthread/pt-internal.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-internal.h	2012-04-27 01:32:33.000000000 +0000
-@@ -0,0 +1,321 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-internal.h eglibc-2.13/libpthread/pthread/pt-internal.h
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-internal.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-internal.h	2012-04-22 23:38:54.000000000 +0000
+@@ -0,0 +1,320 @@
 +/* Internal defenitions for pthreads library.
 +   Copyright (C) 2000, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -3972,8 +3968,7 @@
 +
 +/* Setup thread THREAD's context.  */
 +extern int __pthread_setup (struct __pthread *__restrict thread,
-+				  void (*entry_point)(struct __pthread *,
-+						      void *(*)(void *),
++				  void (*entry_point)(void *(*)(void *),
 +						      void *),
 +				  void *(*start_routine)(void *),
 +				  void *__restrict arg);
@@ -4074,9 +4069,9 @@
 +#endif /* ENABLE_TLS */
 +
 +#endif /* pt-internal.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-join.c src/libpthread/pthread/pt-join.c
---- src/libpthread.empty/pthread/pt-join.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-join.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-join.c eglibc-2.13/libpthread/pthread/pt-join.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-join.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-join.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,88 @@
 +/* Wait for thread termination.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -4166,9 +4161,9 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-self.c src/libpthread/pthread/pt-self.c
---- src/libpthread.empty/pthread/pt-self.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-self.c	2012-04-21 20:29:01.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-self.c eglibc-2.13/libpthread/pthread/pt-self.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-self.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-self.c	2012-04-21 20:29:01.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Get calling thread's ID.
 +   Copyright (C) 2000, 2008 Free Software Foundation, Inc.
@@ -4204,9 +4199,9 @@
 +}
 +
 +strong_alias (__pthread_self, pthread_self);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-setcancelstate.c src/libpthread/pthread/pt-setcancelstate.c
---- src/libpthread.empty/pthread/pt-setcancelstate.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-setcancelstate.c	2012-04-21 20:29:34.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-setcancelstate.c eglibc-2.13/libpthread/pthread/pt-setcancelstate.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-setcancelstate.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-setcancelstate.c	2012-04-21 20:29:34.000000000 +0000
 @@ -0,0 +1,45 @@
 +/* Set the cancel state for the calling thread.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -4253,9 +4248,9 @@
 +}
 +
 +strong_alias (__pthread_setcancelstate, pthread_setcancelstate);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-setcanceltype.c src/libpthread/pthread/pt-setcanceltype.c
---- src/libpthread.empty/pthread/pt-setcanceltype.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-setcanceltype.c	2012-04-21 20:29:31.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-setcanceltype.c eglibc-2.13/libpthread/pthread/pt-setcanceltype.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-setcanceltype.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-setcanceltype.c	2012-04-21 20:29:31.000000000 +0000
 @@ -0,0 +1,45 @@
 +/* Set the cancel type for the calling thread.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -4302,9 +4297,9 @@
 +}
 +
 +strong_alias (__pthread_setcanceltype, pthread_setcanceltype);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-sigmask.c src/libpthread/pthread/pt-sigmask.c
---- src/libpthread.empty/pthread/pt-sigmask.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-sigmask.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-sigmask.c eglibc-2.13/libpthread/pthread/pt-sigmask.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-sigmask.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-sigmask.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,33 @@
 +/* Get or set a thread's signal mask.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -4339,9 +4334,9 @@
 +  /* Do not clear SELF's pending signals.  */
 +  return __pthread_sigstate (self, how, set, oset, 0);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-spin-inlines.c src/libpthread/pthread/pt-spin-inlines.c
---- src/libpthread.empty/pthread/pt-spin-inlines.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-spin-inlines.c	2012-04-21 21:29:25.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-spin-inlines.c eglibc-2.13/libpthread/pthread/pt-spin-inlines.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-spin-inlines.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-spin-inlines.c	2012-04-21 21:29:25.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Copyright (C) 2000 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -4377,9 +4372,9 @@
 +weak_alias (__pthread_spin_init, pthread_spin_init);
 +weak_alias (__pthread_spin_trylock, pthread_spin_trylock);
 +weak_alias (__pthread_spin_unlock, pthread_spin_unlock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-testcancel.c src/libpthread/pthread/pt-testcancel.c
---- src/libpthread.empty/pthread/pt-testcancel.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-testcancel.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-testcancel.c eglibc-2.13/libpthread/pthread/pt-testcancel.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-testcancel.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-testcancel.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* Add an explicit cancelation point.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -4412,9 +4407,9 @@
 +  if (p->cancel_state == PTHREAD_CANCEL_ENABLE && p->cancel_pending)
 +    pthread_exit (PTHREAD_CANCELED);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pt-yield.c src/libpthread/pthread/pt-yield.c
---- src/libpthread.empty/pthread/pt-yield.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pt-yield.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pt-yield.c eglibc-2.13/libpthread/pthread/pt-yield.c
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pt-yield.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pt-yield.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,26 @@
 +/* Yield the processor to another thread or process.
 +   Copyright (C) 2010 Free Software Foundation, Inc.
@@ -4442,9 +4437,9 @@
 +{
 +  return sched_yield ();
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/pthread/pthread-functions.h src/libpthread/pthread/pthread-functions.h
---- src/libpthread.empty/pthread/pthread-functions.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/pthread/pthread-functions.h	2012-04-21 20:28:37.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/pthread/pthread-functions.h eglibc-2.13/libpthread/pthread/pthread-functions.h
+--- eglibc-2.13.nolibpthread/libpthread/pthread/pthread-functions.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/pthread/pthread-functions.h	2012-04-21 20:28:37.000000000 +0000
 @@ -0,0 +1,116 @@
 +/* Copyright (C) 2003, 2012 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -4562,22 +4557,22 @@
 +void __libc_pthread_init (const struct pthread_functions *functions);
 +
 +#endif	/* pthread-functions.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/shlib-versions src/libpthread/shlib-versions
---- src/libpthread.empty/shlib-versions	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/shlib-versions	2012-04-21 19:39:51.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/shlib-versions eglibc-2.13/libpthread/shlib-versions
+--- eglibc-2.13.nolibpthread/libpthread/shlib-versions	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/shlib-versions	2012-04-21 19:39:51.000000000 +0000
 @@ -0,0 +1 @@
 +.*-.*-.*	libpthread=0.3
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/README src/libpthread/signal/README
---- src/libpthread.empty/signal/README	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/README	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/README eglibc-2.13/libpthread/signal/README
+--- eglibc-2.13.nolibpthread/libpthread/signal/README	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/README	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,4 @@
 +This directory provides a signal implementation, which is appropriate
 +for operating systems where signals are managed at user-level.  It is
 +up to the run-time to catch the signals and forward them to the
 +implementation via, e.g., the pthread_kill_info_np call.
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/TODO src/libpthread/signal/TODO
---- src/libpthread.empty/signal/TODO	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/TODO	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/TODO eglibc-2.13/libpthread/signal/TODO
+--- eglibc-2.13.nolibpthread/libpthread/signal/TODO	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/TODO	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,29 @@
 +Unimplemented Functionality
 +---------------------------
@@ -4609,9 +4604,9 @@
 +
 +Implement sigtimedwait, sigqueue.
 \ No newline at end of file
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/kill.c src/libpthread/signal/kill.c
---- src/libpthread.empty/signal/kill.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/kill.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/kill.c eglibc-2.13/libpthread/signal/kill.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/kill.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/kill.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,70 @@
 +/* kill.c - Generic kill implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -4683,9 +4678,9 @@
 +  return pthread_kill (pthread_self (), signo);
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/pt-kill-siginfo-np.c src/libpthread/signal/pt-kill-siginfo-np.c
---- src/libpthread.empty/signal/pt-kill-siginfo-np.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/pt-kill-siginfo-np.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/pt-kill-siginfo-np.c eglibc-2.13/libpthread/signal/pt-kill-siginfo-np.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/pt-kill-siginfo-np.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/pt-kill-siginfo-np.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,88 @@
 +/* pthread-kill-siginfo-np.c - Generic pthread_kill_siginfo_np implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -4775,9 +4770,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sig-internal.c src/libpthread/signal/sig-internal.c
---- src/libpthread.empty/signal/sig-internal.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sig-internal.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sig-internal.c eglibc-2.13/libpthread/signal/sig-internal.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sig-internal.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sig-internal.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,26 @@
 +/* sig-internal.c - Signal state functions.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -4805,9 +4800,9 @@
 +
 +sigset_t process_pending;
 +siginfo_t process_pending_info[NSIG];
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sig-internal.h src/libpthread/signal/sig-internal.h
---- src/libpthread.empty/signal/sig-internal.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sig-internal.h	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sig-internal.h eglibc-2.13/libpthread/signal/sig-internal.h
+--- eglibc-2.13.nolibpthread/libpthread/signal/sig-internal.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sig-internal.h	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,177 @@
 +/* sig-internal.h - Internal signal handling interface.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -4986,9 +4981,9 @@
 +}
 +
 +#endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigaction.c src/libpthread/signal/sigaction.c
---- src/libpthread.empty/signal/sigaction.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigaction.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigaction.c eglibc-2.13/libpthread/signal/sigaction.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigaction.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigaction.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,72 @@
 +/* sigaction.c - Generic sigaction implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5062,9 +5057,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigaltstack.c src/libpthread/signal/sigaltstack.c
---- src/libpthread.empty/signal/sigaltstack.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigaltstack.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigaltstack.c eglibc-2.13/libpthread/signal/sigaltstack.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigaltstack.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigaltstack.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,69 @@
 +/* sigaltstack.c - Generic sigaltstack implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5135,9 +5130,9 @@
 +    }
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/signal-dispatch.c src/libpthread/signal/signal-dispatch.c
---- src/libpthread.empty/signal/signal-dispatch.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/signal-dispatch.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/signal-dispatch.c eglibc-2.13/libpthread/signal/signal-dispatch.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/signal-dispatch.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/signal-dispatch.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,117 @@
 +/* signal-dispatch.c - Signal dispatcher.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5256,9 +5251,9 @@
 +
 +  SIGNAL_DISPATCH_EXIT;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/signal.h src/libpthread/signal/signal.h
---- src/libpthread.empty/signal/signal.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/signal.h	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/signal.h eglibc-2.13/libpthread/signal/signal.h
+--- eglibc-2.13.nolibpthread/libpthread/signal/signal.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/signal.h	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,275 @@
 +/* signal.h - Signal handling interface.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5535,9 +5530,9 @@
 +		  const struct timespec *restrict timespec);
 +
 +#endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigpending.c src/libpthread/signal/sigpending.c
---- src/libpthread.empty/signal/sigpending.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigpending.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigpending.c eglibc-2.13/libpthread/signal/sigpending.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigpending.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigpending.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,38 @@
 +/* sigpending.c - Generic sigpending implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5577,9 +5572,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigsuspend.c src/libpthread/signal/sigsuspend.c
---- src/libpthread.empty/signal/sigsuspend.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigsuspend.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigsuspend.c eglibc-2.13/libpthread/signal/sigsuspend.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigsuspend.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigsuspend.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* sigsuspend.c - Generic sigsuspend implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5610,9 +5605,9 @@
 +  errno = EOPNOTSUPP;
 +  return -1;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigtimedwait.c src/libpthread/signal/sigtimedwait.c
---- src/libpthread.empty/signal/sigtimedwait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigtimedwait.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigtimedwait.c eglibc-2.13/libpthread/signal/sigtimedwait.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigtimedwait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigtimedwait.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* sigtimedwait.c - Generic sigtimedwait implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5644,9 +5639,9 @@
 +  return -1;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigwaiter.c src/libpthread/signal/sigwaiter.c
---- src/libpthread.empty/signal/sigwaiter.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigwaiter.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigwaiter.c eglibc-2.13/libpthread/signal/sigwaiter.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigwaiter.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigwaiter.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,91 @@
 +/* sigwaiter.c - Signal handling functions.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5739,9 +5734,9 @@
 +
 +  futex_wake (&waiter->info.si_signo, 1);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/signal/sigwaitinfo.c src/libpthread/signal/sigwaitinfo.c
---- src/libpthread.empty/signal/sigwaitinfo.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/signal/sigwaitinfo.c	2012-04-22 23:55:09.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/signal/sigwaitinfo.c eglibc-2.13/libpthread/signal/sigwaitinfo.c
+--- eglibc-2.13.nolibpthread/libpthread/signal/sigwaitinfo.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/signal/sigwaitinfo.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,74 @@
 +/* sigwaitinfo.c - Generic sigwaitinfo implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -5817,9 +5812,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/barrier-attr.h src/libpthread/sysdeps/generic/bits/barrier-attr.h
---- src/libpthread.empty/sysdeps/generic/bits/barrier-attr.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/barrier-attr.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/barrier-attr.h eglibc-2.13/libpthread/sysdeps/generic/bits/barrier-attr.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/barrier-attr.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/barrier-attr.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Thread barrier attribute type.  Generic version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -5853,9 +5848,9 @@
 +};
 +
 +#endif /* bits/barrier-attr.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/barrier.h src/libpthread/sysdeps/generic/bits/barrier.h
---- src/libpthread.empty/sysdeps/generic/bits/barrier.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/barrier.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/barrier.h eglibc-2.13/libpthread/sysdeps/generic/bits/barrier.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/barrier.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/barrier.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Thread barrier attribute type.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -5896,9 +5891,9 @@
 +
 +
 +#endif /* bits/barrier.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/cancelation.h src/libpthread/sysdeps/generic/bits/cancelation.h
---- src/libpthread.empty/sysdeps/generic/bits/cancelation.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/cancelation.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/cancelation.h eglibc-2.13/libpthread/sysdeps/generic/bits/cancelation.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/cancelation.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/cancelation.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,51 @@
 +/* Cancelation.  Generic version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -5951,9 +5946,9 @@
 +	}
 +
 +#endif /* _BITS_CANCELATION_H */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/condition-attr.h src/libpthread/sysdeps/generic/bits/condition-attr.h
---- src/libpthread.empty/sysdeps/generic/bits/condition-attr.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/condition-attr.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/condition-attr.h eglibc-2.13/libpthread/sysdeps/generic/bits/condition-attr.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/condition-attr.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/condition-attr.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Condition attribute type.  Generic version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -5989,9 +5984,9 @@
 +  };
 +
 +#endif /* bits/condition.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/condition.h src/libpthread/sysdeps/generic/bits/condition.h
---- src/libpthread.empty/sysdeps/generic/bits/condition.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/condition.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/condition.h eglibc-2.13/libpthread/sysdeps/generic/bits/condition.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/condition.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/condition.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Condition type.  Generic version.
 +   Copyright (C) 2000, 2005, 2009 Free Software Foundation, Inc.
@@ -6032,9 +6027,9 @@
 +  { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, NULL, NULL, NULL }
 +
 +#endif /* bits/condition.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/mutex-attr.h src/libpthread/sysdeps/generic/bits/mutex-attr.h
---- src/libpthread.empty/sysdeps/generic/bits/mutex-attr.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/mutex-attr.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/mutex-attr.h eglibc-2.13/libpthread/sysdeps/generic/bits/mutex-attr.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/mutex-attr.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/mutex-attr.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,41 @@
 +/* Mutex attribute type.  Generic version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -6077,9 +6072,9 @@
 +extern const struct __pthread_mutexattr __pthread_recursive_mutexattr;
 +
 +#endif /* bits/mutex-attr.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/mutex.h src/libpthread/sysdeps/generic/bits/mutex.h
---- src/libpthread.empty/sysdeps/generic/bits/mutex.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/mutex.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/mutex.h eglibc-2.13/libpthread/sysdeps/generic/bits/mutex.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/mutex.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/mutex.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,75 @@
 +/* Mutex type.  Generic version.
 +
@@ -6156,9 +6151,9 @@
 +#endif /* Not __pthread_mutex_defined.  */
 +
 +#endif /* bits/mutex.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/once.h src/libpthread/sysdeps/generic/bits/once.h
---- src/libpthread.empty/sysdeps/generic/bits/once.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/once.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/once.h eglibc-2.13/libpthread/sysdeps/generic/bits/once.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/once.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/once.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Dynamic package initialization data structures.  Generic version.
 +   Copyright (C) 2002, 2009 Free Software Foundation, Inc.
@@ -6194,9 +6189,9 @@
 +	{ 0, __PTHREAD_SPIN_LOCK_INITIALIZER }
 +
 +#endif /* bits/once.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/pthread-np.h src/libpthread/sysdeps/generic/bits/pthread-np.h
---- src/libpthread.empty/sysdeps/generic/bits/pthread-np.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/pthread-np.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/pthread-np.h eglibc-2.13/libpthread/sysdeps/generic/bits/pthread-np.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/pthread-np.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/pthread-np.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* Non-portable functions. Generic version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -6225,9 +6220,9 @@
 +#define _BITS_PTHREAD_NP_H	1
 +
 +#endif /* bits/pthread-np.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/pthread.h src/libpthread/sysdeps/generic/bits/pthread.h
---- src/libpthread.empty/sysdeps/generic/bits/pthread.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/pthread.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/pthread.h eglibc-2.13/libpthread/sysdeps/generic/bits/pthread.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/pthread.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/pthread.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,38 @@
 +/* Pthread data structures.  Generic version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -6267,9 +6262,9 @@
 +#endif
 +
 +#endif /* bits/pthread.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/pthreadtypes.h src/libpthread/sysdeps/generic/bits/pthreadtypes.h
---- src/libpthread.empty/sysdeps/generic/bits/pthreadtypes.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/pthreadtypes.h	2012-04-22 16:40:39.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/pthreadtypes.h eglibc-2.13/libpthread/sysdeps/generic/bits/pthreadtypes.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/pthreadtypes.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/pthreadtypes.h	2012-04-22 16:40:39.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* 
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -6300,9 +6295,9 @@
 +#include <pthread/pthreadtypes.h>
 +
 +#endif /* bits/pthreadtypes.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/rwlock-attr.h src/libpthread/sysdeps/generic/bits/rwlock-attr.h
---- src/libpthread.empty/sysdeps/generic/bits/rwlock-attr.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/rwlock-attr.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/rwlock-attr.h eglibc-2.13/libpthread/sysdeps/generic/bits/rwlock-attr.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/rwlock-attr.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/rwlock-attr.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Thread rwlock attribute type.  Generic version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -6336,9 +6331,9 @@
 +};
 +
 +#endif /* bits/rwlock-attr.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/rwlock.h src/libpthread/sysdeps/generic/bits/rwlock.h
---- src/libpthread.empty/sysdeps/generic/bits/rwlock.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/rwlock.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/rwlock.h eglibc-2.13/libpthread/sysdeps/generic/bits/rwlock.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/rwlock.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/rwlock.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,46 @@
 +/* rwlock type.  Generic version.
 +   Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
@@ -6386,9 +6381,9 @@
 +
 +
 +#endif /* bits/rwlock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/semaphore.h src/libpthread/sysdeps/generic/bits/semaphore.h
---- src/libpthread.empty/sysdeps/generic/bits/semaphore.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/semaphore.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/semaphore.h eglibc-2.13/libpthread/sysdeps/generic/bits/semaphore.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/semaphore.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/semaphore.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,43 @@
 +/* Semaphore type.  Generic version.
 +   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
@@ -6433,9 +6428,9 @@
 +  { __PTHREAD_SPIN_LOCK_INITIALIZER, NULL, (pshared), (value), NULL }
 +
 +#endif /* bits/mutex.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/thread-attr.h src/libpthread/sysdeps/generic/bits/thread-attr.h
---- src/libpthread.empty/sysdeps/generic/bits/thread-attr.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/thread-attr.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/thread-attr.h eglibc-2.13/libpthread/sysdeps/generic/bits/thread-attr.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/thread-attr.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/thread-attr.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,44 @@
 +/* Thread attribute type.  Generic version.
 +   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
@@ -6481,9 +6476,9 @@
 +};
 +
 +#endif /* bits/thread-attr.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/bits/thread-specific.h src/libpthread/sysdeps/generic/bits/thread-specific.h
---- src/libpthread.empty/sysdeps/generic/bits/thread-specific.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/bits/thread-specific.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/thread-specific.h eglibc-2.13/libpthread/sysdeps/generic/bits/thread-specific.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/bits/thread-specific.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/bits/thread-specific.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,25 @@
 +/* Thread specific data.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6510,9 +6505,9 @@
 +typedef int __pthread_key;
 +
 +#endif /* bits/thread-specific.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/killpg.c src/libpthread/sysdeps/generic/killpg.c
---- src/libpthread.empty/sysdeps/generic/killpg.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/killpg.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/killpg.c eglibc-2.13/libpthread/sysdeps/generic/killpg.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/killpg.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/killpg.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* killpg.c - Generic killpg implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -6541,9 +6536,9 @@
 +{
 +  return kill (-pid, sig);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-atfork.c src/libpthread/sysdeps/generic/pt-atfork.c
---- src/libpthread.empty/sysdeps/generic/pt-atfork.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-atfork.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-atfork.c eglibc-2.13/libpthread/sysdeps/generic/pt-atfork.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-atfork.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-atfork.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* Register fork handlers.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6574,9 +6569,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-destroy.c src/libpthread/sysdeps/generic/pt-attr-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-destroy.c	2012-04-21 20:20:21.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-destroy.c	2012-04-21 20:20:21.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_attr_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6606,9 +6601,9 @@
 +  return 0;
 +}
 +strong_alias (__pthread_attr_destroy, pthread_attr_destroy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getdetachstate.c src/libpthread/sysdeps/generic/pt-attr-getdetachstate.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getdetachstate.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getdetachstate.c	2012-04-21 20:21:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getdetachstate.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getdetachstate.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getdetachstate.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getdetachstate.c	2012-04-21 20:21:44.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* pthread_attr_getdetachstate.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6641,9 +6636,9 @@
 +}
 +
 +strong_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getguardsize.c src/libpthread/sysdeps/generic/pt-attr-getguardsize.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getguardsize.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getguardsize.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getguardsize.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getguardsize.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getguardsize.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getguardsize.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_attr_getguardsize.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6674,9 +6669,9 @@
 +  *guardsize = attr->guardsize;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getinheritsched.c src/libpthread/sysdeps/generic/pt-attr-getinheritsched.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getinheritsched.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getinheritsched.c	2012-04-21 20:22:15.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getinheritsched.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getinheritsched.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getinheritsched.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getinheritsched.c	2012-04-21 20:22:15.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* pthread_attr_getinheritsched.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6709,9 +6704,9 @@
 +}
 +
 +strong_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getschedparam.c src/libpthread/sysdeps/generic/pt-attr-getschedparam.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getschedparam.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getschedparam.c	2012-04-21 20:22:48.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getschedparam.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getschedparam.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getschedparam.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getschedparam.c	2012-04-21 20:22:48.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* pthread_attr_getschedparam.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6747,9 +6742,9 @@
 +}
 +
 +strong_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getschedpolicy.c src/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getschedpolicy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c	2012-04-21 20:23:13.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getschedpolicy.c	2012-04-21 20:23:13.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* pthread_attr_getschedpolicy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6782,9 +6777,9 @@
 +}
 +
 +strong_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getscope.c src/libpthread/sysdeps/generic/pt-attr-getscope.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getscope.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getscope.c	2012-04-21 20:23:40.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getscope.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getscope.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getscope.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getscope.c	2012-04-21 20:23:40.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* pthread_attr_getscope.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6817,9 +6812,9 @@
 +}
 +
 +strong_alias (__pthread_attr_getscope, pthread_attr_getscope);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getstack.c src/libpthread/sysdeps/generic/pt-attr-getstack.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getstack.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getstack.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getstack.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getstack.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getstack.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getstack.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* pthread_attr_getstack.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6852,9 +6847,9 @@
 +  pthread_attr_getstacksize (attr, stacksize);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getstackaddr.c src/libpthread/sysdeps/generic/pt-attr-getstackaddr.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getstackaddr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getstackaddr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getstackaddr.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getstackaddr.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getstackaddr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getstackaddr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_attr_getstackaddr.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6885,9 +6880,9 @@
 +  *stackaddr = attr->stackaddr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-getstacksize.c src/libpthread/sysdeps/generic/pt-attr-getstacksize.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-getstacksize.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-getstacksize.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getstacksize.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getstacksize.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-getstacksize.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-getstacksize.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_attr_getstacksize.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6918,9 +6913,9 @@
 +  *stacksize = attr->stacksize;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-init.c src/libpthread/sysdeps/generic/pt-attr-init.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-init.c	2012-04-21 20:20:12.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-init.c	2012-04-21 20:20:12.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_attr_init.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6951,9 +6946,9 @@
 +  return 0;
 +}
 +strong_alias (__pthread_attr_init, pthread_attr_init);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setdetachstate.c src/libpthread/sysdeps/generic/pt-attr-setdetachstate.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setdetachstate.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setdetachstate.c	2012-04-21 20:21:23.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setdetachstate.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setdetachstate.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setdetachstate.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setdetachstate.c	2012-04-21 20:21:23.000000000 +0000
 @@ -0,0 +1,40 @@
 +/* pthread_attr_setdetachstate.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -6995,9 +6990,9 @@
 +}
 +
 +strong_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setguardsize.c src/libpthread/sysdeps/generic/pt-attr-setguardsize.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setguardsize.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setguardsize.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setguardsize.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setguardsize.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setguardsize.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setguardsize.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_attr_setguardsize.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7028,9 +7023,9 @@
 +  attr->guardsize = guardsize;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setinheritsched.c src/libpthread/sysdeps/generic/pt-attr-setinheritsched.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setinheritsched.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setinheritsched.c	2012-04-21 20:22:19.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setinheritsched.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setinheritsched.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setinheritsched.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setinheritsched.c	2012-04-21 20:22:19.000000000 +0000
 @@ -0,0 +1,40 @@
 +/* pthread_attr_setinheritsched.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7072,9 +7067,9 @@
 +}
 +
 +strong_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setschedparam.c src/libpthread/sysdeps/generic/pt-attr-setschedparam.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setschedparam.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setschedparam.c	2012-04-21 20:22:40.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setschedparam.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setschedparam.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setschedparam.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setschedparam.c	2012-04-21 20:22:40.000000000 +0000
 @@ -0,0 +1,40 @@
 +/* pthread_attr_getschedparam.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7116,9 +7111,9 @@
 +}
 +
 +strong_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setschedpolicy.c src/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setschedpolicy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c	2012-04-21 20:23:08.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setschedpolicy.c	2012-04-21 20:23:08.000000000 +0000
 @@ -0,0 +1,44 @@
 +/* pthread_attr_getschedpolicy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7164,9 +7159,9 @@
 +}
 +
 +strong_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setscope.c src/libpthread/sysdeps/generic/pt-attr-setscope.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setscope.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setscope.c	2012-04-21 20:30:42.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setscope.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setscope.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setscope.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setscope.c	2012-04-21 20:30:42.000000000 +0000
 @@ -0,0 +1,43 @@
 +/* pthread_attr_setscope.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7211,9 +7206,9 @@
 +}
 +
 +strong_alias (__pthread_attr_setscope, pthread_attr_setscope);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setstack.c src/libpthread/sysdeps/generic/pt-attr-setstack.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setstack.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setstack.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setstack.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setstack.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setstack.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setstack.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,51 @@
 +/* pthread_attr_setstack.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7266,9 +7261,9 @@
 +      
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setstackaddr.c src/libpthread/sysdeps/generic/pt-attr-setstackaddr.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setstackaddr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setstackaddr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setstackaddr.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setstackaddr.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setstackaddr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setstackaddr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_attr_setstackaddr.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7299,9 +7294,9 @@
 +  attr->stackaddr = stackaddr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr-setstacksize.c src/libpthread/sysdeps/generic/pt-attr-setstacksize.c
---- src/libpthread.empty/sysdeps/generic/pt-attr-setstacksize.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr-setstacksize.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setstacksize.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setstacksize.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr-setstacksize.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr-setstacksize.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,41 @@
 +/* pthread_attr_setstacksize.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7344,9 +7339,9 @@
 +
 +  return ENOTSUP;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-attr.c src/libpthread/sysdeps/generic/pt-attr.c
---- src/libpthread.empty/sysdeps/generic/pt-attr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-attr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr.c eglibc-2.13/libpthread/sysdeps/generic/pt-attr.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-attr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-attr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,41 @@
 +/* Default attributes.  Generic version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -7389,9 +7384,9 @@
 +  contentionscope: PTHREAD_SCOPE_SYSTEM,
 +  schedpolicy: SCHED_OTHER
 +};
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrier-destroy.c src/libpthread/sysdeps/generic/pt-barrier-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-barrier-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrier-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrier-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrier-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_barrier_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7420,9 +7415,9 @@
 +{
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrier-init.c src/libpthread/sysdeps/generic/pt-barrier-init.c
---- src/libpthread.empty/sysdeps/generic/pt-barrier-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrier-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrier-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrier-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,53 @@
 +/* pthread_barrier_init.  Generic version.
 +   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -7477,9 +7472,9 @@
 +  *barrier->attr = *attr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrier-wait.c src/libpthread/sysdeps/generic/pt-barrier-wait.c
---- src/libpthread.empty/sysdeps/generic/pt-barrier-wait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrier-wait.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier-wait.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrier-wait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier-wait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrier-wait.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,61 @@
 +/* pthread_barrier_wait.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7542,9 +7537,9 @@
 +      return 0;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrier.c src/libpthread/sysdeps/generic/pt-barrier.c
---- src/libpthread.empty/sysdeps/generic/pt-barrier.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrier.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrier.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrier.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrier.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,26 @@
 +/* Default barrier attributes.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7572,9 +7567,9 @@
 +{
 +  pshared: PTHREAD_PROCESS_PRIVATE
 +};
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrierattr-destroy.c src/libpthread/sysdeps/generic/pt-barrierattr-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-barrierattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrierattr-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_barrierattr_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7603,9 +7598,9 @@
 +{
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrierattr-getpshared.c src/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-barrierattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_barrierattr_getpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7636,9 +7631,9 @@
 +  *pshared = attr->pshared;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrierattr-init.c src/libpthread/sysdeps/generic/pt-barrierattr-init.c
---- src/libpthread.empty/sysdeps/generic/pt-barrierattr-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrierattr-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_barrierattr_init.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7668,9 +7663,9 @@
 +  *attr = __pthread_default_barrierattr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-barrierattr-setpshared.c src/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-barrierattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-barrierattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* pthread_barrierattr_setpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7711,9 +7706,9 @@
 +      return EINVAL;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond-brdcast.c src/libpthread/sysdeps/generic/pt-cond-brdcast.c
---- src/libpthread.empty/sysdeps/generic/pt-cond-brdcast.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond-brdcast.c	2012-04-21 20:24:53.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-brdcast.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond-brdcast.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-brdcast.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond-brdcast.c	2012-04-21 20:24:53.000000000 +0000
 @@ -0,0 +1,44 @@
 +/* Broadcast a condition.  Generic version.
 +   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
@@ -7759,9 +7754,9 @@
 +}
 +
 +strong_alias (__pthread_cond_broadcast, pthread_cond_broadcast);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond-destroy.c src/libpthread/sysdeps/generic/pt-cond-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-cond-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond-destroy.c	2012-04-21 20:25:06.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond-destroy.c	2012-04-21 20:25:06.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_cond_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7792,9 +7787,9 @@
 +}
 +
 +strong_alias (__pthread_cond_destroy, pthread_cond_destroy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond-init.c src/libpthread/sysdeps/generic/pt-cond-init.c
---- src/libpthread.empty/sysdeps/generic/pt-cond-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond-init.c	2012-04-21 20:25:15.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond-init.c	2012-04-21 20:25:15.000000000 +0000
 @@ -0,0 +1,47 @@
 +/* pthread_cond_init.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -7843,9 +7838,9 @@
 +}
 +
 +strong_alias (__pthread_cond_init, pthread_cond_init);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond-signal.c src/libpthread/sysdeps/generic/pt-cond-signal.c
---- src/libpthread.empty/sysdeps/generic/pt-cond-signal.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond-signal.c	2012-04-21 20:25:23.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-signal.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond-signal.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-signal.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond-signal.c	2012-04-21 20:25:23.000000000 +0000
 @@ -0,0 +1,56 @@
 +/* Signal a condition.  Generic version.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -7903,9 +7898,9 @@
 +}
 +
 +strong_alias (__pthread_cond_signal, pthread_cond_signal);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond-timedwait.c src/libpthread/sysdeps/generic/pt-cond-timedwait.c
---- src/libpthread.empty/sysdeps/generic/pt-cond-timedwait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond-timedwait.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-timedwait.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond-timedwait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-timedwait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond-timedwait.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,111 @@
 +/* Wait on a condition.  Generic version.
 +   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
@@ -8018,9 +8013,9 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond-wait.c src/libpthread/sysdeps/generic/pt-cond-wait.c
---- src/libpthread.empty/sysdeps/generic/pt-cond-wait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond-wait.c	2012-04-21 20:25:56.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-wait.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond-wait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond-wait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond-wait.c	2012-04-21 20:25:56.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Wait on a condition.  Generic version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -8061,9 +8056,9 @@
 +}
 +
 +strong_alias (__pthread_cond_wait, pthread_cond_wait);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-cond.c src/libpthread/sysdeps/generic/pt-cond.c
---- src/libpthread.empty/sysdeps/generic/pt-cond.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-cond.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond.c eglibc-2.13/libpthread/sysdeps/generic/pt-cond.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-cond.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-cond.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* Default condition attributes.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8094,9 +8089,9 @@
 +  pshared: PTHREAD_PROCESS_PRIVATE,
 +  clock: CLOCK_REALTIME
 +};
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-condattr-destroy.c src/libpthread/sysdeps/generic/pt-condattr-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-condattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-condattr-destroy.c	2012-04-21 20:24:01.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-destroy.c	2012-04-21 20:24:01.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_condattr_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8127,9 +8122,9 @@
 +}
 +
 +strong_alias (__pthread_condattr_destroy, pthread_condattr_destroy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-condattr-getclock.c src/libpthread/sysdeps/generic/pt-condattr-getclock.c
---- src/libpthread.empty/sysdeps/generic/pt-condattr-getclock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-condattr-getclock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-getclock.c eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-getclock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-getclock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-getclock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* pthread_condattr_getclock.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8162,9 +8157,9 @@
 +  *clock = attr->clock;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-condattr-getpshared.c src/libpthread/sysdeps/generic/pt-condattr-getpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-condattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-condattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-getpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-getpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_condattr_getpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8195,9 +8190,9 @@
 +  *pshared = attr->pshared;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-condattr-init.c src/libpthread/sysdeps/generic/pt-condattr-init.c
---- src/libpthread.empty/sysdeps/generic/pt-condattr-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-condattr-init.c	2012-04-21 20:24:11.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-init.c	2012-04-21 20:24:11.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* pthread_condattr_init.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8229,9 +8224,9 @@
 +}
 +
 +strong_alias (__pthread_condattr_init, pthread_condattr_init);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-condattr-setclock.c src/libpthread/sysdeps/generic/pt-condattr-setclock.c
---- src/libpthread.empty/sysdeps/generic/pt-condattr-setclock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-condattr-setclock.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-setclock.c eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-setclock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-setclock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-setclock.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,52 @@
 +/* pthread_condattr_setclock.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8285,9 +8280,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-condattr-setpshared.c src/libpthread/sysdeps/generic/pt-condattr-setpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-condattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-condattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-setpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-setpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-condattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-condattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* pthread_condattr_setpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8328,9 +8323,9 @@
 +      return EINVAL;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-destroy-specific.c src/libpthread/sysdeps/generic/pt-destroy-specific.c
---- src/libpthread.empty/sysdeps/generic/pt-destroy-specific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-destroy-specific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-destroy-specific.c eglibc-2.13/libpthread/sysdeps/generic/pt-destroy-specific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-destroy-specific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-destroy-specific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* __pthread_destory_specific.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8360,9 +8355,9 @@
 +  /* Not support, thus there cannot be any.  */
 +  return;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-equal.c src/libpthread/sysdeps/generic/pt-equal.c
---- src/libpthread.empty/sysdeps/generic/pt-equal.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-equal.c	2012-04-21 20:26:15.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-equal.c eglibc-2.13/libpthread/sysdeps/generic/pt-equal.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-equal.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-equal.c	2012-04-21 20:26:15.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* Default attributes.  Generic version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -8395,9 +8390,9 @@
 +}
 +
 +strong_alias (__pthread_equal, pthread_equal);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-getconcurrency.c src/libpthread/sysdeps/generic/pt-getconcurrency.c
---- src/libpthread.empty/sysdeps/generic/pt-getconcurrency.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-getconcurrency.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getconcurrency.c eglibc-2.13/libpthread/sysdeps/generic/pt-getconcurrency.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getconcurrency.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-getconcurrency.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* Get the current level of desired concurrency.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8426,9 +8421,9 @@
 +{
 +  return __pthread_concurrency;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-getcpuclockid.c src/libpthread/sysdeps/generic/pt-getcpuclockid.c
---- src/libpthread.empty/sysdeps/generic/pt-getcpuclockid.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-getcpuclockid.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getcpuclockid.c eglibc-2.13/libpthread/sysdeps/generic/pt-getcpuclockid.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getcpuclockid.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-getcpuclockid.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Return a thread's cpu clockid.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8464,9 +8459,9 @@
 +  return ENOSYS;
 +#endif
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-getschedparam.c src/libpthread/sysdeps/generic/pt-getschedparam.c
---- src/libpthread.empty/sysdeps/generic/pt-getschedparam.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-getschedparam.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getschedparam.c eglibc-2.13/libpthread/sysdeps/generic/pt-getschedparam.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getschedparam.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-getschedparam.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* Get the scheduling parameters for a thread.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8498,9 +8493,9 @@
 +}
 +
 +strong_alias (__pthread_getschedparam, pthread_getschedparam);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-getspecific.c src/libpthread/sysdeps/generic/pt-getspecific.c
---- src/libpthread.empty/sysdeps/generic/pt-getspecific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-getspecific.c	2012-04-21 17:03:39.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getspecific.c eglibc-2.13/libpthread/sysdeps/generic/pt-getspecific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-getspecific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-getspecific.c	2012-04-21 17:03:39.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_getspecific.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8529,9 +8524,9 @@
 +{
 +  return EINVAL;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-init-specific.c src/libpthread/sysdeps/generic/pt-init-specific.c
---- src/libpthread.empty/sysdeps/generic/pt-init-specific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-init-specific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-init-specific.c eglibc-2.13/libpthread/sysdeps/generic/pt-init-specific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-init-specific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-init-specific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* __pthread_init_specific.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8560,9 +8555,9 @@
 +{
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-key-create.c src/libpthread/sysdeps/generic/pt-key-create.c
---- src/libpthread.empty/sysdeps/generic/pt-key-create.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-key-create.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-key-create.c eglibc-2.13/libpthread/sysdeps/generic/pt-key-create.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-key-create.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-key-create.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_key_create.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8591,9 +8586,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-key-delete.c src/libpthread/sysdeps/generic/pt-key-delete.c
---- src/libpthread.empty/sysdeps/generic/pt-key-delete.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-key-delete.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-key-delete.c eglibc-2.13/libpthread/sysdeps/generic/pt-key-delete.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-key-delete.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-key-delete.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_key_delete.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8622,9 +8617,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-key.h src/libpthread/sysdeps/generic/pt-key.h
---- src/libpthread.empty/sysdeps/generic/pt-key.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-key.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-key.h eglibc-2.13/libpthread/sysdeps/generic/pt-key.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-key.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-key.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,22 @@
 +/* pthread_key internal declatations.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8648,9 +8643,9 @@
 +#include <pthread.h>
 +
 +#define PTHREAD_KEY_MEMBERS
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-kill.c src/libpthread/sysdeps/generic/pt-kill.c
---- src/libpthread.empty/sysdeps/generic/pt-kill.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-kill.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-kill.c eglibc-2.13/libpthread/sysdeps/generic/pt-kill.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-kill.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-kill.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* pthread-kill.c - Generic pthread-kill implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -8684,9 +8679,9 @@
 +  return pthread_kill_siginfo_np (tid, si);
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-destroy.c src/libpthread/sysdeps/generic/pt-mutex-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Destroy a mutex.  Generic version.
 +   Copyright (C) 2000, 2002, 2006 Free Software Foundation, Inc.
@@ -8727,9 +8722,9 @@
 +}
 +
 +strong_alias (_pthread_mutex_destroy, pthread_mutex_destroy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-getprioceiling.c src/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-getprioceiling.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* Get a mutex' priority ceiling.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8759,9 +8754,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-init.c src/libpthread/sysdeps/generic/pt-mutex-init.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,50 @@
 +/* Initialize a mutex.  Generic version.
 +   Copyright (C) 2000, 2002, 2005, 2006, 2008 Free Software Foundation, Inc.
@@ -8813,9 +8808,9 @@
 +}
 +
 +strong_alias (_pthread_mutex_init, pthread_mutex_init);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-lock.c src/libpthread/sysdeps/generic/pt-mutex-lock.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-lock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-lock.c	2012-04-21 20:16:39.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-lock.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-lock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-lock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-lock.c	2012-04-21 20:16:39.000000000 +0000
 @@ -0,0 +1,37 @@
 +/* Lock a mutex.  Generic version.
 +   Copyright (C) 2000, 2002, 2006 Free Software Foundation, Inc.
@@ -8854,9 +8849,9 @@
 +
 +strong_alias (__pthread_mutex_lock, _pthread_mutex_lock);
 +strong_alias (__pthread_mutex_lock, pthread_mutex_lock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-setprioceiling.c src/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-setprioceiling.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* Set a mutex' priority ceiling.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -8886,9 +8881,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-timedlock.c src/libpthread/sysdeps/generic/pt-mutex-timedlock.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-timedlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-timedlock.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-timedlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-timedlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-timedlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-timedlock.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,187 @@
 +/* Lock a mutex with a timeout.  Generic version.
 +   Copyright (C) 2000, 2002, 2005, 2008 Free Software Foundation, Inc.
@@ -9077,9 +9072,9 @@
 +{
 +  return __pthread_mutex_timedlock_internal (mutex, abstime);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-transfer-np.c src/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-transfer-np.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-transfer-np.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-transfer-np.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-transfer-np.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-transfer-np.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,66 @@
 +/* Transfer ownership of a mutex.  Generic version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -9147,9 +9142,9 @@
 +}
 +
 +strong_alias (__pthread_mutex_transfer_np, pthread_mutex_transfer_np)
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-trylock.c src/libpthread/sysdeps/generic/pt-mutex-trylock.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-trylock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-trylock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-trylock.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-trylock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-trylock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-trylock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,112 @@
 +/* Try to Lock a mutex.  Generic version.
 +   Copyright (C) 2002, 2005, 2008 Free Software Foundation, Inc.
@@ -9263,9 +9258,9 @@
 +
 +strong_alias (__pthread_mutex_trylock, _pthread_mutex_trylock);
 +strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutex-unlock.c src/libpthread/sysdeps/generic/pt-mutex-unlock.c
---- src/libpthread.empty/sysdeps/generic/pt-mutex-unlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutex-unlock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-unlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-unlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutex-unlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutex-unlock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,108 @@
 +/* Unlock a mutex.  Generic version.
 +   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
@@ -9375,9 +9370,9 @@
 +
 +strong_alias (__pthread_mutex_unlock, _pthread_mutex_unlock);
 +strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-destroy.c src/libpthread/sysdeps/generic/pt-mutexattr-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_mutexattr_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9406,9 +9401,9 @@
 +{
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-getprioceiling.c src/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-getprioceiling.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_mutexattr_getprioceiling.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9438,9 +9433,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-getprotocol.c src/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-getprotocol.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-getprotocol.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_mutexattr_getprotocol.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9471,9 +9466,9 @@
 +  *protocol = attr->protocol;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-getpshared.c src/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_mutexattr_getpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9504,9 +9499,9 @@
 +  *pshared = attr->pshared;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-gettype.c src/libpthread/sysdeps/generic/pt-mutexattr-gettype.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-gettype.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-gettype.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-gettype.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-gettype.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-gettype.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-gettype.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_mutexattr_gettype.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9536,9 +9531,9 @@
 +  *type = attr->mutex_type;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-init.c src/libpthread/sysdeps/generic/pt-mutexattr-init.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_mutexattr_init.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9568,9 +9563,9 @@
 +  *attr = __pthread_default_mutexattr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-setprioceiling.c src/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-setprioceiling.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_mutexattr_setprioceiling.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9600,9 +9595,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-setprotocol.c src/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-setprotocol.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-setprotocol.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,42 @@
 +/* pthread_mutexattr_setprotocol.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9646,9 +9641,9 @@
 +      return EINVAL;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-setpshared.c src/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* pthread_mutexattr_setpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9689,9 +9684,9 @@
 +      return EINVAL;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr-settype.c src/libpthread/sysdeps/generic/pt-mutexattr-settype.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr-settype.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr-settype.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-settype.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-settype.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr-settype.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr-settype.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,37 @@
 +/* pthread_mutexattr_settype.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9730,9 +9725,9 @@
 +      return EINVAL;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-mutexattr.c src/libpthread/sysdeps/generic/pt-mutexattr.c
---- src/libpthread.empty/sysdeps/generic/pt-mutexattr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-mutexattr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr.c eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-mutexattr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-mutexattr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,45 @@
 +/* Default mutex attributes.  Generic version.
 +   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
@@ -9779,9 +9774,9 @@
 +  pshared: PTHREAD_PROCESS_PRIVATE,
 +  mutex_type: PTHREAD_MUTEX_RECURSIVE
 +};
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-once.c src/libpthread/sysdeps/generic/pt-once.c
---- src/libpthread.empty/sysdeps/generic/pt-once.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-once.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-once.c eglibc-2.13/libpthread/sysdeps/generic/pt-once.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-once.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-once.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,43 @@
 +/* pthread_once.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9826,9 +9821,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-attr.c src/libpthread/sysdeps/generic/pt-rwlock-attr.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-attr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-attr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-attr.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-attr.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-attr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-attr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,26 @@
 +/* Default rwlock attributes.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -9856,9 +9851,9 @@
 +{
 +  pshared: PTHREAD_PROCESS_PRIVATE
 +};
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-destroy.c src/libpthread/sysdeps/generic/pt-rwlock-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* Destroy a rwlock.  Generic version.
 +   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
@@ -9889,9 +9884,9 @@
 +}
 +
 +strong_alias (_pthread_rwlock_destroy, pthread_rwlock_destroy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-init.c src/libpthread/sysdeps/generic/pt-rwlock-init.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,45 @@
 +/* Initialize a rwlock.  Generic version.
 +   Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
@@ -9938,9 +9933,9 @@
 +}
 +
 +strong_alias (_pthread_rwlock_init, pthread_rwlock_init);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-rdlock.c src/libpthread/sysdeps/generic/pt-rwlock-rdlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-rdlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-rdlock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-rdlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-rdlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-rdlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-rdlock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Acquire a rwlock for reading.  Generic version.
 +   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -9974,9 +9969,9 @@
 +{
 +  return __pthread_rwlock_timedrdlock_internal (rwlock, 0);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-timedrdlock.c src/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-timedrdlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-timedrdlock.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,113 @@
 +/* Acquire a rwlock for reading.  Generic version.
 +   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -10091,9 +10086,9 @@
 +{
 +  return __pthread_rwlock_timedrdlock_internal (rwlock, abstime);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-timedwrlock.c src/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-timedwrlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-timedwrlock.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,95 @@
 +/* Acquire a rwlock for writing.  Generic version.
 +   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -10190,9 +10185,9 @@
 +{
 +  return __pthread_rwlock_timedwrlock_internal (rwlock, abstime);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-tryrdlock.c src/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-tryrdlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-tryrdlock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,56 @@
 +/* Try to acquire a rwlock for reading.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10250,9 +10245,9 @@
 +
 +  return EBUSY;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-trywrlock.c src/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-trywrlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-trywrlock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,46 @@
 +/* Try to acquire a rwlock for writing.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10300,9 +10295,9 @@
 +
 +  return EBUSY;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-unlock.c src/libpthread/sysdeps/generic/pt-rwlock-unlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-unlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-unlock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-unlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-unlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-unlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-unlock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,90 @@
 +/* Unlock a rwlock.  Generic version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -10394,9 +10389,9 @@
 +  __pthread_spin_unlock (&rwlock->__lock);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlock-wrlock.c src/libpthread/sysdeps/generic/pt-rwlock-wrlock.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlock-wrlock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlock-wrlock.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-wrlock.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-wrlock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlock-wrlock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlock-wrlock.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Acquire a rwlock for writing.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10432,9 +10427,9 @@
 +{
 +  return __pthread_rwlock_timedwrlock_internal (rwlock, 0);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlockattr-destroy.c src/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlockattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_rwlockattr_destroy.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10463,9 +10458,9 @@
 +{
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlockattr-getpshared.c src/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlockattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-getpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* pthread_rwlockattr_getpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10496,9 +10491,9 @@
 +  *pshared = attr->pshared;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlockattr-init.c src/libpthread/sysdeps/generic/pt-rwlockattr-init.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlockattr-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlockattr-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-init.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* pthread_rwlockattr_init.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10528,9 +10523,9 @@
 +  *attr = __pthread_default_rwlockattr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-rwlockattr-setpshared.c src/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c
---- src/libpthread.empty/sysdeps/generic/pt-rwlockattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-rwlockattr-setpshared.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* pthread_rwlockattr_setpshared.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10571,9 +10566,9 @@
 +      return EINVAL;
 +    }
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-setconcurrency.c src/libpthread/sysdeps/generic/pt-setconcurrency.c
---- src/libpthread.empty/sysdeps/generic/pt-setconcurrency.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-setconcurrency.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setconcurrency.c eglibc-2.13/libpthread/sysdeps/generic/pt-setconcurrency.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setconcurrency.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-setconcurrency.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* Set the desired level of concurrency.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10609,9 +10604,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-setschedparam.c src/libpthread/sysdeps/generic/pt-setschedparam.c
---- src/libpthread.empty/sysdeps/generic/pt-setschedparam.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-setschedparam.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setschedparam.c eglibc-2.13/libpthread/sysdeps/generic/pt-setschedparam.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setschedparam.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-setschedparam.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* Set the scheduling parameters for a thread.  Generic version.
 +   Copyright (C) 2002, 2005 Free Software Foundation, Inc.
@@ -10643,9 +10638,9 @@
 +}
 +
 +strong_alias (__pthread_setschedparam, pthread_setschedparam);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-setschedprio.c src/libpthread/sysdeps/generic/pt-setschedprio.c
---- src/libpthread.empty/sysdeps/generic/pt-setschedprio.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-setschedprio.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setschedprio.c eglibc-2.13/libpthread/sysdeps/generic/pt-setschedprio.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setschedprio.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-setschedprio.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* Set the scheduling priority of a thread.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10674,9 +10669,9 @@
 +{
 +  return ENOSYS;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-setspecific.c src/libpthread/sysdeps/generic/pt-setspecific.c
---- src/libpthread.empty/sysdeps/generic/pt-setspecific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-setspecific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setspecific.c eglibc-2.13/libpthread/sysdeps/generic/pt-setspecific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-setspecific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-setspecific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,27 @@
 +/* pthread_setspecific.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10705,9 +10700,9 @@
 +{
 +  return EINVAL;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/pt-startup.c src/libpthread/sysdeps/generic/pt-startup.c
---- src/libpthread.empty/sysdeps/generic/pt-startup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/pt-startup.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-startup.c eglibc-2.13/libpthread/sysdeps/generic/pt-startup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/pt-startup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/pt-startup.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,25 @@
 +/* Thread initialization.  Generic version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -10734,9 +10729,9 @@
 +__pthread_startup (void)
 +{
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/raise.c src/libpthread/sysdeps/generic/raise.c
---- src/libpthread.empty/sysdeps/generic/raise.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/raise.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/raise.c eglibc-2.13/libpthread/sysdeps/generic/raise.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/raise.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/raise.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,41 @@
 +/* raise.c - Generic raise implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -10779,9 +10774,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-close.c src/libpthread/sysdeps/generic/sem-close.c
---- src/libpthread.empty/sysdeps/generic/sem-close.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-close.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-close.c eglibc-2.13/libpthread/sysdeps/generic/sem-close.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-close.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-close.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Close a named semaphore.  Generic version.
 +   Copyright (C) 2005 Free Software Foundation, Inc.
@@ -10815,9 +10810,9 @@
 +}
 +
 +strong_alias (__sem_close, sem_close);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-destroy.c src/libpthread/sysdeps/generic/sem-destroy.c
---- src/libpthread.empty/sysdeps/generic/sem-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-destroy.c eglibc-2.13/libpthread/sysdeps/generic/sem-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,38 @@
 +/* Destroy a semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -10857,9 +10852,9 @@
 +}
 +
 +strong_alias (__sem_destroy, sem_destroy);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-getvalue.c src/libpthread/sysdeps/generic/sem-getvalue.c
---- src/libpthread.empty/sysdeps/generic/sem-getvalue.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-getvalue.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-getvalue.c eglibc-2.13/libpthread/sysdeps/generic/sem-getvalue.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-getvalue.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-getvalue.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,33 @@
 +/* Get the value of a semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -10894,9 +10889,9 @@
 +}
 +
 +strong_alias (__sem_getvalue, sem_getvalue);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-init.c src/libpthread/sysdeps/generic/sem-init.c
---- src/libpthread.empty/sysdeps/generic/sem-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-init.c eglibc-2.13/libpthread/sysdeps/generic/sem-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,46 @@
 +/* Initialize a semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -10944,9 +10939,9 @@
 +}
 +
 +strong_alias (__sem_init, sem_init);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-open.c src/libpthread/sysdeps/generic/sem-open.c
---- src/libpthread.empty/sysdeps/generic/sem-open.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-open.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-open.c eglibc-2.13/libpthread/sysdeps/generic/sem-open.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-open.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-open.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Open a named semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -10980,9 +10975,9 @@
 +}
 +
 +strong_alias (__sem_open, sem_open);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-post.c src/libpthread/sysdeps/generic/sem-post.c
---- src/libpthread.empty/sysdeps/generic/sem-post.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-post.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-post.c eglibc-2.13/libpthread/sysdeps/generic/sem-post.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-post.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-post.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,62 @@
 +/* Post a semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -11046,9 +11041,9 @@
 +}
 +
 +strong_alias (__sem_post, sem_post);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-timedwait.c src/libpthread/sysdeps/generic/sem-timedwait.c
---- src/libpthread.empty/sysdeps/generic/sem-timedwait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-timedwait.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-timedwait.c eglibc-2.13/libpthread/sysdeps/generic/sem-timedwait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-timedwait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-timedwait.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,91 @@
 +/* Wait on a semaphore with a timeout.  Generic version.
 +   Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
@@ -11141,9 +11136,9 @@
 +}
 +
 +strong_alias (__sem_timedwait, sem_timedwait);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-trywait.c src/libpthread/sysdeps/generic/sem-trywait.c
---- src/libpthread.empty/sysdeps/generic/sem-trywait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-trywait.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-trywait.c eglibc-2.13/libpthread/sysdeps/generic/sem-trywait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-trywait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-trywait.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,42 @@
 +/* Lock a semaphore if it does not require blocking.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -11187,9 +11182,9 @@
 +}
 +
 +strong_alias (__sem_trywait, sem_trywait);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-unlink.c src/libpthread/sysdeps/generic/sem-unlink.c
---- src/libpthread.empty/sysdeps/generic/sem-unlink.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-unlink.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-unlink.c eglibc-2.13/libpthread/sysdeps/generic/sem-unlink.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-unlink.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-unlink.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Unlink a named semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -11223,9 +11218,9 @@
 +}
 +
 +strong_alias (__sem_unlink, sem_unlink);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sem-wait.c src/libpthread/sysdeps/generic/sem-wait.c
---- src/libpthread.empty/sysdeps/generic/sem-wait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sem-wait.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-wait.c eglibc-2.13/libpthread/sysdeps/generic/sem-wait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sem-wait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sem-wait.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Wait on a semaphore.  Generic version.
 +   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
@@ -11259,9 +11254,9 @@
 +}
 +
 +strong_alias (__sem_wait, sem_wait);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sigaddset.c src/libpthread/sysdeps/generic/sigaddset.c
---- src/libpthread.empty/sysdeps/generic/sigaddset.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sigaddset.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigaddset.c eglibc-2.13/libpthread/sysdeps/generic/sigaddset.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigaddset.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sigaddset.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,35 @@
 +/* sigaddset.c - Generic sigaddset implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11298,9 +11293,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sigdelset.c src/libpthread/sysdeps/generic/sigdelset.c
---- src/libpthread.empty/sysdeps/generic/sigdelset.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sigdelset.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigdelset.c eglibc-2.13/libpthread/sysdeps/generic/sigdelset.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigdelset.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sigdelset.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,35 @@
 +/* sigdelset.c - Generic sigdelset implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11337,9 +11332,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sigemptyset.c src/libpthread/sysdeps/generic/sigemptyset.c
---- src/libpthread.empty/sysdeps/generic/sigemptyset.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sigemptyset.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigemptyset.c eglibc-2.13/libpthread/sysdeps/generic/sigemptyset.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigemptyset.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sigemptyset.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* sigemptyset.c - Generic sigemptyset implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11370,9 +11365,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sigfillset.c src/libpthread/sysdeps/generic/sigfillset.c
---- src/libpthread.empty/sysdeps/generic/sigfillset.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sigfillset.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigfillset.c eglibc-2.13/libpthread/sysdeps/generic/sigfillset.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigfillset.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sigfillset.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* sigfillset.c - Generic sigfillset implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11403,9 +11398,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/siginterrupt.c src/libpthread/sysdeps/generic/siginterrupt.c
---- src/libpthread.empty/sysdeps/generic/siginterrupt.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/siginterrupt.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/siginterrupt.c eglibc-2.13/libpthread/sysdeps/generic/siginterrupt.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/siginterrupt.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/siginterrupt.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,36 @@
 +/* siginterrupt.c - Generic siginterrupt implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11443,9 +11438,9 @@
 +  ret = sigaction(sig, &act, NULL);
 +  return ret;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sigismember.c src/libpthread/sysdeps/generic/sigismember.c
---- src/libpthread.empty/sysdeps/generic/sigismember.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sigismember.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigismember.c eglibc-2.13/libpthread/sysdeps/generic/sigismember.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigismember.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sigismember.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,36 @@
 +/* sigismember.c - Generic sigismember implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11483,9 +11478,9 @@
 +  else
 +    return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/signal.c src/libpthread/sysdeps/generic/signal.c
---- src/libpthread.empty/sysdeps/generic/signal.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/signal.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/signal.c eglibc-2.13/libpthread/sysdeps/generic/signal.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/signal.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/signal.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,44 @@
 +/* signal.c - Generic signal implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11531,9 +11526,9 @@
 +{
 +  return signal (sig, func);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/generic/sigwait.c src/libpthread/sysdeps/generic/sigwait.c
---- src/libpthread.empty/sysdeps/generic/sigwait.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/generic/sigwait.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigwait.c eglibc-2.13/libpthread/sysdeps/generic/sigwait.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/generic/sigwait.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/generic/sigwait.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,34 @@
 +/* sigwait.c - Generic sigwait implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -11569,9 +11564,9 @@
 +  return 0;
 +}
 +
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-destroy-specific.c src/libpthread/sysdeps/hurd/pt-destroy-specific.c
---- src/libpthread.empty/sysdeps/hurd/pt-destroy-specific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-destroy-specific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-destroy-specific.c eglibc-2.13/libpthread/sysdeps/hurd/pt-destroy-specific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-destroy-specific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-destroy-specific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,79 @@
 +/* __pthread_destory_specific.  Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11652,9 +11647,9 @@
 +  hurd_ihash_free (thread->thread_specifics);
 +  thread->thread_specifics = 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-getspecific.c src/libpthread/sysdeps/hurd/pt-getspecific.c
---- src/libpthread.empty/sysdeps/hurd/pt-getspecific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-getspecific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-getspecific.c eglibc-2.13/libpthread/sysdeps/hurd/pt-getspecific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-getspecific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-getspecific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* pthread_getspecific.  Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11695,9 +11690,9 @@
 +
 +  return hurd_ihash_find (self->thread_specifics, key);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-init-specific.c src/libpthread/sysdeps/hurd/pt-init-specific.c
---- src/libpthread.empty/sysdeps/hurd/pt-init-specific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-init-specific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-init-specific.c eglibc-2.13/libpthread/sysdeps/hurd/pt-init-specific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-init-specific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-init-specific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* __pthread_init_specific.  Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11729,9 +11724,9 @@
 +  thread->thread_specifics = 0;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-key-create.c src/libpthread/sysdeps/hurd/pt-key-create.c
---- src/libpthread.empty/sysdeps/hurd/pt-key-create.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-key-create.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-key-create.c eglibc-2.13/libpthread/sysdeps/hurd/pt-key-create.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-key-create.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-key-create.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,109 @@
 +/* pthread_key_create.  Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11842,9 +11837,9 @@
 +  __pthread_mutex_unlock (&__pthread_key_lock);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-key-delete.c src/libpthread/sysdeps/hurd/pt-key-delete.c
---- src/libpthread.empty/sysdeps/hurd/pt-key-delete.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-key-delete.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-key-delete.c eglibc-2.13/libpthread/sysdeps/hurd/pt-key-delete.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-key-delete.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-key-delete.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,64 @@
 +/* pthread_key_delete.  Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11910,9 +11905,9 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-key.h src/libpthread/sysdeps/hurd/pt-key.h
---- src/libpthread.empty/sysdeps/hurd/pt-key.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-key.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-key.h eglibc-2.13/libpthread/sysdeps/hurd/pt-key.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-key.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-key.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,76 @@
 +/* pthread_key internal declatations for the Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11990,9 +11985,9 @@
 +
 +  pthread_once (&o, do_init);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-kill.c src/libpthread/sysdeps/hurd/pt-kill.c
---- src/libpthread.empty/sysdeps/hurd/pt-kill.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-kill.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-kill.c eglibc-2.13/libpthread/sysdeps/hurd/pt-kill.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-kill.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-kill.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,52 @@
 +/* pthread_kill.  Hurd version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -12046,9 +12041,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/hurd/pt-setspecific.c src/libpthread/sysdeps/hurd/pt-setspecific.c
---- src/libpthread.empty/sysdeps/hurd/pt-setspecific.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/hurd/pt-setspecific.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-setspecific.c eglibc-2.13/libpthread/sysdeps/hurd/pt-setspecific.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/hurd/pt-setspecific.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/hurd/pt-setspecific.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,47 @@
 +/* pthread_setspecific.  Generic version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -12097,14 +12092,14 @@
 +      
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/i386/Implies src/libpthread/sysdeps/i386/Implies
---- src/libpthread.empty/sysdeps/i386/Implies	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/i386/Implies	2012-04-21 17:35:21.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/i386/Implies eglibc-2.13/libpthread/sysdeps/i386/Implies
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/i386/Implies	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/i386/Implies	2012-04-21 17:35:21.000000000 +0000
 @@ -0,0 +1 @@
 +ia32
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/ia32/bits/memory.h src/libpthread/sysdeps/ia32/bits/memory.h
---- src/libpthread.empty/sysdeps/ia32/bits/memory.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/ia32/bits/memory.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/memory.h eglibc-2.13/libpthread/sysdeps/ia32/bits/memory.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/memory.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/ia32/bits/memory.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,40 @@
 +/* Memory barrier operations.  i386 version.
 +   Copyright (C) 2002, 2008 Free Software Foundation, Inc.
@@ -12146,9 +12141,9 @@
 +#define __memory_write_barrier __memory_barrier
 +
 +#endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/ia32/bits/pt-atomic.h src/libpthread/sysdeps/ia32/bits/pt-atomic.h
---- src/libpthread.empty/sysdeps/ia32/bits/pt-atomic.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/ia32/bits/pt-atomic.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/pt-atomic.h eglibc-2.13/libpthread/sysdeps/ia32/bits/pt-atomic.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/pt-atomic.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/ia32/bits/pt-atomic.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,66 @@
 +/* Atomic operations.  i386 version.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -12216,9 +12211,9 @@
 +}
 +
 +#endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/ia32/bits/spin-lock-inline.h src/libpthread/sysdeps/ia32/bits/spin-lock-inline.h
---- src/libpthread.empty/sysdeps/ia32/bits/spin-lock-inline.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/ia32/bits/spin-lock-inline.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/spin-lock-inline.h eglibc-2.13/libpthread/sysdeps/ia32/bits/spin-lock-inline.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/spin-lock-inline.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/ia32/bits/spin-lock-inline.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,98 @@
 +/* Machine-specific definitions for spin locks.  i386 version.
 +   Copyright (C) 2000, 2005, 2008, 2009 Free Software Foundation, Inc.
@@ -12318,9 +12313,9 @@
 +__END_DECLS
 +
 +#endif /* bits/spin-lock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/ia32/bits/spin-lock.h src/libpthread/sysdeps/ia32/bits/spin-lock.h
---- src/libpthread.empty/sysdeps/ia32/bits/spin-lock.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/ia32/bits/spin-lock.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/spin-lock.h eglibc-2.13/libpthread/sysdeps/ia32/bits/spin-lock.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/bits/spin-lock.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/ia32/bits/spin-lock.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Machine-specific definitions for spin locks.  i386 version.
 +   Copyright (C) 2000, 2005, 2008, 2009 Free Software Foundation, Inc.
@@ -12361,9 +12356,9 @@
 +__END_DECLS
 +
 +#endif /* bits/spin-lock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/ia32/machine-sp.h src/libpthread/sysdeps/ia32/machine-sp.h
---- src/libpthread.empty/sysdeps/ia32/machine-sp.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/ia32/machine-sp.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/machine-sp.h eglibc-2.13/libpthread/sysdeps/ia32/machine-sp.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/machine-sp.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/ia32/machine-sp.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* Machine-specific function to return the stack pointer.  i386 version.
 +   Copyright (C) 1994, 1997, 2001, 2006 Free Software Foundation, Inc.
@@ -12395,9 +12390,9 @@
 +})
 +
 +#endif	/* machine-sp.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/ia32/pt-machdep.h src/libpthread/sysdeps/ia32/pt-machdep.h
---- src/libpthread.empty/sysdeps/ia32/pt-machdep.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/ia32/pt-machdep.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/pt-machdep.h eglibc-2.13/libpthread/sysdeps/ia32/pt-machdep.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/ia32/pt-machdep.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/ia32/pt-machdep.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* Machine dependent pthreads internal defenitions.  i386 version.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -12428,9 +12423,9 @@
 +};
 +
 +#endif /* pt-machdep.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/bits/pthread-np.h src/libpthread/sysdeps/l4/bits/pthread-np.h
---- src/libpthread.empty/sysdeps/l4/bits/pthread-np.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/bits/pthread-np.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/bits/pthread-np.h eglibc-2.13/libpthread/sysdeps/l4/bits/pthread-np.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/bits/pthread-np.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/bits/pthread-np.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,35 @@
 +/* Non-portable functions. L4 version.
 +   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
@@ -12467,9 +12462,9 @@
 +extern l4_thread_id_t pthread_pool_get_np (void);
 +
 +#endif /* bits/pthread-np.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/bits/pthread-np.h src/libpthread/sysdeps/l4/hurd/bits/pthread-np.h
---- src/libpthread.empty/sysdeps/l4/hurd/bits/pthread-np.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/bits/pthread-np.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/bits/pthread-np.h eglibc-2.13/libpthread/sysdeps/l4/hurd/bits/pthread-np.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/bits/pthread-np.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/bits/pthread-np.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* Non-portable functions. Viengoos version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -12502,9 +12497,9 @@
 +int pthread_setactivity_np (addr_t activity);
 +
 +#endif /* bits/pthread-np.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/ia32/pt-machdep.c src/libpthread/sysdeps/l4/hurd/ia32/pt-machdep.c
---- src/libpthread.empty/sysdeps/l4/hurd/ia32/pt-machdep.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/ia32/pt-machdep.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/ia32/pt-machdep.c eglibc-2.13/libpthread/sysdeps/l4/hurd/ia32/pt-machdep.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/ia32/pt-machdep.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/ia32/pt-machdep.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,20 @@
 +/* Machine dependent pthreads code.  Hurd/i386 version.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -12526,10 +12521,10 @@
 +   Boston, MA 02111-1307, USA.  */
 +
 +/* Nothing to do.  */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/ia32/pt-setup.c src/libpthread/sysdeps/l4/hurd/ia32/pt-setup.c
---- src/libpthread.empty/sysdeps/l4/hurd/ia32/pt-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/ia32/pt-setup.c	2012-04-27 01:32:33.000000000 +0000
-@@ -0,0 +1,118 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/ia32/pt-setup.c eglibc-2.13/libpthread/sysdeps/l4/hurd/ia32/pt-setup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/ia32/pt-setup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/ia32/pt-setup.c	2012-04-21 14:00:44.000000000 +0000
+@@ -0,0 +1,117 @@
 +/* Setup thread stack.  Viengoos/i386 version.
 +   Copyright (C) 2000, 2002, 2008 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -12597,7 +12592,7 @@
 +static void *
 +stack_setup (struct __pthread *thread,
 +	     void *(*start_routine)(void *), void *arg,
-+	     void (*entry_point)(struct __pthread *, void *(*)(void *), void *))
++	     void (*entry_point)(void *(*)(void *), void *))
 +{
 +  uintptr_t *top;
 +
@@ -12612,7 +12607,6 @@
 +      /* Set up call frame.  */
 +      *--top = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
 +      *--top = (uintptr_t) start_routine;
-+      *--top = (uintptr_t) thread;
 +      *--top = 0;		/* Fake return address.  */
 +      *--top = (uintptr_t) entry_point;
 +    }
@@ -12622,7 +12616,7 @@
 +
 +int
 +__pthread_setup (struct __pthread *thread,
-+		 void (*entry_point)(struct __pthread *, void *(*)(void *), void *),
++		 void (*entry_point)(void *(*)(void *), void *),
 +		 void *(*start_routine)(void *), void *arg)
 +{
 +  thread->mcontext.pc = (void *) &_pthread_entry_point;
@@ -12648,9 +12642,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c src/libpthread/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c
---- src/libpthread.empty/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c eglibc-2.13/libpthread/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/ia32/signal-dispatch-lowlevel.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,213 @@
 +/* signal-dispatch-lowlevel.c - ia32 specific signal handling functions.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -12865,10 +12859,9 @@
 +			in, &out);
 +    }
 +}
-Binary files src/libpthread.empty/sysdeps/l4/hurd/powerpc/.pt-setup.c.swp and src/libpthread/sysdeps/l4/hurd/powerpc/.pt-setup.c.swp differ
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/powerpc/pt-machdep.c src/libpthread/sysdeps/l4/hurd/powerpc/pt-machdep.c
---- src/libpthread.empty/sysdeps/l4/hurd/powerpc/pt-machdep.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/powerpc/pt-machdep.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/powerpc/pt-machdep.c eglibc-2.13/libpthread/sysdeps/l4/hurd/powerpc/pt-machdep.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/powerpc/pt-machdep.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/powerpc/pt-machdep.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,20 @@
 +/* Machine dependent pthreads code.  Hurd/PowerPC version.
 +   Copyright (C) 2003 Free Software Foundation, Inc.
@@ -12890,10 +12883,10 @@
 +   Boston, MA 02111-1307, USA.  */
 +
 +/* Nothing to do.  */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/powerpc/pt-setup.c src/libpthread/sysdeps/l4/hurd/powerpc/pt-setup.c
---- src/libpthread.empty/sysdeps/l4/hurd/powerpc/pt-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/powerpc/pt-setup.c	2012-04-27 01:37:31.000000000 +0000
-@@ -0,0 +1,96 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/powerpc/pt-setup.c eglibc-2.13/libpthread/sysdeps/l4/hurd/powerpc/pt-setup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/powerpc/pt-setup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/powerpc/pt-setup.c	2012-04-21 14:00:44.000000000 +0000
+@@ -0,0 +1,93 @@
 +/* Setup thread stack.  Hurd/PowerPC version.
 +   Copyright (C) 2003 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -12924,7 +12917,6 @@
 +struct start_info
 +{
 +  void (*entry_point) (void *(*)(void *), void *);
-+  struct __pthread *self;
 +  void *(*start_routine) (void *);
 +  void *arg;
 +};
@@ -12938,7 +12930,6 @@
 +	lwz	0, 0(1)		;\
 +	lwz	3, 4(1)		;\
 +	lwz	4, 8(1)		;\
-+	lwz	5, 12(1)	;\
 +	mtctr	0		;\
 +	bctrl			;\
 +");
@@ -12949,7 +12940,7 @@
 +   opportunity to install THREAD in our utcb.  */
 +static void *
 +stack_setup (struct __pthread *thread,
-+	     void (*entry_point)(struct __pthread *, void *(*)(void *), void *),
++	     void (*entry_point)(void *(*)(void *), void *),
 +	     void *(*start_routine)(void *), void *arg)
 +{
 +  l4_word_t *top;
@@ -12966,7 +12957,6 @@
 +      struct start_info *info = ((struct start_info *) top) - 1;
 +
 +      info->entry_point = entry_point;
-+      info->self = thread;
 +      info->start_routine = start_routine;
 +      info->arg = arg;
 +      return (void *) info;
@@ -12976,7 +12966,7 @@
 +
 +int
 +__pthread_setup (struct __pthread *thread,
-+		 void (*entry_point)(struct __pthread *, void *(*)(void *), void *),
++		 void (*entry_point)(void *(*)(void *), void *),
 +		 void *(*start_routine)(void *), void *arg)
 +{
 +  thread->mcontext.pc = first_entry_1;
@@ -12990,9 +12980,9 @@
 +				   (l4_word_t) thread);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-block.c src/libpthread/sysdeps/l4/hurd/pt-block.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-block.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-block.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-block.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-block.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-block.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-block.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* Block a thread.  Viengoos version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -13024,16 +13014,16 @@
 +{
 +  futex_wait (&thread->threadid, thread->threadid);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-kill.c src/libpthread/sysdeps/l4/hurd/pt-kill.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-kill.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-kill.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-kill.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-kill.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-kill.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-kill.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,3 @@
 +/* The generic version is good enough for us, however, the generic
 +   Hurd on Mach version supplies a specialized version */
 +#include "../generic/pt-kill.c"
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-setactivity-np.c src/libpthread/sysdeps/l4/hurd/pt-setactivity-np.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-setactivity-np.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-setactivity-np.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-setactivity-np.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-setactivity-np.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-setactivity-np.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-setactivity-np.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Set a thread's activity activity.  Viengoos version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -13074,9 +13064,9 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-sigstate-destroy.c src/libpthread/sysdeps/l4/hurd/pt-sigstate-destroy.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-sigstate-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-sigstate-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sigstate-destroy.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sigstate-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sigstate-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sigstate-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* Destroy the signal state.  Hurd on L4 version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -13106,9 +13096,9 @@
 +{
 +  /* Nothing to do.  */
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-sigstate-init.c src/libpthread/sysdeps/l4/hurd/pt-sigstate-init.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-sigstate-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-sigstate-init.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sigstate-init.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sigstate-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sigstate-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sigstate-init.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,44 @@
 +/* Initialize the signal state.  Hurd on L4 version.
 +   Copyright (C) 2003, 2008 Free Software Foundation, Inc.
@@ -13154,9 +13144,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-sigstate.c src/libpthread/sysdeps/l4/hurd/pt-sigstate.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-sigstate.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-sigstate.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sigstate.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sigstate.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sigstate.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sigstate.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,81 @@
 +/* Set a thread's signal state.  Hurd on L4 version.
 +   Copyright (C) 2002, 2005, 2008 Free Software Foundation, Inc.
@@ -13239,9 +13229,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-startup.c src/libpthread/sysdeps/l4/hurd/pt-startup.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-startup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-startup.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-startup.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-startup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-startup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-startup.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,30 @@
 +/* Thread initialization.  Hurd/L4 version.
 +   Copyright (C) 2007 Free Software Foundation, Inc.
@@ -13273,9 +13263,9 @@
 +  struct __pthread *pthread = _pthread_self ();
 +  pthread->threadid = l4_myself ();
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-sysdep.c src/libpthread/sysdeps/l4/hurd/pt-sysdep.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-sysdep.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-sysdep.c	2012-04-23 17:58:00.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sysdep.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sysdep.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sysdep.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sysdep.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,61 @@
 +/* System dependent pthreads code.  Hurd version.
 +   Copyright (C) 2000, 2008 Free Software Foundation, Inc.
@@ -13338,9 +13328,9 @@
 +  l4_start_sp_ip (l4_myself (), thread->mcontext.sp,
 +		  thread->mcontext.pc);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-sysdep.h src/libpthread/sysdeps/l4/hurd/pt-sysdep.h
---- src/libpthread.empty/sysdeps/l4/hurd/pt-sysdep.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-sysdep.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sysdep.h eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sysdep.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-sysdep.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-sysdep.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,61 @@
 +/* Internal definitions for pthreads library.
 +   Copyright (C) 2000, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
@@ -13403,9 +13393,9 @@
 +}
 +
 +#endif /* pt-sysdep.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-thread-alloc.c src/libpthread/sysdeps/l4/hurd/pt-thread-alloc.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-thread-alloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-thread-alloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-thread-alloc.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-thread-alloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-thread-alloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-thread-alloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,95 @@
 +/* Allocate kernel thread.  Viengoos version.
 +   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
@@ -13502,9 +13492,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-thread-halt.c src/libpthread/sysdeps/l4/hurd/pt-thread-halt.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-thread-halt.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-thread-halt.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-thread-halt.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-thread-halt.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-thread-halt.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-thread-halt.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,104 @@
 +/* Deallocate the kernel thread resources.  Viengoos version.
 +   Copyright (C) 2007, 2008 Software Foundation, Inc.
@@ -13610,9 +13600,9 @@
 +  else
 +    thread_stop (object);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-thread-start.c src/libpthread/sysdeps/l4/hurd/pt-thread-start.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-thread-start.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-thread-start.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-thread-start.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-thread-start.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-thread-start.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-thread-start.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,70 @@
 +/* Start thread.  L4 version.
 +   Copyright (C) 2007 Free Software Foundation, Inc.
@@ -13684,9 +13674,9 @@
 +    }
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/pt-wakeup.c src/libpthread/sysdeps/l4/hurd/pt-wakeup.c
---- src/libpthread.empty/sysdeps/l4/hurd/pt-wakeup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/pt-wakeup.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-wakeup.c eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-wakeup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/pt-wakeup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/pt-wakeup.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,46 @@
 +/* Wakeup a thread.  Viengoos version.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -13734,9 +13724,9 @@
 +    }
 +  while (ret == 0);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/sig-sysdep.h src/libpthread/sysdeps/l4/hurd/sig-sysdep.h
---- src/libpthread.empty/sysdeps/l4/hurd/sig-sysdep.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/sig-sysdep.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/sig-sysdep.h eglibc-2.13/libpthread/sysdeps/l4/hurd/sig-sysdep.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/sig-sysdep.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/sig-sysdep.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,69 @@
 +/* sig-sysdep.h - Hurd system specific header file.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -13807,9 +13797,9 @@
 +
 +#define SIGNAL_DISPATCH_EXIT \
 +  utcb_state_restore (&buffer);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/hurd/sigprocmask.c src/libpthread/sysdeps/l4/hurd/sigprocmask.c
---- src/libpthread.empty/sysdeps/l4/hurd/sigprocmask.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/hurd/sigprocmask.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/sigprocmask.c eglibc-2.13/libpthread/sysdeps/l4/hurd/sigprocmask.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/hurd/sigprocmask.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/hurd/sigprocmask.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,41 @@
 +/* sigprocmask.c - Generic sigprocmask implementation.
 +   Copyright (C) 2008 Free Software Foundation, Inc.
@@ -13852,9 +13842,9 @@
 +
 +  return pthread_sigmask (how, set, old);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-block.c src/libpthread/sysdeps/l4/pt-block.c
---- src/libpthread.empty/sysdeps/l4/pt-block.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-block.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-block.c eglibc-2.13/libpthread/sysdeps/l4/pt-block.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-block.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-block.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,47 @@
 +/* Block a thread.  L4 version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -13903,9 +13893,9 @@
 +    debug (5, "%x.%x unblocked",
 +	   l4_thread_no (thread->threadid), l4_version (thread->threadid));
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-docancel.c src/libpthread/sysdeps/l4/pt-docancel.c
---- src/libpthread.empty/sysdeps/l4/pt-docancel.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-docancel.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-docancel.c eglibc-2.13/libpthread/sysdeps/l4/pt-docancel.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-docancel.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-docancel.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,42 @@
 +/* Cancel a thread.
 +   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
@@ -13949,9 +13939,9 @@
 +		    (l4_word_t) call_exit);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-pool-np.c src/libpthread/sysdeps/l4/pt-pool-np.c
---- src/libpthread.empty/sysdeps/l4/pt-pool-np.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-pool-np.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-pool-np.c eglibc-2.13/libpthread/sysdeps/l4/pt-pool-np.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-pool-np.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-pool-np.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,54 @@
 +/* Thread pool for L4 threads.
 +   Copyright (C) 2004, 2007 Free Software Foundation, Inc.
@@ -14007,9 +13997,9 @@
 +  __pthread_mutex_unlock (&pool_lock);
 +  return tid;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-spin.c src/libpthread/sysdeps/l4/pt-spin.c
---- src/libpthread.empty/sysdeps/l4/pt-spin.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-spin.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-spin.c eglibc-2.13/libpthread/sysdeps/l4/pt-spin.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-spin.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-spin.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,63 @@
 +/* Spin locks.  L4 version.
 +   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
@@ -14074,9 +14064,9 @@
 +}
 +
 +weak_alias (_pthread_spin_lock, pthread_spin_lock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-stack-alloc.c src/libpthread/sysdeps/l4/pt-stack-alloc.c
---- src/libpthread.empty/sysdeps/l4/pt-stack-alloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-stack-alloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-stack-alloc.c eglibc-2.13/libpthread/sysdeps/l4/pt-stack-alloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-stack-alloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-stack-alloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,43 @@
 +/* Allocate a new stack.  L4 Hurd version.
 +   Copyright (C) 2000, 2007 Free Software Foundation, Inc.
@@ -14121,9 +14111,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-thread-alloc.c src/libpthread/sysdeps/l4/pt-thread-alloc.c
---- src/libpthread.empty/sysdeps/l4/pt-thread-alloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-thread-alloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-alloc.c eglibc-2.13/libpthread/sysdeps/l4/pt-thread-alloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-alloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-thread-alloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,43 @@
 +/* Allocate kernel thread.  L4 version.
 +   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -14168,9 +14158,9 @@
 +    }
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-thread-dealloc.c src/libpthread/sysdeps/l4/pt-thread-dealloc.c
---- src/libpthread.empty/sysdeps/l4/pt-thread-dealloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-thread-dealloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-dealloc.c eglibc-2.13/libpthread/sysdeps/l4/pt-thread-dealloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-dealloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-thread-dealloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,32 @@
 +/* Deallocate the kernel thread resources.  L4 version.
 +   Copyright (C) 2005 Free Software Foundation, Inc.
@@ -14204,9 +14194,9 @@
 +__pthread_thread_dealloc (struct __pthread *thread)
 +{
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-thread-halt.c src/libpthread/sysdeps/l4/pt-thread-halt.c
---- src/libpthread.empty/sysdeps/l4/pt-thread-halt.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-thread-halt.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-halt.c eglibc-2.13/libpthread/sysdeps/l4/pt-thread-halt.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-halt.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-thread-halt.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,45 @@
 +/* Deallocate the kernel thread resources.  L4version.
 +   Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
@@ -14253,9 +14243,9 @@
 +  if (tid == l4_myself ())
 +    l4_stop (tid);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-thread-start.c src/libpthread/sysdeps/l4/pt-thread-start.c
---- src/libpthread.empty/sysdeps/l4/pt-thread-start.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-thread-start.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-start.c eglibc-2.13/libpthread/sysdeps/l4/pt-thread-start.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-thread-start.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-thread-start.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,40 @@
 +/* Start thread.  L4 version.
 +   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
@@ -14297,9 +14287,9 @@
 +		    (l4_word_t) thread->mcontext.pc);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-timedblock.c src/libpthread/sysdeps/l4/pt-timedblock.c
---- src/libpthread.empty/sysdeps/l4/pt-timedblock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-timedblock.c	2012-04-22 23:38:54.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-timedblock.c eglibc-2.13/libpthread/sysdeps/l4/pt-timedblock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-timedblock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-timedblock.c	2012-04-22 23:38:54.000000000 +0000
 @@ -0,0 +1,36 @@
 +/* Block a thread with a timeout.  L4 version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -14337,9 +14327,9 @@
 +  __pthread_block (thread);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/l4/pt-wakeup.c src/libpthread/sysdeps/l4/pt-wakeup.c
---- src/libpthread.empty/sysdeps/l4/pt-wakeup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/l4/pt-wakeup.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-wakeup.c eglibc-2.13/libpthread/sysdeps/l4/pt-wakeup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/l4/pt-wakeup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/l4/pt-wakeup.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,54 @@
 +/* Wakeup a thread.  L4 version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -14395,9 +14385,9 @@
 +	   l4_thread_no (l4_myself ()), l4_version (l4_myself ()),
 +	   l4_thread_no (thread->threadid), l4_version (thread->threadid));
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/bits/spin-lock-inline.h src/libpthread/sysdeps/mach/bits/spin-lock-inline.h
---- src/libpthread.empty/sysdeps/mach/bits/spin-lock-inline.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/bits/spin-lock-inline.h	2012-04-21 22:46:40.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/bits/spin-lock-inline.h eglibc-2.13/libpthread/sysdeps/mach/bits/spin-lock-inline.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/bits/spin-lock-inline.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/bits/spin-lock-inline.h	2012-04-21 22:46:40.000000000 +0000
 @@ -0,0 +1,90 @@
 +/* Definitions of user-visible names for spin locks.
 +   Copyright (C) 1994, 1997, 2002, 2008, 2009 Free Software Foundation, Inc.
@@ -14489,9 +14479,9 @@
 +__END_DECLS
 +
 +#endif /* bits/spin-lock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/bits/spin-lock.h src/libpthread/sysdeps/mach/bits/spin-lock.h
---- src/libpthread.empty/sysdeps/mach/bits/spin-lock.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/bits/spin-lock.h	2012-04-21 22:46:40.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/bits/spin-lock.h eglibc-2.13/libpthread/sysdeps/mach/bits/spin-lock.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/bits/spin-lock.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/bits/spin-lock.h	2012-04-21 22:46:40.000000000 +0000
 @@ -0,0 +1,38 @@
 +/* Definitions of user-visible names for spin locks.
 +   Copyright (C) 1994, 1997, 2002, 2008, 2009 Free Software Foundation, Inc.
@@ -14531,19 +14521,19 @@
 +__END_DECLS
 +
 +#endif /* bits/spin-lock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/Implies src/libpthread/sysdeps/mach/hurd/Implies
---- src/libpthread.empty/sysdeps/mach/hurd/Implies	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/Implies	2012-04-21 17:24:34.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/Implies eglibc-2.13/libpthread/sysdeps/mach/hurd/Implies
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/Implies	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/Implies	2012-04-21 17:24:34.000000000 +0000
 @@ -0,0 +1 @@
 +hurd
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/i386/Implies src/libpthread/sysdeps/mach/hurd/i386/Implies
---- src/libpthread.empty/sysdeps/mach/hurd/i386/Implies	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/i386/Implies	2012-04-21 17:35:33.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/i386/Implies eglibc-2.13/libpthread/sysdeps/mach/hurd/i386/Implies
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/i386/Implies	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/i386/Implies	2012-04-21 17:35:33.000000000 +0000
 @@ -0,0 +1 @@
 +ia32
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/ia32/pt-machdep.c src/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c
---- src/libpthread.empty/sysdeps/mach/hurd/ia32/pt-machdep.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c eglibc-2.13/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/ia32/pt-machdep.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,83 @@
 +/* Machine dependent pthreads code.  Hurd/i386 version.
 +   Copyright (C) 2000, 2002, 2007 Free Software Foundation, Inc.
@@ -14628,10 +14618,10 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/ia32/pt-setup.c src/libpthread/sysdeps/mach/hurd/ia32/pt-setup.c
---- src/libpthread.empty/sysdeps/mach/hurd/ia32/pt-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/ia32/pt-setup.c	2012-04-27 01:32:33.000000000 +0000
-@@ -0,0 +1,106 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/ia32/pt-setup.c eglibc-2.13/libpthread/sysdeps/mach/hurd/ia32/pt-setup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/ia32/pt-setup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/ia32/pt-setup.c	2012-04-21 14:00:44.000000000 +0000
+@@ -0,0 +1,108 @@
 +/* Setup thread stack.  Hurd/i386 version.
 +   Copyright (C) 2000, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -14691,14 +14681,16 @@
 +  /* Next, make room for the TSDs.  */
 +  top -= __hurd_threadvar_max;
 +
++  /* Save the self pointer.  */
++  top[_HURD_THREADVAR_THREAD] = (uintptr_t) thread;
++
 +  if (start_routine)
 +    {
 +      /* And then the call frame.  */
-+      top -= 3;
++      top -= 2;
 +      top = (uintptr_t *) ((uintptr_t) top & ~0xf);
-+      top[2] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
-+      top[1] = (uintptr_t) start_routine;
-+      top[0] = (uintptr_t) thread;
++      top[1] = (uintptr_t) arg;	/* Argument to START_ROUTINE.  */
++      top[0] = (uintptr_t) start_routine;
 +      *--top = 0;		/* Fake return address.  */
 +    }
 +
@@ -14714,7 +14706,7 @@
 +
 +int
 +__pthread_setup (struct __pthread *thread,
-+		 void (*entry_point)(struct __pthread *, void *(*)(void *), void *),
++		 void (*entry_point)(void *(*)(void *), void *),
 +		 void *(*start_routine)(void *), void *arg)
 +{
 +  error_t err;
@@ -14738,9 +14730,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-attr-setstackaddr.c src/libpthread/sysdeps/mach/hurd/pt-attr-setstackaddr.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-attr-setstackaddr.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-attr-setstackaddr.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-attr-setstackaddr.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-attr-setstackaddr.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-attr-setstackaddr.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-attr-setstackaddr.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,35 @@
 +/* pthread_attr_setstackaddr.  Hurd on Mach version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -14777,9 +14769,9 @@
 +  attr->stackaddr = stackaddr;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-attr-setstacksize.c src/libpthread/sysdeps/mach/hurd/pt-attr-setstacksize.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-attr-setstacksize.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-attr-setstacksize.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-attr-setstacksize.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-attr-setstacksize.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-attr-setstacksize.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-attr-setstacksize.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,35 @@
 +/* pthread_attr_setstacksize.  Hurd on Mach version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -14816,9 +14808,9 @@
 +  attr->stacksize = stacksize;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-docancel.c src/libpthread/sysdeps/mach/hurd/pt-docancel.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-docancel.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-docancel.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-docancel.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-docancel.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-docancel.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-docancel.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,64 @@
 +/* Cancel a thread.
 +   Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc.
@@ -14884,9 +14876,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-sigstate-destroy.c src/libpthread/sysdeps/mach/hurd/pt-sigstate-destroy.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-sigstate-destroy.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-sigstate-destroy.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sigstate-destroy.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sigstate-destroy.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sigstate-destroy.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sigstate-destroy.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,28 @@
 +/* Destroy the signal state.  Hurd on Mach version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -14916,9 +14908,9 @@
 +{
 +  /* Nothing to do.  */
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-sigstate-init.c src/libpthread/sysdeps/mach/hurd/pt-sigstate-init.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-sigstate-init.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-sigstate-init.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sigstate-init.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sigstate-init.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sigstate-init.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sigstate-init.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,37 @@
 +/* Initialize the signal state.  Hurd on Mach version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -14957,9 +14949,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-sigstate.c src/libpthread/sysdeps/mach/hurd/pt-sigstate.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-sigstate.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-sigstate.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sigstate.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sigstate.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sigstate.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sigstate.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,69 @@
 +/* Set a thread's signal state.  Hurd on Mach version.
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -15030,10 +15022,10 @@
 +
 +  return err;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-sysdep.c src/libpthread/sysdeps/mach/hurd/pt-sysdep.c
---- src/libpthread.empty/sysdeps/mach/hurd/pt-sysdep.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-sysdep.c	2012-04-27 01:32:33.000000000 +0000
-@@ -0,0 +1,73 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sysdep.c eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sysdep.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sysdep.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sysdep.c	2012-04-21 14:00:44.000000000 +0000
+@@ -0,0 +1,72 @@
 +/* System dependent pthreads code.  Hurd version.
 +   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -15064,8 +15056,6 @@
 +
 +#include <pt-internal.h>
 +
-+__thread struct __pthread *___pthread_self;
-+
 +/* Forward.  */
 +static void *init_routine (void);
 +
@@ -15089,7 +15079,8 @@
 +  err = __pthread_create_internal (&thread, 0, 0, 0);
 +  assert_perror (err);
 +
-+  ___pthread_self = thread;
++  ((void **) (__hurd_threadvar_stack_offset))[_HURD_THREADVAR_THREAD]
++    = thread;
 +
 +  /* Decrease the number of threads, to take into account that the
 +     signal thread (which will be created by the glibc startup code
@@ -15107,10 +15098,10 @@
 +
 +  return thread->mcontext.sp;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/hurd/pt-sysdep.h src/libpthread/sysdeps/mach/hurd/pt-sysdep.h
---- src/libpthread.empty/sysdeps/mach/hurd/pt-sysdep.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/hurd/pt-sysdep.h	2012-04-27 01:32:33.000000000 +0000
-@@ -0,0 +1,70 @@
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sysdep.h eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sysdep.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/hurd/pt-sysdep.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/hurd/pt-sysdep.h	2012-04-21 14:00:44.000000000 +0000
+@@ -0,0 +1,72 @@
 +/* Internal defenitions for pthreads library.
 +   Copyright (C) 2000, 2002, 2007, 2008 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -15148,13 +15139,15 @@
 +  mach_msg_header_t wakeupmsg; \
 +  int have_kernel_resources;
 +
-+extern __thread struct __pthread *___pthread_self;
++#define _HURD_THREADVAR_THREAD _HURD_THREADVAR_DYNAMIC_USER
++
 +#define _pthread_self()                                            \
 +	({                                                         \
 +	  struct __pthread *thread;                                \
 +	                                                           \
 +	  assert (__pthread_threads);                              \
-+	  thread = ___pthread_self;                                \
++	  thread = *(struct __pthread **)                          \
++	    __hurd_threadvar_location (_HURD_THREADVAR_THREAD);    \
 +	                                                           \
 +	  assert (thread);                                         \
 +	  assert (({ mach_port_t ktid = __mach_thread_self ();     \
@@ -15181,9 +15174,9 @@
 +
 +
 +#endif /* pt-sysdep.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-block.c src/libpthread/sysdeps/mach/pt-block.c
---- src/libpthread.empty/sysdeps/mach/pt-block.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-block.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-block.c eglibc-2.13/libpthread/sysdeps/mach/pt-block.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-block.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-block.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Block a thread.  Mach version.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -15224,9 +15217,9 @@
 +		    MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
 +  assert_perror (err);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-spin.c src/libpthread/sysdeps/mach/pt-spin.c
---- src/libpthread.empty/sysdeps/mach/pt-spin.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-spin.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-spin.c eglibc-2.13/libpthread/sysdeps/mach/pt-spin.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-spin.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-spin.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,36 @@
 +/* Spin locks.  Mach version.
 +   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
@@ -15264,9 +15257,9 @@
 +
 +weak_alias (_pthread_spin_lock, pthread_spin_lock);
 +weak_alias (_pthread_spin_lock, __pthread_spin_lock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-stack-alloc.c src/libpthread/sysdeps/mach/pt-stack-alloc.c
---- src/libpthread.empty/sysdeps/mach/pt-stack-alloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-stack-alloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-stack-alloc.c eglibc-2.13/libpthread/sysdeps/mach/pt-stack-alloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-stack-alloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-stack-alloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,74 @@
 +/* Allocate a new stack.  Mach version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -15342,9 +15335,9 @@
 +  (*stackaddr) = (void *) base;
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-thread-alloc.c src/libpthread/sysdeps/mach/pt-thread-alloc.c
---- src/libpthread.empty/sysdeps/mach/pt-thread-alloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-thread-alloc.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-alloc.c eglibc-2.13/libpthread/sysdeps/mach/pt-thread-alloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-alloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-thread-alloc.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,106 @@
 +/* Start thread.  Mach version.
 +   Copyright (C) 2000, 2002, 2005, 2008 Free Software Foundation, Inc.
@@ -15452,9 +15445,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-thread-dealloc.c src/libpthread/sysdeps/mach/pt-thread-dealloc.c
---- src/libpthread.empty/sysdeps/mach/pt-thread-dealloc.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-thread-dealloc.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-dealloc.c eglibc-2.13/libpthread/sysdeps/mach/pt-thread-dealloc.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-dealloc.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-thread-dealloc.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,41 @@
 +/* Deallocate the kernel thread resources.  Mach version.
 +   Copyright (C) 2005 Free Software Foundation, Inc.
@@ -15497,9 +15490,9 @@
 +  __mach_port_destroy (__mach_task_self (),
 +		       thread->wakeupmsg.msgh_remote_port);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-thread-halt.c src/libpthread/sysdeps/mach/pt-thread-halt.c
---- src/libpthread.empty/sysdeps/mach/pt-thread-halt.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-thread-halt.c	2012-04-27 01:32:29.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-halt.c eglibc-2.13/libpthread/sysdeps/mach/pt-thread-halt.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-halt.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-thread-halt.c	2012-04-22 23:55:09.000000000 +0000
 @@ -0,0 +1,37 @@
 +/* Deallocate the kernel thread resources.  Mach version.
 +   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
@@ -15538,9 +15531,9 @@
 +  error_t err = __thread_terminate (thread->kernel_thread);
 +  assert_perror (err);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-thread-start.c src/libpthread/sysdeps/mach/pt-thread-start.c
---- src/libpthread.empty/sysdeps/mach/pt-thread-start.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-thread-start.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-start.c eglibc-2.13/libpthread/sysdeps/mach/pt-thread-start.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-thread-start.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-thread-start.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,49 @@
 +/* Start thread.  Mach version.
 +   Copyright (C) 2000,02 Free Software Foundation, Inc.
@@ -15591,9 +15584,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-timedblock.c src/libpthread/sysdeps/mach/pt-timedblock.c
---- src/libpthread.empty/sysdeps/mach/pt-timedblock.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-timedblock.c	2012-04-22 23:38:55.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-timedblock.c eglibc-2.13/libpthread/sysdeps/mach/pt-timedblock.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-timedblock.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-timedblock.c	2012-04-22 23:38:55.000000000 +0000
 @@ -0,0 +1,68 @@
 +/* Block a thread with a timeout.  Mach version.
 +   Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc.
@@ -15663,9 +15656,9 @@
 +  assert_perror (err);
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/mach/pt-wakeup.c src/libpthread/sysdeps/mach/pt-wakeup.c
---- src/libpthread.empty/sysdeps/mach/pt-wakeup.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/mach/pt-wakeup.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-wakeup.c eglibc-2.13/libpthread/sysdeps/mach/pt-wakeup.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/mach/pt-wakeup.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/mach/pt-wakeup.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,38 @@
 +/* Wakeup a thread.  Mach version.
 +   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
@@ -15705,9 +15698,9 @@
 +		    MACH_MSG_TIMEOUT_NONE, MACH_PORT_NULL);
 +  assert_perror (err);
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/posix/pt-spin.c src/libpthread/sysdeps/posix/pt-spin.c
---- src/libpthread.empty/sysdeps/posix/pt-spin.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/posix/pt-spin.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/posix/pt-spin.c eglibc-2.13/libpthread/sysdeps/posix/pt-spin.c
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/posix/pt-spin.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/posix/pt-spin.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,54 @@
 +/* Spin locks.
 +   Copyright (C) 2000, 2004, 2005 Free Software Foundation, Inc.
@@ -15763,9 +15756,9 @@
 +
 +weak_alias (_pthread_spin_lock, pthread_spin_lock);
 +weak_alias (_pthread_spin_lock, __pthread_spin_lock);
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/powerpc/bits/machine-lock.h src/libpthread/sysdeps/powerpc/bits/machine-lock.h
---- src/libpthread.empty/sysdeps/powerpc/bits/machine-lock.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/powerpc/bits/machine-lock.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/bits/machine-lock.h eglibc-2.13/libpthread/sysdeps/powerpc/bits/machine-lock.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/bits/machine-lock.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/powerpc/bits/machine-lock.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,78 @@
 +/* Machine-specific definition for spin locks.  PowerPC version.
 +   Copyright (C) 1994,97,2002 Free Software Foundation, Inc.
@@ -15845,9 +15838,9 @@
 +
 +
 +#endif /* machine-lock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/powerpc/bits/memory.h src/libpthread/sysdeps/powerpc/bits/memory.h
---- src/libpthread.empty/sysdeps/powerpc/bits/memory.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/powerpc/bits/memory.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/bits/memory.h eglibc-2.13/libpthread/sysdeps/powerpc/bits/memory.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/bits/memory.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/powerpc/bits/memory.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,36 @@
 +/* Memory barrier operations.  PowerPC version.
 +   Copyright (C) 2003 Free Software Foundation, Inc.
@@ -15885,9 +15878,9 @@
 +#define __memory_write_barrier __memory_barrier
 +
 +#endif
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/powerpc/bits/spin-lock.h src/libpthread/sysdeps/powerpc/bits/spin-lock.h
---- src/libpthread.empty/sysdeps/powerpc/bits/spin-lock.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/powerpc/bits/spin-lock.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/bits/spin-lock.h eglibc-2.13/libpthread/sysdeps/powerpc/bits/spin-lock.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/bits/spin-lock.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/powerpc/bits/spin-lock.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,108 @@
 +/* Machine-specific definitions for spin locks.  PowerPC version.
 +   Copyright (C) 2003 Free Software Foundation, Inc.
@@ -15997,9 +15990,9 @@
 +__END_DECLS
 +
 +#endif /* bits/spin-lock.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/powerpc/machine-sp.h src/libpthread/sysdeps/powerpc/machine-sp.h
---- src/libpthread.empty/sysdeps/powerpc/machine-sp.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/powerpc/machine-sp.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/machine-sp.h eglibc-2.13/libpthread/sysdeps/powerpc/machine-sp.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/machine-sp.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/powerpc/machine-sp.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,31 @@
 +/* Machine-specific function to return the stack pointer.  i386 version.
 +   Copyright (C) 1994,97,2001 Free Software Foundation, Inc.
@@ -16032,9 +16025,9 @@
 +})
 +
 +#endif	/* machine-sp.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/sysdeps/powerpc/pt-machdep.h src/libpthread/sysdeps/powerpc/pt-machdep.h
---- src/libpthread.empty/sysdeps/powerpc/pt-machdep.h	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/sysdeps/powerpc/pt-machdep.h	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/pt-machdep.h eglibc-2.13/libpthread/sysdeps/powerpc/pt-machdep.h
+--- eglibc-2.13.nolibpthread/libpthread/sysdeps/powerpc/pt-machdep.h	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/sysdeps/powerpc/pt-machdep.h	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* Machine dependent pthreads internal defenitions.  i386 version.
 +   Copyright (C) 2000 Free Software Foundation, Inc.
@@ -16065,14 +16058,14 @@
 +};
 +
 +#endif /* pt-machdep.h */
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/.cvsignore src/libpthread/tests/.cvsignore
---- src/libpthread.empty/tests/.cvsignore	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/.cvsignore	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/.cvsignore eglibc-2.13/libpthread/tests/.cvsignore
+--- eglibc-2.13.nolibpthread/libpthread/tests/.cvsignore	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/.cvsignore	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1 @@
 +Makefile.in
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/Makefile src/libpthread/tests/Makefile
---- src/libpthread.empty/tests/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/Makefile	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/Makefile eglibc-2.13/libpthread/tests/Makefile
+--- eglibc-2.13.nolibpthread/libpthread/tests/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/Makefile	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +CFLAGS=-Wall -g
 +
@@ -16104,9 +16097,9 @@
 +	rm -f $(CHECK_OBJS) $(CHECK_PROGS) \
 +	  $(addsuffix .out,$(basename $(notdir $(CHECK_PROGS))))
 \ No newline at end of file
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-1.c src/libpthread/tests/test-1.c
---- src/libpthread.empty/tests/test-1.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-1.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-1.c eglibc-2.13/libpthread/tests/test-1.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-1.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-1.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,50 @@
 +#define _GNU_SOURCE
 +
@@ -16158,9 +16151,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-10.c src/libpthread/tests/test-10.c
---- src/libpthread.empty/tests/test-10.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-10.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-10.c eglibc-2.13/libpthread/tests/test-10.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-10.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-10.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,46 @@
 +/* Test error checking mutexes.  */
 +
@@ -16208,9 +16201,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-11.c src/libpthread/tests/test-11.c
---- src/libpthread.empty/tests/test-11.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-11.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-11.c eglibc-2.13/libpthread/tests/test-11.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-11.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-11.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,143 @@
 +/* Test rwlocks.  */
 +
@@ -16355,9 +16348,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-12.c src/libpthread/tests/test-12.c
---- src/libpthread.empty/tests/test-12.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-12.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-12.c eglibc-2.13/libpthread/tests/test-12.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-12.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-12.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,29 @@
 +/* Test concurrency level.  */
 +
@@ -16388,9 +16381,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-13.c src/libpthread/tests/test-13.c
---- src/libpthread.empty/tests/test-13.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-13.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-13.c eglibc-2.13/libpthread/tests/test-13.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-13.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-13.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,66 @@
 +/* Test condition attributes and pthread_cond_timedwait.  */
 +
@@ -16458,9 +16451,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-14.c src/libpthread/tests/test-14.c
---- src/libpthread.empty/tests/test-14.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-14.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-14.c eglibc-2.13/libpthread/tests/test-14.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-14.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-14.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,44 @@
 +/* Test pthread_mutex_timedlock.  */
 +
@@ -16506,9 +16499,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-15.c src/libpthread/tests/test-15.c
---- src/libpthread.empty/tests/test-15.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-15.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-15.c eglibc-2.13/libpthread/tests/test-15.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-15.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-15.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,87 @@
 +/* Test pthread_rwlock_timedrdlock and pthread_rwlock_timedwrlock.  */
 +
@@ -16597,9 +16590,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-16.c src/libpthread/tests/test-16.c
---- src/libpthread.empty/tests/test-16.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-16.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-16.c eglibc-2.13/libpthread/tests/test-16.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-16.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-16.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,71 @@
 +/* Test pthread_kill.c.  */
 +
@@ -16672,9 +16665,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-17.c src/libpthread/tests/test-17.c
---- src/libpthread.empty/tests/test-17.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-17.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-17.c eglibc-2.13/libpthread/tests/test-17.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-17.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-17.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,57 @@
 +/* Test that the key reuse inside libpthread does not cause thread
 +   specific values to persist. */
@@ -16733,9 +16726,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-2.c src/libpthread/tests/test-2.c
---- src/libpthread.empty/tests/test-2.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-2.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-2.c eglibc-2.13/libpthread/tests/test-2.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-2.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-2.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,39 @@
 +/* Test detachability.  */
 +#define _GNU_SOURCE
@@ -16776,9 +16769,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-3.c src/libpthread/tests/test-3.c
---- src/libpthread.empty/tests/test-3.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-3.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-3.c eglibc-2.13/libpthread/tests/test-3.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-3.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-3.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,55 @@
 +/* Test the thread attribute get and set methods.  */
 +
@@ -16835,9 +16828,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-4.c src/libpthread/tests/test-4.c
---- src/libpthread.empty/tests/test-4.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-4.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-4.c eglibc-2.13/libpthread/tests/test-4.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-4.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-4.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,86 @@
 +/* Test the stack guard.  */
 +
@@ -16925,9 +16918,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-5.c src/libpthread/tests/test-5.c
---- src/libpthread.empty/tests/test-5.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-5.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-5.c eglibc-2.13/libpthread/tests/test-5.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-5.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-5.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,75 @@
 +/* Test signals.  */
 +
@@ -17004,9 +16997,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-6.c src/libpthread/tests/test-6.c
---- src/libpthread.empty/tests/test-6.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-6.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-6.c eglibc-2.13/libpthread/tests/test-6.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-6.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-6.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,96 @@
 +#define _GNU_SOURCE
 +
@@ -17104,9 +17097,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-7.c src/libpthread/tests/test-7.c
---- src/libpthread.empty/tests/test-7.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-7.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-7.c eglibc-2.13/libpthread/tests/test-7.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-7.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-7.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,70 @@
 +#define _GNU_SOURCE
 +
@@ -17178,9 +17171,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-8.c src/libpthread/tests/test-8.c
---- src/libpthread.empty/tests/test-8.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-8.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-8.c eglibc-2.13/libpthread/tests/test-8.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-8.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-8.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,60 @@
 +#define _GNU_SOURCE
 +
@@ -17242,9 +17235,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-9.c src/libpthread/tests/test-9.c
---- src/libpthread.empty/tests/test-9.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-9.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-9.c eglibc-2.13/libpthread/tests/test-9.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-9.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-9.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,88 @@
 +/* Test recursive mutexes.  */
 +
@@ -17334,9 +17327,9 @@
 +
 +  return 0;
 +}
-diff '--exclude=libc_patches' '--exclude=.git' -urN src/libpthread.empty/tests/test-__pthread_destroy_specific-skip.c src/libpthread/tests/test-__pthread_destroy_specific-skip.c
---- src/libpthread.empty/tests/test-__pthread_destroy_specific-skip.c	1970-01-01 00:00:00.000000000 +0000
-+++ src/libpthread/tests/test-__pthread_destroy_specific-skip.c	2012-04-21 14:00:44.000000000 +0000
+diff -urN eglibc-2.13.nolibpthread/libpthread/tests/test-__pthread_destroy_specific-skip.c eglibc-2.13/libpthread/tests/test-__pthread_destroy_specific-skip.c
+--- eglibc-2.13.nolibpthread/libpthread/tests/test-__pthread_destroy_specific-skip.c	1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.13/libpthread/tests/test-__pthread_destroy_specific-skip.c	2012-04-21 14:00:44.000000000 +0000
 @@ -0,0 +1,83 @@
 +/* Check that __pthread_destroy_specific works correctly if it has to skip
 +   unused slots.  */




Reply to: