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

r5726 - in glibc-package/branches/eglibc-2.18/debian: . patches patches/amd64 patches/any patches/i386 patches/kfreebsd



Author: ps-guest
Date: 2013-10-13 15:12:51 +0000 (Sun, 13 Oct 2013)
New Revision: 5726

Removed:
   glibc-package/branches/eglibc-2.18/debian/patches/amd64/local-linuxthreads-gscope.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-XPG7.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-defines.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-deps.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fatalprepare.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fd.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-gscope.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-kill_other.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-ptw.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-semaphore_h.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-setclock.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-signals.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-stacksize.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-thread_self.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-tst-sighandler.diff
   glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-weak.diff
   glibc-package/branches/eglibc-2.18/debian/patches/i386/local-linuxthreads-gscope.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-TLS-THREAD.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-ctype_init.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-initfini.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-mutex-initializer.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-tlsdesc.diff
   glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads29.diff
Modified:
   glibc-package/branches/eglibc-2.18/debian/changelog
   glibc-package/branches/eglibc-2.18/debian/patches/series
   glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64
   glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386
Log:
drop obsolete patches/*/local-linuxthreads*



Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/changelog	2013-10-13 15:12:51 UTC (rev 5726)
@@ -66,6 +66,7 @@
   * update symbols file for kfreebsd
   * add kfreebsd/submitted-waitid.diff
   * add kfreebsd/submitted-auxv.diff. Closes: #717912.
+  * drop obsolete patches/*/local-linuxthreads*
 
  -- Adam Conrad <adconrad@ubuntu.com>  Sun, 25 Aug 2013 14:59:44 -0600
 

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/amd64/local-linuxthreads-gscope.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/amd64/local-linuxthreads-gscope.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/amd64/local-linuxthreads-gscope.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,62 +0,0 @@
----
- linuxthreads/sysdeps/x86_64/tls.h |   42 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
---- a/linuxthreads/sysdeps/x86_64/tls.h
-+++ b/linuxthreads/sysdeps/x86_64/tls.h
-@@ -49,6 +49,11 @@
-   uintptr_t sysinfo;
-   uintptr_t stack_guard;
-   uintptr_t pointer_guard;
-+# ifdef __FreeBSD_kernel__
-+  long gscope_flag;
-+# else
-+  int gscope_flag;
-+# endif
- } tcbhead_t;
- 
- #else /* __ASSEMBLER__ */
-@@ -147,6 +152,43 @@
-   ((descr)->p_header.data.pointer_guard				      \
-    = THREAD_GETMEM (THREAD_SELF, p_header.data.pointer_guard))
- 
-+/* Get and set the global scope generation counter in the TCB head.  */
-+#define THREAD_GSCOPE_FLAG_UNUSED 0
-+#define THREAD_GSCOPE_FLAG_USED   1
-+#define THREAD_GSCOPE_FLAG_WAIT   2
-+#ifdef __FreeBSD_kernel__
-+# define THREAD_GSCOPE_RESET_FLAG() \
-+  do										    \
-+    { int __res;								    \
-+      asm volatile ("xchgl %0, %%fs:%P1"					    \
-+		    : "=r" (__res)						    \
-+		    : "i" (offsetof (struct _pthread_descr_struct, p_gscope_flag)), \
-+		      "0" (THREAD_GSCOPE_FLAG_UNUSED));				    \
-+      if (__res == THREAD_GSCOPE_FLAG_WAIT)					    \
-+	lll_futex_wake (&THREAD_SELF->p_gscope_flag, 1);			    \
-+    }										    \
-+  while (0)
-+#else
-+/* As the FreeBSD kernel defines futex as long (compared to int with
-+   a Linux kernel), we need to use xchgq instead of xchgl to handle
-+   the gscope_flag variable. */
-+# define THREAD_GSCOPE_RESET_FLAG() \
-+  do										    \
-+    { long __res;								    \
-+      asm volatile ("xchgq %0, %%fs:%P1"					    \
-+		    : "=r" (__res)						    \
-+		    : "i" (offsetof (struct _pthread_descr_struct, p_gscope_flag)), \
-+		      "0" (THREAD_GSCOPE_FLAG_UNUSED));				    \
-+      if (__res == THREAD_GSCOPE_FLAG_WAIT)					    \
-+	lll_futex_wake (&THREAD_SELF->p_gscope_flag, 1);			    \
-+    }										    \
-+  while (0)
-+#endif		/* __FreeBSD_kernel__ */
-+#define THREAD_GSCOPE_SET_FLAG() \
-+  THREAD_SETMEM (THREAD_SELF, p_gscope_flag, THREAD_GSCOPE_FLAG_USED)
-+#define THREAD_GSCOPE_WAIT() \
-+  do { /* GL(dl_wait_lookup_done) () */ } while (0)
-+
- # endif	/* HAVE_TLS_SUPPORT */
- #endif /* __ASSEMBLER__ */
- 

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-XPG7.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-XPG7.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-XPG7.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,41 +0,0 @@
-2011-12-09  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* sysdeps/pthread/pthread.h: Cleanup.  Fix up for XPG7.
-
---- a/linuxthreads/sysdeps/pthread/pthread.h
-+++ b/linuxthreads/sysdeps/pthread/pthread.h
-@@ -86,7 +86,7 @@ enum
-   PTHREAD_MUTEX_RECURSIVE_NP,
-   PTHREAD_MUTEX_ERRORCHECK_NP,
-   PTHREAD_MUTEX_ADAPTIVE_NP
--#ifdef __USE_UNIX98
-+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
-   ,
-   PTHREAD_MUTEX_NORMAL = PTHREAD_MUTEX_TIMED_NP,
-   PTHREAD_MUTEX_RECURSIVE = PTHREAD_MUTEX_RECURSIVE_NP,
-@@ -241,7 +241,6 @@ extern int pthread_attr_setscope (pthrea
- extern int pthread_attr_getscope (__const pthread_attr_t *__restrict __attr,
- 				  int *__restrict __scope) __THROW;
- 
--#ifdef __USE_UNIX98
- /* Set the size of the guard area at the bottom of the thread.  */
- extern int pthread_attr_setguardsize (pthread_attr_t *__attr,
- 				      size_t __guardsize) __THROW;
-@@ -250,7 +249,6 @@ extern int pthread_attr_setguardsize (pt
- extern int pthread_attr_getguardsize (__const pthread_attr_t *__restrict
- 				      __attr, size_t *__restrict __guardsize)
-      __THROW;
--#endif
- 
- /* Set the starting address of the stack of the thread to be created.
-    Depending on whether the stack grows up or down the value must either
-@@ -371,7 +369,7 @@ extern int pthread_mutexattr_getpshared
- extern int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
- 					 int __pshared) __THROW;
- 
--#ifdef __USE_UNIX98
-+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8
- /* Set the mutex kind attribute in *ATTR to KIND (either PTHREAD_MUTEX_NORMAL,
-    PTHREAD_MUTEX_RECURSIVE, PTHREAD_MUTEX_ERRORCHECK, or
-    PTHREAD_MUTEX_DEFAULT).  */
-

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-defines.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-defines.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-defines.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,22 +0,0 @@
-
-  linuxthreads still uses these defines
-  apply only for glibc 2.6 and above
-
----
- config.make.in |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/config.make.in
-+++ b/config.make.in
-@@ -48,6 +48,11 @@
- c++-sysincludes = @CXX_SYSINCLUDES@
- all-warnings = @all_warnings@
- 
-+have-protected = yes
-+have-z-nodelete = yes
-+have-z-nodlopen = yes
-+have-z-initfirst = yes
-+have-z-relro = yes
- have-z-combreloc = @libc_cv_z_combreloc@
- have-z-execstack = @libc_cv_z_execstack@
- have-Bgroup = @libc_cv_Bgroup@

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-deps.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-deps.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-deps.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,20 +0,0 @@
-2011-03-01  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* Makefile (tst-_res1): Add tst-_res1mod1 to dependency list.
-
----
- linuxthreads/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/linuxthreads/Makefile
-+++ b/linuxthreads/Makefile
-@@ -314,7 +314,8 @@
- 
- ifeq (yes,$(build-shared))
- $(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so
--$(objpfx)tst-_res1: $(objpfx)tst-_res1mod2.so $(shared-thread-library)
-+$(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \
-+		    $(shared-thread-library)
- 
- $(objpfx)tst-tls1: $(objpfx)tst-tls1mod.so $(shared-thread-library)
- 

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fatalprepare.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fatalprepare.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fatalprepare.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,46 +0,0 @@
----
- linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h |   39 +++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
---- /dev/null
-+++ b/linuxthreads/sysdeps/unix/sysv/linux/fatal-prepare.h
-@@ -0,0 +1,39 @@
-+/* Copyright (C) 2003, 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <pthread.h>
-+
-+/* We have to completely disable cancellation.  assert() must not be a
-+   cancellation point but the implementation uses write() etc.  */
-+#ifdef SHARED
-+# include <pthread-functions.h>
-+# define FATAL_PREPARE \
-+  {									      \
-+    int (*fp) (int, int *);                                                   \
-+    fp = __libc_pthread_functions.ptr_pthread_setcancelstate;                 \
-+    if (fp != NULL)                                                           \
-+      fp (PTHREAD_CANCEL_DISABLE, NULL);                                      \
-+  }
-+#else
-+# pragma weak pthread_setcancelstate
-+# define FATAL_PREPARE \
-+  {									      \
-+    if (pthread_setcancelstate != NULL)					      \
-+      pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, NULL);		      \
-+  }
-+#endif

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fd.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fd.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-fd.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,36 +0,0 @@
----
- linuxthreads/pthread.c |   23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
---- a/linuxthreads/pthread.c
-+++ b/linuxthreads/pthread.c
-@@ -662,6 +662,29 @@
-     free(__pthread_manager_thread_bos);
-     return -1;
-   }
-+  /* Make sure the file descriptors of the pipe doesn't collide
-+     with stdin, stdout or stderr if they have been closed. */
-+  if (manager_pipe[0] < 3) {
-+    int new_fd;
-+    new_fd = fcntl(manager_pipe[0], F_DUPFD, 3);
-+    close(manager_pipe[0]);
-+    if (new_fd == -1) {
-+      free(__pthread_manager_thread_bos);
-+      return -1;
-+    }
-+    manager_pipe[0] = new_fd;
-+  }
-+  if (manager_pipe[1] < 3) {
-+    int new_fd;
-+    new_fd = fcntl(manager_pipe[1], F_DUPFD, 3);
-+    close(manager_pipe[1]);
-+    if (new_fd == -1) {
-+      close(manager_pipe[0]);
-+      free(__pthread_manager_thread_bos);
-+      return -1;
-+    }
-+    manager_pipe[1] = new_fd;
-+  }
- 
- #ifdef USE_TLS
-   /* Allocate memory for the thread descriptor and the dtv.  */

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-gscope.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-gscope.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-gscope.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,38 +0,0 @@
----
- linuxthreads/descr.h |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/linuxthreads/descr.h
-+++ b/linuxthreads/descr.h
-@@ -23,6 +23,7 @@
- #include <stdint.h>
- #include <sys/types.h>
- #include <hp-timing.h>
-+#include <lowlevellock.h>
- #include <tls.h>
- 
- /* Fast thread-specific data internal to libc.  */
-@@ -123,12 +124,23 @@
-       uintptr_t sysinfo;
-       uintptr_t stack_guard;
-       uintptr_t pointer_guard;
-+# ifdef __FreeBSD_kernel__
-+      long gscope_flag;
-+# else
-+      int gscope_flag;
-+# endif
-     } data;
-     void *__padding[16];
-   } p_header;
- # define p_multiple_threads p_header.data.multiple_threads
-+# define p_gscope_flag p_header.data.gscope_flag
- #elif TLS_MULTIPLE_THREADS_IN_TCB
-   int p_multiple_threads;
-+# ifdef __FreeBSD_kernel__
-+  long p_gscope_flag;
-+# else
-+  int p_gscope_flag;
-+# endif
- #endif
- 
-   pthread_descr p_nextlive, p_prevlive;

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-kill_other.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-kill_other.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-kill_other.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,35 +0,0 @@
-
-
-  fixes ruby 1.9 testsuite failure t916 from #542927
-
-
----
- linuxthreads/pthread.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/linuxthreads/pthread.c
-+++ b/linuxthreads/pthread.c
-@@ -1222,6 +1222,15 @@
-   /* Reset the signal handlers behaviour for the signals the
-      implementation uses since this would be passed to the new
-      process.  */
-+#if 1
-+  /*
-+  do not do it as it is wrong.
-+  the __pthread_kill_other_threads_np() is used just before exec,
-+  the successfull one resets signals with handler into DFL behaviour anyway (in kernel),
-+  the failed one needs the signal handler as before to allow creating of new threads
-+  as already noted above
-+  */
-+#else
-   sigemptyset(&sa.sa_mask);
-   sa.sa_flags = 0;
-   sa.sa_handler = SIG_DFL;
-@@ -1229,6 +1238,7 @@
-   __libc_sigaction(__pthread_sig_cancel, &sa, NULL);
-   if (__pthread_sig_debug > 0)
-     __libc_sigaction(__pthread_sig_debug, &sa, NULL);
-+#endif
- }
- weak_alias (__pthread_kill_other_threads_np, pthread_kill_other_threads_np)
- 

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-ptw.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-ptw.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-ptw.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,15 +0,0 @@
----
- linuxthreads/Makeconfig |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/linuxthreads/Makeconfig
-+++ b/linuxthreads/Makeconfig
-@@ -9,3 +9,8 @@
- bounded-thread-library = $(common-objpfx)linuxthreads/libpthread_b.a
- 
- rpath-dirs += linuxthreads
-+
-+# This makes for ptw-*.? object rules in sysd-rules.
-+ptw-CPPFLAGS := -DPTW
-+sysd-rules-patterns += ptw-%:%
-+

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-semaphore_h.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-semaphore_h.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-semaphore_h.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,186 +0,0 @@
----
- linuxthreads/semaphore.h                 |   87 ------------------------------
- linuxthreads/sysdeps/pthread/semaphore.h |   88 ++++++++++++++++++++++++++++++-
- 2 files changed, 87 insertions(+), 88 deletions(-)
-
---- a/linuxthreads/semaphore.h
-+++ /dev/null
-@@ -1,87 +0,0 @@
--/* Linuxthreads - a simple clone()-based implementation of Posix        */
--/* threads for Linux.                                                   */
--/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
--/*                                                                      */
--/* This program is free software; you can redistribute it and/or        */
--/* modify it under the terms of the GNU Library General Public License  */
--/* as published by the Free Software Foundation; either version 2       */
--/* of the License, or (at your option) any later version.               */
--/*                                                                      */
--/* This program is distributed in the hope that it will be useful,      */
--/* but WITHOUT ANY WARRANTY; without even the implied warranty of       */
--/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        */
--/* GNU Library General Public License for more details.                 */
--
--#ifndef _SEMAPHORE_H
--#define _SEMAPHORE_H    1
--
--#include <features.h>
--#include <sys/types.h>
--#ifdef __USE_XOPEN2K
--# define __need_timespec
--# include <time.h>
--#endif
--
--#ifndef _PTHREAD_DESCR_DEFINED
--/* Thread descriptors.  Needed for `sem_t' definition.  */
--typedef struct _pthread_descr_struct *_pthread_descr;
--# define _PTHREAD_DESCR_DEFINED
--#endif
--
--/* System specific semaphore definition.  */
--typedef struct
--{
--  struct _pthread_fastlock __sem_lock;
--  int __sem_value;
--  _pthread_descr __sem_waiting;
--} sem_t;
--
--
--
--/* Value returned if `sem_open' failed.  */
--#define SEM_FAILED	((sem_t *) 0)
--
--/* Maximum value the semaphore can have.  */
--#define SEM_VALUE_MAX 	(2147483647)
--
--
--__BEGIN_DECLS
--
--/* Initialize semaphore object SEM to VALUE.  If PSHARED then share it
--   with other processes.  */
--extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW;
--
--/* Free resources associated with semaphore object SEM.  */
--extern int sem_destroy (sem_t *__sem) __THROW;
--
--/* Open a named semaphore NAME with open flaot OFLAG.  */
--extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW;
--
--/* Close descriptor for named semaphore SEM.  */
--extern int sem_close (sem_t *__sem) __THROW;
--
--/* Remove named semaphore NAME.  */
--extern int sem_unlink (__const char *__name) __THROW;
--
--/* Wait for SEM being posted.  */
--extern int sem_wait (sem_t *__sem);
--
--#ifdef __USE_XOPEN2K
--/* Similar to `sem_wait' but wait only until ABSTIME.  */
--extern int sem_timedwait (sem_t *__restrict __sem,
--			  __const struct timespec *__restrict __abstime);
--#endif
--
--/* Test whether SEM is posted.  */
--extern int sem_trywait (sem_t *__sem) __THROW;
--
--/* Post SEM.  */
--extern int sem_post (sem_t *__sem) __THROW;
--
--/* Get current value of SEM and store it in *SVAL.  */
--extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
--     __THROW;
--
--__END_DECLS
--
--#endif  /* semaphore.h */
---- a/linuxthreads/sysdeps/pthread/semaphore.h
-+++ b/linuxthreads/sysdeps/pthread/semaphore.h
-@@ -1 +1,87 @@
--#include <linuxthreads/semaphore.h>
-+/* Linuxthreads - a simple clone()-based implementation of Posix        */
-+/* threads for Linux.                                                   */
-+/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr)              */
-+/*                                                                      */
-+/* This program is free software; you can redistribute it and/or        */
-+/* modify it under the terms of the GNU Library General Public License  */
-+/* as published by the Free Software Foundation; either version 2       */
-+/* of the License, or (at your option) any later version.               */
-+/*                                                                      */
-+/* This program is distributed in the hope that it will be useful,      */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of       */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        */
-+/* GNU Library General Public License for more details.                 */
-+
-+#ifndef _SEMAPHORE_H
-+#define _SEMAPHORE_H    1
-+
-+#include <features.h>
-+#include <sys/types.h>
-+#ifdef __USE_XOPEN2K
-+# define __need_timespec
-+# include <time.h>
-+#endif
-+
-+#ifndef _PTHREAD_DESCR_DEFINED
-+/* Thread descriptors.  Needed for `sem_t' definition.  */
-+typedef struct _pthread_descr_struct *_pthread_descr;
-+# define _PTHREAD_DESCR_DEFINED
-+#endif
-+
-+/* System specific semaphore definition.  */
-+typedef struct
-+{
-+  struct _pthread_fastlock __sem_lock;
-+  int __sem_value;
-+  _pthread_descr __sem_waiting;
-+} sem_t;
-+
-+
-+
-+/* Value returned if `sem_open' failed.  */
-+#define SEM_FAILED	((sem_t *) 0)
-+
-+/* Maximum value the semaphore can have.  */
-+#define SEM_VALUE_MAX 	(2147483647)
-+
-+
-+__BEGIN_DECLS
-+
-+/* Initialize semaphore object SEM to VALUE.  If PSHARED then share it
-+   with other processes.  */
-+extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value) __THROW;
-+
-+/* Free resources associated with semaphore object SEM.  */
-+extern int sem_destroy (sem_t *__sem) __THROW;
-+
-+/* Open a named semaphore NAME with open flaot OFLAG.  */
-+extern sem_t *sem_open (__const char *__name, int __oflag, ...) __THROW;
-+
-+/* Close descriptor for named semaphore SEM.  */
-+extern int sem_close (sem_t *__sem) __THROW;
-+
-+/* Remove named semaphore NAME.  */
-+extern int sem_unlink (__const char *__name) __THROW;
-+
-+/* Wait for SEM being posted.  */
-+extern int sem_wait (sem_t *__sem);
-+
-+#ifdef __USE_XOPEN2K
-+/* Similar to `sem_wait' but wait only until ABSTIME.  */
-+extern int sem_timedwait (sem_t *__restrict __sem,
-+			  __const struct timespec *__restrict __abstime);
-+#endif
-+
-+/* Test whether SEM is posted.  */
-+extern int sem_trywait (sem_t *__sem) __THROW;
-+
-+/* Post SEM.  */
-+extern int sem_post (sem_t *__sem) __THROW;
-+
-+/* Get current value of SEM and store it in *SVAL.  */
-+extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
-+     __THROW;
-+
-+__END_DECLS
-+
-+#endif  /* semaphore.h */

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-setclock.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-setclock.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-setclock.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,235 +0,0 @@
---- a/linuxthreads/Makefile
-+++ b/linuxthreads/Makefile
-@@ -51,6 +51,7 @@
- 		       ptw-open ptw-open64 ptw-pause ptw-pread ptw-pread64 \
- 		       ptw-pwrite ptw-pwrite64 ptw-tcdrain ptw-wait \
- 		       ptw-waitpid pt-system old_pthread_atfork pthread_atfork \
-+		       pthread_condattr_getclock pthread_condattr_setclock \
- 		       ptcleanup
- #		       pthread_setuid pthread_seteuid pthread_setreuid \
- #		       pthread_setresuid \
---- a/linuxthreads/pthread.c
-+++ b/linuxthreads/pthread.c
-@@ -1333,6 +1333,7 @@
- 	struct timespec reltime;
- 
- 	/* Compute a time offset relative to now.  */
-+#error "gettimeofday() ignores pthread_condattr_setclock() setting"
- 	__gettimeofday (&now, NULL);
- 	reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
- 	reltime.tv_sec = abstime->tv_sec - now.tv_sec;
-@@ -1403,6 +1404,12 @@
- int
- __pthread_timedsuspend_new(pthread_descr self, const struct timespec *abstime)
- {
-+  return __pthread_timedsuspend_new_clk (self, abstime, CLOCK_REALTIME);
-+}
-+
-+int
-+__pthread_timedsuspend_new_clk(pthread_descr self, const struct timespec *abstime, clockid_t clock_id)
-+{
-   sigset_t unblock, initial_mask;
-   int was_signalled = 0;
-   sigjmp_buf jmpbuf;
-@@ -1405,12 +1423,11 @@
-     sigprocmask(SIG_UNBLOCK, &unblock, &initial_mask);
- 
-     while (1) {
--      struct timeval now;
--      struct timespec reltime;
-+      struct timespec now, reltime;
- 
-       /* Compute a time offset relative to now.  */
--      __gettimeofday (&now, NULL);
--      reltime.tv_nsec = abstime->tv_nsec - now.tv_usec * 1000;
-+      INLINE_SYSCALL (clock_gettime, 2, clock_id, &now);
-+      reltime.tv_nsec = abstime->tv_nsec - now.tv_nsec;
-       reltime.tv_sec = abstime->tv_sec - now.tv_sec;
-       if (reltime.tv_nsec < 0) {
- 	reltime.tv_nsec += 1000000000;
---- /dev/null
-+++ b/linuxthreads/pthread_condattr_getclock.c
-@@ -0,0 +1,30 @@
-+/* Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <pthread.h>
-+
-+int
-+pthread_condattr_getclock (attr, clock_id)
-+     const pthread_condattr_t *attr;
-+     clockid_t *clock_id;
-+{
-+  *clock_id = attr->__clock_id;
-+
-+  return 0;
-+}
---- /dev/null
-+++ b/linuxthreads/pthread_condattr_setclock.c
-@@ -0,0 +1,63 @@
-+/* Copyright (C) 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <assert.h>
-+#include <errno.h>
-+#include <stdbool.h>
-+#include <time.h>
-+#include <sysdep.h>
-+#include <pthread.h>
-+#include <kernel-features.h>
-+
-+int
-+pthread_condattr_setclock (attr, clock_id)
-+     pthread_condattr_t *attr;
-+     clockid_t clock_id;
-+{
-+  /* Only a few clocks are allowed.  CLOCK_REALTIME is always allowed.
-+     CLOCK_MONOTONIC only if the kernel has the necessary support.  */
-+  if (clock_id == CLOCK_MONOTONIC)
-+    {
-+#ifndef __ASSUME_POSIX_TIMERS
-+# ifdef SYS_clock_getres
-+      /* Check whether the clock is available.  */
-+      static int avail;
-+
-+      if (avail == 0)
-+	{
-+	  struct timespec ts;
-+
-+	  avail = INLINE_SYSCALL (clock_getres, 2, CLOCK_MONOTONIC, &ts);
-+	}
-+
-+      if (avail < 0)
-+# endif
-+	/* Not available.  */
-+	return EINVAL;
-+#endif
-+    }
-+  else if (clock_id != CLOCK_REALTIME)
-+    /* If more clocks are allowed some day the storing of the clock ID
-+       in the pthread_cond_t structure needs to be adjusted.  */
-+    return EINVAL;
-+
-+  attr->__clock_id = clock_id;
-+
-+  return 0;
-+}
---- a/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h
-+++ b/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h
-@@ -66,16 +66,21 @@
- {
-   struct _pthread_fastlock __c_lock; /* Protect against concurrent access */
-   _pthread_descr __c_waiting;        /* Threads waiting on this condition */
--  char __padding[48 - sizeof (struct _pthread_fastlock)
-+  /* Since we only support two clock_id types in pthread_condattr_setclock(),
-+   * this can be shrinked into a single bit if we need more space.  */
-+  int __clock_id;
-+  char __padding[48 - sizeof (struct _pthread_fastlock) - sizeof (int)
- 		 - sizeof (_pthread_descr) - sizeof (__pthread_cond_align_t)];
-   __pthread_cond_align_t __align;
- } pthread_cond_t;
- 
- 
- /* Attribute for conditionally variables.  */
--typedef struct
-+typedef struct pthread_condattr
- {
--  int __dummy;
-+  /* Since we only support two clock_id types in pthread_condattr_setclock(),
-+   * this can be shrinked into a single bit if we need more space.  */
-+  int __clock_id;
- } pthread_condattr_t;
- 
- /* Keys for thread-specific data */
---- a/linuxthreads/condvar.c
-+++ b/linuxthreads/condvar.c
-@@ -31,6 +31,7 @@
- {
-   __pthread_init_lock(&cond->__c_lock);
-   cond->__c_waiting = NULL;
-+  cond->__clock_id = cond_attr ? cond_attr->__clock_id : CLOCK_REALTIME;
-   return 0;
- }
- versioned_symbol (libpthread, __pthread_cond_init, pthread_cond_init,
-@@ -198,7 +199,7 @@
-   spurious_wakeup_count = 0;
-   while (1)
-     {
--      if (!timedsuspend(self, abstime)) {
-+      if (!__pthread_timedsuspend_new_clk(self, abstime, cond->__clock_id)) {
- 	int was_on_queue;
- 
- 	/* __pthread_lock will queue back any spurious restarts that
-@@ -312,6 +313,7 @@
- 
- int __pthread_condattr_init(pthread_condattr_t *attr)
- {
-+  attr->__clock_id = CLOCK_REALTIME;
-   return 0;
- }
- strong_alias (__pthread_condattr_init, pthread_condattr_init)
---- a/linuxthreads/internals.h
-+++ b/linuxthreads/internals.h
-@@ -381,6 +381,7 @@
- extern void __pthread_restart_new(pthread_descr th);
- extern void __pthread_suspend_new(pthread_descr self);
- extern int __pthread_timedsuspend_new(pthread_descr self, const struct timespec *abs);
-+extern int __pthread_timedsuspend_new_clk(pthread_descr self, const struct timespec *abs, clockid_t clock_id);
- 
- extern void __pthread_wait_for_restart_signal(pthread_descr self);
- 
---- a/linuxthreads/Versions
-+++ b/linuxthreads/Versions
-@@ -172,6 +172,9 @@
-     pthread_cond_wait; pthread_cond_timedwait;
-     pthread_cond_signal; pthread_cond_broadcast;
-   }
-+  GLIBC_2.3.3 {
-+    pthread_condattr_getclock; pthread_condattr_setclock;
-+  }
- 
-   # Hey you!!  Yes, YOU!  Do not add new symbols here!
-   # The linuxthreads libpthread ABI froze at GLIBC_2.3.2 and lacks
---- a/linuxthreads/sysdeps/pthread/pthread.h
-+++ b/linuxthreads/sysdeps/pthread/pthread.h
-@@ -41,7 +41,7 @@
-   {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_INITIALIZER}
- #endif
- 
--#define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0, "", 0}
-+#define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0, CLOCK_REALTIME, "", 0}
- 
- #if defined __USE_UNIX98 || defined __USE_XOPEN2K
- # define PTHREAD_RWLOCK_INITIALIZER \

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-signals.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-signals.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-signals.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,18 +0,0 @@
----
- linuxthreads/signals.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/linuxthreads/signals.c
-+++ b/linuxthreads/signals.c
-@@ -99,9 +99,11 @@
-       if (act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL
- 	  && sig > 0 && sig < NSIG)
- 	{
-+#if !defined(__FreeBSD_kernel__)
- 	  if (act->sa_flags & SA_SIGINFO)
- 	    newact.sa_handler = (__sighandler_t) __pthread_sighandler_rt;
- 	  else
-+#endif
- 	    newact.sa_handler = (__sighandler_t) __pthread_sighandler;
- 	  if (old == SIG_IGN || old == SIG_DFL || old == SIG_ERR)
- 	    __sighandler[sig].old = (arch_sighandler_t) act->sa_handler;

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-stacksize.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-stacksize.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-stacksize.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,15 +0,0 @@
----
- linuxthreads/pthread.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/linuxthreads/pthread.c
-+++ b/linuxthreads/pthread.c
-@@ -429,6 +429,8 @@
- #ifdef FLOATING_STACKS
-   if (limit.rlim_cur == RLIM_INFINITY)
-     limit.rlim_cur = ARCH_STACK_MAX_SIZE;
-+  if (limit.rlim_cur > 4 * ARCH_STACK_MAX_SIZE)
-+    limit.rlim_cur = 4 * ARCH_STACK_MAX_SIZE;
- # ifdef NEED_SEPARATE_REGISTER_STACK
-   max_stack = limit.rlim_cur / 2;
- # else

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-thread_self.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-thread_self.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-thread_self.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,22 +0,0 @@
-2009-01-21  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* linuxthreads/descr.h (thread_self): Remove static to prevent
-	  warning.
-
----
- linuxthreads/descr.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/linuxthreads/descr.h
-+++ b/linuxthreads/descr.h
-@@ -260,8 +260,8 @@
- 
- extern pthread_descr __pthread_find_self (void) __attribute__ ((pure));
- 
--static inline pthread_descr thread_self (void) __attribute__ ((pure));
--static inline pthread_descr thread_self (void)
-+extern inline pthread_descr thread_self (void) __attribute__ ((pure));
-+extern inline pthread_descr thread_self (void)
- {
- #ifdef THREAD_SELF
-   return THREAD_SELF;

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-tst-sighandler.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-tst-sighandler.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-tst-sighandler.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,15 +0,0 @@
----
- linuxthreads/Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/linuxthreads/Makefile
-+++ b/linuxthreads/Makefile
-@@ -111,7 +111,7 @@
- 	ex17 ex18 tst-cancel tst-context bug-sleep \
- 	tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel4 tst-cancel5 \
- 	tst-cancel6 tst-cancel7 tst-cancel8 tst-popen tst-popen2 tst-attr1 \
--	tst-stack1 tst-align tst-tsd1 tst-sighandler1 tst-sighandler2
-+	tst-stack1 tst-align tst-tsd1
- test-srcs = tst-signal
- # These tests are linked with libc before libpthread
- tests-reverse += tst-cancel5

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-weak.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-weak.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/any/local-linuxthreads-weak.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,49 +0,0 @@
----
- linuxthreads/sysdeps/pthread/bits/libc-lock.h |   11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/linuxthreads/sysdeps/pthread/bits/libc-lock.h
-+++ b/linuxthreads/sysdeps/pthread/bits/libc-lock.h
-@@ -25,6 +25,10 @@
- 
- #if defined _LIBC && !defined NOT_IN_libc
- #include <linuxthreads/internals.h>
-+#else
-+/* This function is called to initialize the pthread library.  */
-+/* We need a prototype before it is bellow marked as weak */
-+extern void __pthread_initialize (void);
- #endif
- 
- /* Mutex type.  */
-@@ -158,6 +162,9 @@
- #define __rtld_lock_init_recursive(NAME) \
-   __libc_lock_init_recursive (NAME)
- 
-+#define __rtld_lock_initialize(NAME) \
-+ (void) ((NAME) = (__rtld_lock_recursive_t) _RTLD_LOCK_RECURSIVE_INITIALIZER)
-+
- /* Finalize the named lock variable, which must be locked.  It cannot be
-    used again until __libc_lock_init is called again on it.  This must be
-    called on a lock variable before the containing storage is reused.  */
-@@ -379,8 +386,10 @@
- weak_extern (__pthread_atfork)
- weak_extern (BP_SYM (_pthread_cleanup_push))
- weak_extern (BP_SYM (_pthread_cleanup_pop))
-+#ifdef __USE_GNU
- weak_extern (BP_SYM (_pthread_cleanup_push_defer))
- weak_extern (BP_SYM (_pthread_cleanup_pop_restore))
-+#endif
- # else
- #  pragma weak __pthread_mutex_init
- #  pragma weak __pthread_mutex_destroy
-@@ -402,8 +411,10 @@
- #  pragma weak __pthread_once
- #  pragma weak __pthread_initialize
- #  pragma weak __pthread_atfork
-+#ifdef __USE_GNU
- #  pragma weak _pthread_cleanup_push_defer
- #  pragma weak _pthread_cleanup_pop_restore
-+#endif
- #  pragma weak _pthread_cleanup_push
- #  pragma weak _pthread_cleanup_pop
- # endif

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/i386/local-linuxthreads-gscope.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/i386/local-linuxthreads-gscope.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/i386/local-linuxthreads-gscope.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,44 +0,0 @@
----
- linuxthreads/sysdeps/i386/tls.h |   24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
---- a/linuxthreads/sysdeps/i386/tls.h
-+++ b/linuxthreads/sysdeps/i386/tls.h
-@@ -50,6 +50,11 @@
-   uintptr_t sysinfo;
-   uintptr_t stack_guard;
-   uintptr_t pointer_guard;
-+#ifdef __FreeBSD_kernel__
-+  long gscope_flag;
-+# else
-+  int gscope_flag;
-+# endif
- } tcbhead_t;
- 
- #else /* __ASSEMBLER__ */
-@@ -240,6 +245,25 @@
-   ((descr)->p_header.data.pointer_guard				      \
-    = THREAD_GETMEM (THREAD_SELF, p_header.data.pointer_guard))
- 
-+/* Get and set the global scope generation counter in the TCB head.  */
-+#define THREAD_GSCOPE_FLAG_UNUSED 0
-+#define THREAD_GSCOPE_FLAG_USED   1
-+#define THREAD_GSCOPE_FLAG_WAIT   2
-+#define THREAD_GSCOPE_RESET_FLAG() \
-+  do										    \
-+    { int __res;								    \
-+      asm volatile ("xchgl %0, %%gs:%P1"					    \
-+		    : "=r" (__res)						    \
-+		    : "i" (offsetof (struct _pthread_descr_struct, p_gscope_flag)), \
-+		      "0" (THREAD_GSCOPE_FLAG_UNUSED));				    \
-+      if (__res == THREAD_GSCOPE_FLAG_WAIT)					    \
-+	lll_futex_wake (&THREAD_SELF->p_gscope_flag, 1);			    \
-+    }										    \
-+  while (0)
-+#define THREAD_GSCOPE_SET_FLAG() \
-+  THREAD_SETMEM (THREAD_SELF, p_gscope_flag, THREAD_GSCOPE_FLAG_USED)
-+#define THREAD_GSCOPE_WAIT() \
-+  do { /* GL(dl_wait_lookup_done) () */ } while (0)
- 
- # endif	/* HAVE_TLS_SUPPORT && (FLOATING_STACKS || !IS_IN_libpthread) */
- #endif /* __ASSEMBLER__ */

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-TLS-THREAD.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-TLS-THREAD.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-TLS-THREAD.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,251 +0,0 @@
---- a/linuxthreads/libc-tls-loc.c
-+++ b/linuxthreads/libc-tls-loc.c
-@@ -19,10 +19,9 @@
- 
- #include <tls.h>
- 
--#if USE___THREAD
--# include <errno.h>
--# include <netdb.h>
--# include <resolv.h>
-+#include <errno.h>
-+#include <netdb.h>
-+#include <resolv.h>
- 
- /* These functions have identical definitions in libc.  But the versioned
-    dependencies in executables bind them to libpthread.so definitions,
-@@ -45,5 +44,3 @@
- {
-   return __resp;
- }
--
--#endif
---- a/linuxthreads/libc-tsd.c
-+++ b/linuxthreads/libc-tsd.c
-@@ -20,19 +20,6 @@
- #include <tls.h>
- #include <resolv.h>
- 
--#if ! USE___THREAD
--
--/* Special hack used to build link-time libc.so object for linking libpthread.
--   See Makefile comments near libc_pic_lite.os rule for what this is for.  */
--
--# undef _res
--
--int _errno;
--int _h_errno;
--struct __res_state _res;
--
--#endif
--
- int
- __res_maybe_init (res_state resp, int preinit)
- {
---- a/linuxthreads/pthread.c
-+++ b/linuxthreads/pthread.c
-@@ -317,51 +317,6 @@
-   /* Unlike in the dynamically linked case the dynamic linker has not
-      taken care of initializing the TLS data structures.  */
-   __libc_setup_tls (TLS_TCB_SIZE, TLS_TCB_ALIGN);
--# elif !USE___THREAD
--  if (__builtin_expect (GL(dl_tls_dtv_slotinfo_list) == NULL, 0))
--    {
--      tcbhead_t *tcbp;
--
--      /* There is no actual TLS being used, so the thread register
--	 was not initialized in the dynamic linker.  */
--
--      /* We need to install special hooks so that the malloc and memalign
--	 calls in _dl_tls_setup and _dl_allocate_tls won't cause full
--	 malloc initialization that will try to set up its thread state.  */
--
--      extern void __libc_malloc_pthread_startup (bool first_time);
--      __libc_malloc_pthread_startup (true);
--
--      if (__builtin_expect (_dl_tls_setup (), 0)
--	  || __builtin_expect ((tcbp = _dl_allocate_tls (NULL)) == NULL, 0))
--	{
--	  static const char msg[] = "\
--cannot allocate TLS data structures for initial thread\n";
--	  TEMP_FAILURE_RETRY (write_not_cancel (STDERR_FILENO,
--						msg, sizeof msg - 1));
--	  abort ();
--	}
--      const char *lossage = TLS_INIT_TP (tcbp, 0);
--      if (__builtin_expect (lossage != NULL, 0))
--	{
--	  static const char msg[] = "cannot set up thread-local storage: ";
--	  const char nl = '\n';
--	  TEMP_FAILURE_RETRY (write_not_cancel (STDERR_FILENO,
--						msg, sizeof msg - 1));
--	  TEMP_FAILURE_RETRY (write_not_cancel (STDERR_FILENO,
--						lossage, strlen (lossage)));
--	  TEMP_FAILURE_RETRY (write_not_cancel (STDERR_FILENO, &nl, 1));
--	}
--
--      /* Though it was allocated with libc's malloc, that was done without
--	 the user's __malloc_hook installed.  A later realloc that uses
--	 the hooks might not work with that block from the plain malloc.
--	 So we record this block as unfreeable just as the dynamic linker
--	 does when it allocates the DTV before the libc malloc exists.  */
--      GL(dl_initial_dtv) = GET_DTV (tcbp);
--
--      __libc_malloc_pthread_startup (false);
--    }
- # endif
- 
-   self = THREAD_SELF;
-@@ -464,17 +417,9 @@
- }
- 
- #ifdef SHARED
--# if USE___THREAD
- /* When using __thread for this, we do it in libc so as not
-    to give libpthread its own TLS segment just for this.  */
- extern void **__libc_dl_error_tsd (void) __attribute__ ((const));
--# else
--static void ** __attribute__ ((const))
--__libc_dl_error_tsd (void)
--{
--  return &thread_self ()->p_libc_specific[_LIBC_TSD_KEY_DL_ERROR];
--}
--# endif
- #endif
- 
- #ifdef USE_TLS
---- a/linuxthreads/sysdeps/i386/tls.h
-+++ b/linuxthreads/sysdeps/i386/tls.h
-@@ -70,8 +70,7 @@
-    But some of the code below can cause problems in building libpthread
-    (e.g. useldt.h will defined FLOATING_STACKS when it shouldn't).  */
- 
--#if defined HAVE_TLS_SUPPORT \
--    && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
-+#if (defined FLOATING_STACKS || !defined IS_IN_libpthread)
- 
- /* Signal that TLS support is available.  */
- # define USE_TLS	1
-@@ -265,7 +264,7 @@
- #define THREAD_GSCOPE_WAIT() \
-   do { /* GL(dl_wait_lookup_done) () */ } while (0)
- 
--# endif	/* HAVE_TLS_SUPPORT && (FLOATING_STACKS || !IS_IN_libpthread) */
-+# endif	/* FLOATING_STACKS || !IS_IN_libpthread */
- #endif /* __ASSEMBLER__ */
- 
- #endif	/* tls.h */
---- a/linuxthreads/sysdeps/mips/tls.h
-+++ b/linuxthreads/sysdeps/mips/tls.h
-@@ -69,8 +69,7 @@
-    To avoid bothering with the TLS support code at all, use configure
-    --without-tls.  */
- 
--#if defined HAVE_TLS_SUPPORT \
--    && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
-+#if defined FLOATING_STACKS || !defined IS_IN_libpthread
- 
- /* Signal that TLS support is available.  */
- # define USE_TLS	1
-@@ -168,6 +167,6 @@
- 
- # endif /* __ASSEMBLER__ */
- 
--#endif /* HAVE_TLS_SUPPORT */
-+#endif /* FLOATING_STACKS || !IS_IN_libpthread */
- 
- #endif	/* tls.h */
---- a/linuxthreads/sysdeps/pthread/errno-loc.c
-+++ b/linuxthreads/sysdeps/pthread/errno-loc.c
-@@ -23,24 +23,9 @@
- #include <linuxthreads/internals.h>
- #include <sysdep-cancel.h>
- 
--#if ! USE___THREAD && !RTLD_PRIVATE_ERRNO
--#undef errno
--extern int errno;
--#endif
--
- int *
--#if ! USE___THREAD
--weak_const_function
--#endif
- __errno_location (void)
- {
--#if ! USE___THREAD && !defined NOT_IN_libc
--  if (! SINGLE_THREAD_P)
--    {
--      pthread_descr self = thread_self();
--      return LIBC_THREAD_GETMEM (self, p_errnop);
--    }
--#endif
-   return &errno;
- }
- libc_hidden_def (__errno_location)
---- a/linuxthreads/sysdeps/pthread/herrno-loc.c
-+++ b/linuxthreads/sysdeps/pthread/herrno-loc.c
-@@ -21,23 +21,11 @@
- #include <linuxthreads/internals.h>
- #include <sysdep-cancel.h>
- 
--#if ! USE___THREAD
--# undef h_errno
--extern int h_errno;
--#endif
--
- /* When threaded, h_errno may be a per-thread variable.  */
- int *
- weak_const_function
- __h_errno_location (void)
- {
--#if ! USE___THREAD
--  if (! SINGLE_THREAD_P)
--    {
--      pthread_descr self = thread_self();
--      return LIBC_THREAD_GETMEM (self, p_h_errnop);
--    }
--#endif
-   return &h_errno;
- }
- libc_hidden_def (__h_errno_location)
---- a/linuxthreads/sysdeps/pthread/res-state.c
-+++ b/linuxthreads/sysdeps/pthread/res-state.c
-@@ -21,27 +21,10 @@
- #include <linuxthreads/internals.h>
- #include <sysdep-cancel.h>
- 
--#if ! USE___THREAD
--# undef _res
--extern struct __res_state _res;
--#endif
--
- /* When threaded, _res may be a per-thread variable.  */
- struct __res_state *
--#if ! USE___THREAD
--weak_const_function
--#endif
- __res_state (void)
- {
--#if ! USE___THREAD
--  if (! SINGLE_THREAD_P)
--    {
--      pthread_descr self = thread_self();
--      return LIBC_THREAD_GETMEM (self, p_resp);
--    }
--  return &_res;
--#else
-   return __resp;
--#endif
- }
- libc_hidden_def (__res_state)
---- a/linuxthreads/sysdeps/x86_64/tls.h	
-+++ b/linuxthreads/sysdeps/x86_64/tls.h
-@@ -61,7 +61,7 @@
- #endif
- 
- 
--#ifdef HAVE_TLS_SUPPORT
-+#if 1
- 
- /* Signal that TLS support is available.  */
- # define USE_TLS	1

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-ctype_init.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-ctype_init.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-ctype_init.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,24 +0,0 @@
---- a/linuxthreads/manager.c
-+++ b/linuxthreads/manager.c
-@@ -127,6 +127,10 @@
- #ifdef INIT_THREAD_SELF
-   INIT_THREAD_SELF(self, 1);
- #endif
-+
-+  /* Initialize pointers to locale data.  */
-+  __ctype_init ();
-+
- #if !(USE_TLS && HAVE___THREAD)
-   /* Set the error variable.  */
-   self->p_errnop = &self->p_errno;
-@@ -297,6 +301,10 @@
-                            SCHED_OTHER, &default_params);
-     }
- #endif    
-+
-+  /* Initialize pointers to locale data.  */
-+  __ctype_init ();
-+
- #if !(USE_TLS && HAVE___THREAD)
-   /* Initialize thread-locale current locale to point to the global one.
-      With __thread support, the variable's initializer takes care of this.  */

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-initfini.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-initfini.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-initfini.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,71 +0,0 @@
---- a/linuxthreads/Makefile
-+++ b/linuxthreads/Makefile
-@@ -97,12 +97,11 @@
- generated-dirs := $(firstword $(subst /, , $(multidir)))
- crti-objs += $(multidir)/crti.o
- crtn-objs += $(multidir)/crtn.o
--omit-deps += $(multidir)/crti $(multidir)/crtn
-+$(objpfx)$(multidir):
-+	mkdir -p $@
- endif
- extra-objs += $(crti-objs) $(crtn-objs)
--omit-deps += crti crtn
--
--CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time)
-+extra-objs += pt-crti.o
- endif
- 
- librt-tests = ex10 ex11 tst-clock1
-@@ -234,7 +234,7 @@
- # a statically-linked program that hasn't already loaded it.
- # Depend on ld.so too to get proper versions of ld.so symbols.
- $(objpfx)libpthread.so: $(libc-link.so) $(common-objpfx)libc_nonshared.a \
--			$(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
-+			$(elfobjdir)/ld.so
- 
- # Make sure we link with the thread library.
- ifeq ($(build-shared),yes)
-@@ -266,32 +265,9 @@
- endif
- 
- ifeq ($(build-shared),yes)
--vpath pt-initfini.c $(sysdirs)
- 
--$(objpfx)pt-initfini.s: pt-initfini.c
--	$(compile.c) -S $(CFLAGS-pt-initfini.s) -finhibit-size-directive \
--		$(patsubst -f%,-fno-%,$(exceptions)) -o $@
--
--# We only have one kind of startup code files.  Static binaries and
--# shared libraries are build using the PIC version.
--$(objpfx)crti.S: $(objpfx)pt-initfini.s
--	sed -n -e '1,/@HEADER_ENDS/p' \
--	       -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
--	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
--$(objpfx)crtn.S: $(objpfx)pt-initfini.s
--	sed -n -e '1,/@HEADER_ENDS/p' \
--	       -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
--	       -e '/@TRAILER_BEGINS/,$$p' $< > $@
--
--$(objpfx)defs.h: $(objpfx)pt-initfini.s
--	sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
--		$(AWK) -f ../csu/defs.awk > $@
--
--$(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h
--	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
--
--$(objpfx)crtn.o: $(objpfx)crtn.S $(objpfx)defs.h
--	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
-+$(objpfx)crti.o: $(objpfx)pt-crti.o
-+	ln -f $< $@
- 
- ifneq ($(multidir),.)
- $(objpfx)$(multidir):
-@@ -304,7 +275,7 @@
- 	ln -f $< $@
- endif
- 
--generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a
-+generated += libpthread_nonshared.a
- endif
- 
- ifeq (yes,$(build-static-nss))

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-mutex-initializer.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-mutex-initializer.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-mutex-initializer.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,10 +0,0 @@
---- a/linuxthreads/sysdeps/pthread/malloc-machine.h
-+++ b/linuxthreads/sysdeps/pthread/malloc-machine.h
-@@ -37,6 +37,7 @@
- 		      (*(int *)(m) ? 1 : ((*(int *)(m) = 1), 0)))
- #define mutex_unlock(m)		\
-   __libc_maybe_call2 (pthread_mutex_unlock, (m), (*(int *)(m) = 0))
-+#define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
- 
- /* This is defined by newer gcc version unique for each module.  */
- extern void *__dso_handle __attribute__ ((__weak__));

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-stackguard.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,11 +0,0 @@
---- a/linuxthreads/tst-stackguard1.c
-+++ b/linuxthreads/tst-stackguard1.c
-@@ -24,7 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/wait.h>
--#include <elf/stackguard-macros.h>
-+#include <stackguard-macros.h>
- #include <unistd.h>
- 
- static const char *command;

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-tlsdesc.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-tlsdesc.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads-tlsdesc.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,31 +0,0 @@
---- a/sysdeps/i386/tlsdesc.sym
-+++ b/sysdeps/i386/tlsdesc.sym
-@@ -8,7 +8,11 @@
- 
- -- Abuse tls.h macros to derive offsets relative to the thread register.
- 
-+#if 0
- DTV_OFFSET			offsetof(struct pthread, header.dtv)
-+#else
-+DTV_OFFSET                      offsetof(struct _pthread_descr_struct, p_header.data.dtvp)
-+#endif
- 
- TLSDESC_ARG			offsetof(struct tlsdesc, arg)
- 
---- a/sysdeps/x86_64/tlsdesc.sym
-+++ b/sysdeps/x86_64/tlsdesc.sym
-@@ -5,10 +5,13 @@
- #include <dl-tlsdesc.h>
- 
- --
-+#if 0
-+ DTV_OFFSET			offsetof(struct pthread, header.dtv) */
-+#endif
- 
- -- Abuse tls.h macros to derive offsets relative to the thread register.
- 
--DTV_OFFSET			offsetof(struct pthread, header.dtv)
-+DTV_OFFSET			offsetof(struct _pthread_descr_struct, p_header.data.dtvp)
- 
- TLSDESC_ARG			offsetof(struct tlsdesc, arg)
- 

Deleted: glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads29.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads29.diff	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/kfreebsd/local-linuxthreads29.diff	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,39 +0,0 @@
---- a/linuxthreads/sysdeps/pthread/malloc-machine.h
-+++ b/linuxthreads/sysdeps/pthread/malloc-machine.h
-@@ -57,10 +57,10 @@
- #include <bits/libc-tsd.h>
- 
- typedef int tsd_key_t[1];	/* no key data structure, libc magic does it */
--__libc_tsd_define (static, MALLOC)	/* declaration/common definition */
-+__libc_tsd_define (static, void *, MALLOC)	/* declaration/common definition */
- #define tsd_key_create(key, destr)	((void) (key))
--#define tsd_setspecific(key, data)	__libc_tsd_set (MALLOC, (data))
--#define tsd_getspecific(key, vptr)	((vptr) = __libc_tsd_get (MALLOC))
-+#define tsd_setspecific(key, data)	__libc_tsd_set (void *, MALLOC, (data))
-+#define tsd_getspecific(key, vptr)	((vptr) = __libc_tsd_get (void *, MALLOC))
- 
- #include <sysdeps/generic/malloc-machine.h>
- 
---- a/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
-+++ b/linuxthreads/sysdeps/pthread/bits/libc-tsd.h
-@@ -42,14 +42,14 @@
- weak_extern (__pthread_internal_tsd_set)
- # endif
- 
--#define __libc_tsd_define(CLASS, KEY)	CLASS void *__libc_tsd_##KEY##_data;
--#define __libc_tsd_address(KEY) \
--  __libc_maybe_call2 (pthread_internal_tsd_address,			\
-+#define __libc_tsd_define(CLASS, TYPE, KEY)	CLASS TYPE __libc_tsd_##KEY##_data;
-+#define __libc_tsd_address(TYPE, KEY) \
-+  (TYPE *) __libc_maybe_call2 (pthread_internal_tsd_address,			\
- 		      (_LIBC_TSD_KEY_##KEY), &__libc_tsd_##KEY##_data)
--#define __libc_tsd_get(KEY) \
--  __libc_maybe_call2 (pthread_internal_tsd_get,				\
-+#define __libc_tsd_get(TYPE, KEY) \
-+  (TYPE) __libc_maybe_call2 (pthread_internal_tsd_get,				\
- 		      (_LIBC_TSD_KEY_##KEY), __libc_tsd_##KEY##_data)
--#define __libc_tsd_set(KEY, VALUE) \
-+#define __libc_tsd_set(TYPE, KEY, VALUE) \
-   __libc_maybe_call2 (pthread_internal_tsd_set,				\
- 		      (_LIBC_TSD_KEY_##KEY, (VALUE)),			\
- 		       (__libc_tsd_##KEY##_data = (VALUE), 0))

Modified: glibc-package/branches/eglibc-2.18/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series	2013-10-13 15:12:51 UTC (rev 5726)
@@ -44,7 +44,6 @@
 alpha/submitted-PTR_MANGLE.diff
 alpha/local-string-functions.diff
 
-amd64/local-linuxthreads-gscope.diff
 amd64/submitted-rwlock-stack-imbalance.diff
 
 arm/local-ioperm.diff
@@ -132,7 +131,6 @@
 i386/local-biarch.diff
 i386/local-cmov.diff
 i386/local-cpuid-level2.diff
-i386/local-linuxthreads-gscope.diff
 i386/submitted-i686-timing.diff
 i386/unsubmitted-quiet-ldconfig.diff
 
@@ -190,19 +188,6 @@
 any/local-ldconfig-fsync.diff
 any/local-libgcc-compat-main.diff
 any/local-libgcc-compat-ports.diff
-any/local-linuxthreads-defines.diff
-any/local-linuxthreads-fd.diff
-any/local-linuxthreads-gscope.diff
-any/local-linuxthreads-kill_other.diff
-any/local-linuxthreads-fatalprepare.diff
-any/local-linuxthreads-ptw.diff
-any/local-linuxthreads-semaphore_h.diff
-any/local-linuxthreads-signals.diff
-any/local-linuxthreads-stacksize.diff
-any/local-linuxthreads-tst-sighandler.diff
-any/local-linuxthreads-weak.diff
-any/local-linuxthreads-XPG7.diff
-any/local-linuxthreads-setclock.diff
 any/local-localedef-fix-trampoline.diff
 any/local-mktemp.diff
 any/local-no-pagesize.diff
@@ -216,7 +201,6 @@
 any/submitted-longdouble.diff
 #any/submitted-fileops-and-signals.diff		# has issues
 any/local-nss-overflow.diff
-any/local-linuxthreads-thread_self.diff
 #any/local-disable-gethostbyname4.diff
 any/submitted-getaddrinfo-lo.diff
 any/local-getaddrinfo-interface.diff
@@ -227,7 +211,6 @@
 any/local-dlfptr.diff
 any/submitted-string2-strcmp.diff
 any/submitted-ldsodefs_rtld_debug.diff
-any/local-linuxthreads-deps.diff
 any/local-ldconfig-multiarch.diff
 any/local-tst-writev.diff
 any/submitted-resolv-init.diff

Modified: glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-amd64	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,4 +1,3 @@
-kfreebsd/local-linuxthreads29.diff
 kfreebsd/local-memusage_no_mremap.diff
 kfreebsd/local-pthread_at_fork.diff
 kfreebsd/local-readdir_r.diff
@@ -6,19 +5,10 @@
 kfreebsd/local-undef-glibc.diff
 kfreebsd/local-use-thr-primitives.diff
 kfreebsd/local-initgroups-order.diff
-kfreebsd/local-linuxthreads-TLS-THREAD.diff
-kfreebsd/local-linuxthreads-mutex-initializer.diff
-kfreebsd/local-linuxthreads-initfini.diff
 kfreebsd/local-no-pldd.diff
 kfreebsd/local-nscd-nosendfile-fix.diff
-kfreebsd/local-linuxthreads-stackguard.diff
-kfreebsd/local-linuxthreads-ctype_init.diff
 kfreebsd/local-nscd-no-sockcloexec.diff
 
-# only for linuxthreads build
-#kfreebsd/local-linuxthreads-tlsdesc.diff
-#kfreebsd/local-nosavesse.diff
-
 # fbtl parts
 kfreebsd/local-fbtl.diff
 kfreebsd/local-fbtl-depends.diff

Modified: glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386	2013-10-13 15:03:52 UTC (rev 5725)
+++ glibc-package/branches/eglibc-2.18/debian/patches/series.kfreebsd-i386	2013-10-13 15:12:51 UTC (rev 5726)
@@ -1,4 +1,3 @@
-kfreebsd/local-linuxthreads29.diff
 kfreebsd/local-memusage_no_mremap.diff
 kfreebsd/local-pthread_at_fork.diff
 kfreebsd/local-readdir_r.diff
@@ -6,19 +5,10 @@
 kfreebsd/local-undef-glibc.diff
 kfreebsd/local-use-thr-primitives.diff
 kfreebsd/local-initgroups-order.diff
-kfreebsd/local-linuxthreads-TLS-THREAD.diff
-kfreebsd/local-linuxthreads-mutex-initializer.diff
-kfreebsd/local-linuxthreads-initfini.diff
 kfreebsd/local-no-pldd.diff
 kfreebsd/local-nscd-nosendfile-fix.diff
-kfreebsd/local-linuxthreads-stackguard.diff
-kfreebsd/local-linuxthreads-ctype_init.diff
 kfreebsd/local-nscd-no-sockcloexec.diff
 
-# only for linuxthreads build
-#kfreebsd/local-linuxthreads-tlsdesc.diff
-#kfreebsd/local-nosavesse.diff
-
 # fbtl parts
 kfreebsd/local-fbtl.diff
 kfreebsd/local-fbtl-depends.diff


Reply to: