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

[Commits] r25213 - in /fsf/trunk/libc: ./ elf/ manual/ nptl/ nptl/sysdeps/unix/sysv/linux/ ports/ ports/sysdeps/unix/sysv/linux/microb...



Author: eglibc
Date: Thu Feb  6 00:01:55 2014
New Revision: 25213

Log:
Import glibc-mainline for 2014-02-06

Removed:
    fsf/trunk/libc/nptl/tst-tls7.c
    fsf/trunk/libc/nptl/tst-tls7mod.c
    fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/elf/Versions
    fsf/trunk/libc/elf/dl-misc.c
    fsf/trunk/libc/elf/dl-open.c
    fsf/trunk/libc/elf/dl-reloc.c
    fsf/trunk/libc/elf/dl-tls.c
    fsf/trunk/libc/manual/contrib.texi
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/Makefile
    fsf/trunk/libc/nptl/allocatestack.c
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c
    fsf/trunk/libc/ports/ChangeLog.microblaze
    fsf/trunk/libc/sysdeps/generic/ldsodefs.h
    fsf/trunk/libc/sysdeps/mach/hurd/dl-sysdep.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c
    fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Feb  6 00:01:55 2014
@@ -1,8 +1,26 @@
+2014-02-06  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
+
+	* manual/contrib.texi: Update entry for Carlos O'Donell,
+	Joseph Myers, Roland McGrath, Alexandre Oliva and Ryan Arnold.
+
+2014-02-05  Carlos O'Donell  <carlos@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h: Fix comment.
+
+	* sysdeps/unix/sysv/linux/kernel-features.h
+	[__LINUX_KERNEL_VERSION >= 0x020621]
+	(__ASSUME_PROC_PID_TASK_COMM): Define.
+
 2014-02-05  Siddhesh Poyarekar  <siddhesh@xxxxxxxxxx>
 
 	* manual/contrib.texi: Update entry for Ondrej Bilka, Will
 	Newton and Alexandre Oliva.  Add entries for Steve Ellcey, Chris
 	Leonard and Allan McRae.
+
+2014-02-04  David S. Miller  <davem@xxxxxxxxxxxxx>
+
+	* sysdeps/sparc/fpu/libm-test-ulps: Update for some 64-bit differences from
+	32-bit.
 
 2014-02-04  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
 
@@ -553,15 +571,6 @@
 	* sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S: Likewise.
 	* sysdeps/powerpc/powerpc64/multiarch/wcscpy.c: Likewise.
 
-2014-01-03  Andrew Hunter  <ahh@xxxxxxxxxx>
-
-	* elf/dl-open.c (dl_open_worker): New comment.
-	* elf/dl-reloc.c (_dl_try_allocate_static_tls): Use
-	atomic_compare_and_exchange_bool_acq
-	(_dl_allocate_static_tls): Block signals.
-	* elf/dl-tls.c (allocate_and_init): Return void.
-	(_dl_update_slotinfo): Block signals, use atomic update.
-
 2014-01-03  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/powerpc/nofpu/libm-test-ulps: Regenerated.
@@ -962,12 +971,6 @@
 
 	* sysdeps/powerpc/fpu/libm-test-ulps: Update.
 
-2013-12-19  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>
-
-	* elf/dl-misc.c (ptr_to_signal_safe_allocator_header): New function.
-	(__signal_safe_memalign, __signal_safe_free): Use it.
-	(__signal_safe_realloc): Likewise.
-
 2013-12-19  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* manual/texinfo.tex: Update to version 2013-11-26.10 with
@@ -1050,37 +1053,6 @@
 
 	* manual/install.texi: Suppress menu for plain text output.
 	* INSTALL: Regenerated.
-
-2013-12-18  Andrew Hunter  <ahh@xxxxxxxxxx>
-
-	* sysdeps/generic/ldsodefs.h (__signal_safe_memalign): New prototype.
-	(__signal_safe_malloc, __signal_safe_free): Likewise.
-	(__signal_safe_realloc, __signal_safe_calloc): Likewise.
-	* elf/dl-misc.c (__signal_safe_allocator_header): New struct.
-	(__signal_safe_memalign, __signal_safe_malloc): New function.
-	(__signal_safe_free, __signal_safe_realloc): Likewise.
-	(__signal_safe_calloc): Likewise.
-	* elf/dl-tls.c (allocate_dtv, _dl_clear_dtv): Call signal-safe
-	functions.
-	(_dl_deallocate_tls, _dl_update_slotinfo): Likewise.
-
-2013-12-18  Andrew Hunter  <ahh@xxxxxxxxxx>
-
-	* elf/Versions (ld): Add _dl_clear_dtv.
-	* sysdeps/generic/ldsodefs.h (_dl_clear_dtv): New prototype.
-	* elf/dl-tls.c (_dl_clear_dtv): New function.
-	* nptl/allocatestack.c (get_cached_stack): Call _dl_clear_dtv.
-
-2013-12-18  Andrew Hunter  <ahh@xxxxxxxxxx>
-
-	* sysdeps/generic/ldsodefs.h (_dl_mask_all_signals): New prototype.
-	(_dl_unmask_signals): Likewise.
-	* sysdeps/mach/hurd/dl-sysdep.h (_dl_mask_all_signals): New stub.
-	(_dl_unmask_all_signals): Likewise.
-	* sysdeps/unix/sysv/linux/dl-sysdep.h (_dl_mask_all_signals): New prototype.
-	(_dl_unmask_all_signals): Likewise.
-	* sysdeps/unix/sysv/linux/dl-sysdep.c (_dl_mask_all_signals): New function.
-	(_dl_unmask_signals): Likewise.
 
 2013-12-18  Brooks Moses  <bmoses@xxxxxxxxxx>
 

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Thu Feb  6 00:01:55 2014
@@ -15,18 +15,18 @@
   14699, 14752, 14782, 14876, 14910, 15004, 15048, 15073, 15089, 15128,
   15218, 15268, 15277, 15308, 15362, 15374, 15400, 15425, 15427, 15483,
   15522, 15531, 15532, 15593, 15601, 15608, 15609, 15610, 15632, 15640,
-  15670, 15672, 15680, 15681, 15705, 15723, 15734, 15735, 15736, 15748,
-  15749, 15754, 15760, 15763, 15764, 15797, 15799, 15825, 15843, 15844,
-  15846, 15847, 15849, 15850, 15855, 15856, 15857, 15859, 15867, 15886,
-  15887, 15890, 15892, 15893, 15895, 15897, 15901, 15905, 15909, 15915,
-  15917, 15919, 15921, 15923, 15939, 15941, 15948, 15963, 15966, 15985,
-  15988, 15997, 16032, 16034, 16036, 16037, 16038, 16041, 16046, 16055,
-  16071, 16072, 16074, 16077, 16078, 16103, 16112, 16133, 16143, 16144,
-  16146, 16150, 16151, 16153, 16167, 16169, 16172, 16195, 16214, 16245,
-  16271, 16274, 16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338,
-  16356, 16365, 16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386,
-  16387, 16390, 16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431,
-  16453, 16474, 16506, 16510
+  15670, 15672, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749,
+  15754, 15760, 15763, 15764, 15797, 15799, 15825, 15843, 15844, 15846,
+  15847, 15849, 15850, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
+  15890, 15892, 15893, 15895, 15897, 15901, 15905, 15909, 15915, 15917,
+  15919, 15921, 15923, 15939, 15941, 15948, 15963, 15966, 15985, 15988,
+  15997, 16032, 16034, 16036, 16037, 16038, 16041, 16046, 16055, 16071,
+  16072, 16074, 16077, 16078, 16103, 16112, 16143, 16144, 16146, 16150,
+  16151, 16153, 16167, 16169, 16172, 16195, 16214, 16245, 16271, 16274,
+  16283, 16289, 16293, 16314, 16316, 16330, 16337, 16338, 16356, 16365,
+  16366, 16369, 16372, 16375, 16379, 16384, 16385, 16386, 16387, 16390,
+  16394, 16398, 16400, 16407, 16408, 16414, 16430, 16431, 16453, 16474,
+  16506, 16510
 
 * Slovenian translations for glibc messages have been contributed by the
   Translation Project's Slovenian team of translators.

Modified: fsf/trunk/libc/elf/Versions
==============================================================================
--- fsf/trunk/libc/elf/Versions (original)
+++ fsf/trunk/libc/elf/Versions Thu Feb  6 00:01:55 2014
@@ -53,7 +53,6 @@
     _dl_allocate_tls; _dl_allocate_tls_init;
     _dl_argv; _dl_find_dso_for_object; _dl_get_tls_static_info;
     _dl_deallocate_tls; _dl_make_stack_executable; _dl_out_of_memory;
-    _dl_clear_dtv;
     _dl_rtld_di_serinfo; _dl_starting_up; _dl_tls_setup;
     _rtld_global; _rtld_global_ro;
 

Modified: fsf/trunk/libc/elf/dl-misc.c
==============================================================================
--- fsf/trunk/libc/elf/dl-misc.c (original)
+++ fsf/trunk/libc/elf/dl-misc.c Thu Feb  6 00:01:55 2014
@@ -19,7 +19,6 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <ldsodefs.h>
-#include <libc-symbols.h>
 #include <limits.h>
 #include <link.h>
 #include <stdarg.h>
@@ -365,144 +364,3 @@
 
   return *low;
 }
-
-/* To support accessing TLS variables from signal handlers, we need an
-   async signal safe memory allocator.  These routines are never
-   themselves invoked reentrantly (all calls to them are surrounded by
-   signal masks) but may be invoked concurrently from many threads.
-   The current implementation is not particularly performant nor space
-   efficient, but it will be used rarely (and only in binaries that use
-   dlopen.)  The API matches that of malloc() and friends.  */
-
-struct __signal_safe_allocator_header
-{
-  size_t size;
-  void *start;
-};
-
-static inline struct __signal_safe_allocator_header *
-ptr_to_signal_safe_allocator_header (void *ptr)
-{
-  return (struct __signal_safe_allocator_header *)
-    ((char *) (ptr) - sizeof (struct __signal_safe_allocator_header));
-}
-
-void *weak_function
-__signal_safe_memalign (size_t boundary, size_t size)
-{
-  struct __signal_safe_allocator_header *header;
-
-  if (boundary < sizeof (*header))
-    boundary = sizeof (*header);
-
-  /* Boundary must be a power of two.  */
-  if (!powerof2 (boundary))
-    return NULL;
-
-  size_t pg = GLRO (dl_pagesize);
-  size_t padded_size;
-  if (boundary <= pg)
-    {
-      /* We'll get a pointer certainly aligned to boundary, so just
-	 add one more boundary-sized chunk to hold the header.  */
-      padded_size = roundup (size, boundary) + boundary;
-    }
-  else
-    {
-      /* If we want K pages aligned to a J-page boundary, K+J+1 pages
-	 contains at least one such region that isn't directly at the start
-	 (so we can place the header.)	This is wasteful, but you're the one
-	 who wanted 64K-aligned TLS.  */
-      padded_size = roundup (size, pg) + boundary + pg;
-    }
-
-
-  size_t actual_size = roundup (padded_size, pg);
-  void *actual = mmap (NULL, actual_size, PROT_READ | PROT_WRITE,
-		       MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-  if (actual == MAP_FAILED)
-    return NULL;
-
-  if (boundary <= pg)
-    {
-      header = actual + boundary - sizeof (*header);
-    }
-  else
-    {
-      intptr_t actual_pg = ((intptr_t) actual) / pg;
-      intptr_t boundary_pg = boundary / pg;
-      intptr_t start_pg = actual_pg + boundary_pg;
-      start_pg -= start_pg % boundary_pg;
-      if (start_pg > (actual_pg + 1))
-	{
-	  int ret = munmap (actual, (start_pg - actual_pg - 1) * pg);
-	  assert (ret == 0);
-	  actual = (void *) ((start_pg - 1) * pg);
-	}
-      char *start = (void *) (start_pg * pg);
-      header = ptr_to_signal_safe_allocator_header (start);
-    }
-
-  header->size = actual_size;
-  header->start = actual;
-  void *ptr = header;
-  ptr += sizeof (*header);
-  if (((intptr_t) ptr) % boundary != 0)
-    _dl_fatal_printf ("__signal_safe_memalign produced incorrect alignment\n");
-  return ptr;
-}
-
-void * weak_function
-__signal_safe_malloc (size_t size)
-{
-  return __signal_safe_memalign (1, size);
-}
-
-void weak_function
-__signal_safe_free (void *ptr)
-{
-  if (ptr == NULL)
-    return;
-
-  struct __signal_safe_allocator_header *header
-    = ptr_to_signal_safe_allocator_header (ptr);
-  int ret = munmap (header->start, header->size);
-
-  assert (ret == 0);
-}
-
-void * weak_function
-__signal_safe_realloc (void *ptr, size_t size)
-{
-  if (size == 0)
-    {
-      __signal_safe_free (ptr);
-      return NULL;
-    }
-  if (ptr == NULL)
-    return __signal_safe_malloc (size);
-
-  struct __signal_safe_allocator_header *header
-    = ptr_to_signal_safe_allocator_header (ptr);
-  size_t old_size = header->size;
-  if (old_size - sizeof (*header) >= size)
-    return ptr;
-
-  void *new_ptr = __signal_safe_malloc (size);
-  if (new_ptr == NULL)
-    return NULL;
-
-  memcpy (new_ptr, ptr, old_size);
-  __signal_safe_free (ptr);
-
-  return new_ptr;
-}
-
-void * weak_function
-__signal_safe_calloc (size_t nmemb, size_t size)
-{
-  void *ptr = __signal_safe_malloc (nmemb * size);
-  if (ptr == NULL)
-    return NULL;
-  return memset (ptr, 0, nmemb * size);
-}

Modified: fsf/trunk/libc/elf/dl-open.c
==============================================================================
--- fsf/trunk/libc/elf/dl-open.c (original)
+++ fsf/trunk/libc/elf/dl-open.c Thu Feb  6 00:01:55 2014
@@ -548,10 +548,7 @@
 	     generation of the DSO we are allocating data for.  */
 	  _dl_update_slotinfo (imap->l_tls_modid);
 #endif
-	  /* We do this iteration under a signal mask in dl-reloc; why not
-	     here?  Because these symbols are new and dlopen hasn't
-	     returned yet.  So we can't possibly be racing with a TLS
-	     access to them from another thread.  */
+
 	  GL(dl_init_static_tls) (imap);
 	  assert (imap->l_need_tls_init == 0);
 	}

Modified: fsf/trunk/libc/elf/dl-reloc.c
==============================================================================
--- fsf/trunk/libc/elf/dl-reloc.c (original)
+++ fsf/trunk/libc/elf/dl-reloc.c Thu Feb  6 00:01:55 2014
@@ -16,10 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <atomic.h>
 #include <errno.h>
 #include <libintl.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <ldsodefs.h>
@@ -72,6 +70,8 @@
 
   size_t offset = GL(dl_tls_static_used) + (freebytes - n * map->l_tls_align
 					    - map->l_tls_firstbyte_offset);
+
+  map->l_tls_offset = GL(dl_tls_static_used) = offset;
 #elif TLS_DTV_AT_TP
   /* dl_tls_static_used includes the TCB at the beginning.  */
   size_t offset = (((GL(dl_tls_static_used)
@@ -83,36 +83,7 @@
   if (used > GL(dl_tls_static_size))
     goto fail;
 
-#else
-# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
-#endif
-  /* We've computed the new value we want, now try to install it.  */
-  ptrdiff_t val;
-  if ((val = map->l_tls_offset) == NO_TLS_OFFSET)
-    {
-      /* l_tls_offset starts out at NO_TLS_OFFSET, and all attempts to
-	 change it go from NO_TLS_OFFSET to some other value.  We use
-	 compare_and_exchange to ensure only one attempt succeeds.  We
-	 don't actually need any memory ordering here, but _acq is the
-	 weakest available.  */
-      (void ) atomic_compare_and_exchange_bool_acq (&map->l_tls_offset,
-						    offset,
-						    NO_TLS_OFFSET);
-      val = map->l_tls_offset;
-      assert (val != NO_TLS_OFFSET);
-    }
-  if (val != offset)
-    {
-      /* We'd like to set a static offset for this section, but another
-	 thread has already used a dynamic TLS block for it.  Since we can
-	 only use static offsets if everyone does (and it's not practical
-	 to move that thread's dynamic block), we have to fail.  */
-      goto fail;
-    }
-  /* We installed the value; now update the globals.  */
-#if TLS_TCB_AT_TP
-  GL(dl_tls_static_used) = offset;
-#elif TLS_DTV_AT_TP
+  map->l_tls_offset = offset;
   map->l_tls_firstbyte_offset = GL(dl_tls_static_used);
   GL(dl_tls_static_used) = used;
 #else
@@ -143,17 +114,8 @@
 internal_function __attribute_noinline__
 _dl_allocate_static_tls (struct link_map *map)
 {
-  /* We wrap this in a signal mask because it has to iterate all threads
-     (including this one) and update this map's TLS entry. A signal handler
-     accessing TLS would try to do the same update and break.  */
-  sigset_t old;
-  _dl_mask_all_signals (&old);
-  int err = -1;
-  if (map->l_tls_offset != FORCED_DYNAMIC_TLS_OFFSET)
-    err = _dl_try_allocate_static_tls (map);
-
-  _dl_unmask_signals (&old);
-  if (err != 0)
+  if (map->l_tls_offset == FORCED_DYNAMIC_TLS_OFFSET
+      || _dl_try_allocate_static_tls (map))
     {
       _dl_signal_error (0, map->l_name, NULL, N_("\
 cannot allocate memory in static TLS block"));

Modified: fsf/trunk/libc/elf/dl-tls.c
==============================================================================
--- fsf/trunk/libc/elf/dl-tls.c (original)
+++ fsf/trunk/libc/elf/dl-tls.c Thu Feb  6 00:01:55 2014
@@ -17,7 +17,6 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
-#include <atomic.h>
 #include <errno.h>
 #include <libintl.h>
 #include <signal.h>
@@ -294,7 +293,7 @@
      initial set of modules.  This should avoid in most cases expansions
      of the dtv.  */
   dtv_length = GL(dl_tls_max_dtv_idx) + DTV_SURPLUS;
-  dtv = __signal_safe_calloc (dtv_length + 2, sizeof (dtv_t));
+  dtv = calloc (dtv_length + 2, sizeof (dtv_t));
   if (dtv != NULL)
     {
       /* This is the initial length of the dtv.  */
@@ -464,18 +463,6 @@
 }
 rtld_hidden_def (_dl_allocate_tls)
 
-void
-internal_function
-_dl_clear_dtv (dtv_t *dtv)
-{
-  for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt)
-    if (! dtv[1 + cnt].pointer.is_static
-	&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
-      __signal_safe_free (dtv[1 + cnt].pointer.val);
-  memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t));
-}
-
-rtld_hidden_def (_dl_clear_dtv)
 
 #ifndef SHARED
 extern dtv_t _dl_static_dtv[];
@@ -492,11 +479,11 @@
   for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt)
     if (! dtv[1 + cnt].pointer.is_static
 	&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
-      __signal_safe_free (dtv[1 + cnt].pointer.val);
+      free (dtv[1 + cnt].pointer.val);
 
   /* The array starts with dtv[-1].  */
   if (dtv != GL(dl_initial_dtv))
-    __signal_safe_free (dtv - 1);
+    free (dtv - 1);
 
   if (dealloc_tcb)
     {
@@ -534,21 +521,20 @@
 # endif
 
 
-static void
-allocate_and_init (dtv_t *dtv, struct link_map *map)
+static void *
+allocate_and_init (struct link_map *map)
 {
   void *newp;
-  newp = __signal_safe_memalign (map->l_tls_align, map->l_tls_blocksize);
+
+  newp = __libc_memalign (map->l_tls_align, map->l_tls_blocksize);
   if (newp == NULL)
     oom ();
 
-  /* Initialize the memory. Since this is our thread's space, we are
-     under a signal mask, and no one has touched this section before,
-     we can safely just overwrite whatever's there.  */
+  /* Initialize the memory.  */
   memset (__mempcpy (newp, map->l_tls_initimage, map->l_tls_initimage_size),
 	  '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
 
-  dtv->pointer.val = newp;
+  return newp;
 }
 
 
@@ -590,15 +576,7 @@
 	 the entry we need.  */
       size_t new_gen = listp->slotinfo[idx].gen;
       size_t total = 0;
-      sigset_t old;
-
-      _dl_mask_all_signals (&old);
-      /* We use the signal mask as a lock against reentrancy here.
-         Check that a signal taken before the lock didn't already
-         update us.  */
-      dtv = THREAD_DTV ();
-      if (dtv[0].counter >= listp->slotinfo[idx].gen)
-        goto out;
+
       /* We have to look through the entire dtv slotinfo list.  */
       listp =  GL(dl_tls_dtv_slotinfo_list);
       do
@@ -617,8 +595,6 @@
 		 know we don't have to handle it.  */
 	      if (gen <= dtv[0].counter)
 		continue;
-
-	      size_t modid = total + cnt;
 
 	      /* If there is no map this means the entry is empty.  */
 	      struct link_map *map = listp->slotinfo[cnt].map;
@@ -626,19 +602,19 @@
 		{
 		  /* If this modid was used at some point the memory
 		     might still be allocated.  */
-		  if (dtv[-1].counter >= modid
-		      && !dtv[modid].pointer.is_static
-		      && dtv[modid].pointer.val != TLS_DTV_UNALLOCATED)
+		  if (! dtv[total + cnt].pointer.is_static
+		      && dtv[total + cnt].pointer.val != TLS_DTV_UNALLOCATED)
 		    {
-		      __signal_safe_free (dtv[modid].pointer.val);
-		      dtv[modid].pointer.val = TLS_DTV_UNALLOCATED;
+		      free (dtv[total + cnt].pointer.val);
+		      dtv[total + cnt].pointer.val = TLS_DTV_UNALLOCATED;
 		    }
 
 		  continue;
 		}
 
-	      assert (modid == map->l_tls_modid);
 	      /* Check whether the current dtv array is large enough.  */
+	      size_t modid = map->l_tls_modid;
+	      assert (total + cnt == modid);
 	      if (dtv[-1].counter < modid)
 		{
 		  /* Reallocate the dtv.  */
@@ -652,18 +628,17 @@
 		    {
 		      /* This is the initial dtv that was allocated
 			 during rtld startup using the dl-minimal.c
-			 malloc instead of the real allocator.  We can't
+			 malloc instead of the real malloc.  We can't
 			 free it, we have to abandon the old storage.  */
 
-		      newp = __signal_safe_malloc (
-					(2 + newsize) * sizeof (dtv_t));
+		      newp = malloc ((2 + newsize) * sizeof (dtv_t));
 		      if (newp == NULL)
 			oom ();
 		      memcpy (newp, &dtv[-1], (2 + oldsize) * sizeof (dtv_t));
 		    }
 		  else
 		    {
-		      newp = __signal_safe_realloc (&dtv[-1],
+		      newp = realloc (&dtv[-1],
 				      (2 + newsize) * sizeof (dtv_t));
 		      if (newp == NULL)
 			oom ();
@@ -693,7 +668,7 @@
 		   deallocate even if it is this dtv entry we are
 		   supposed to load.  The reason is that we call
 		   memalign and not malloc.  */
-		__signal_safe_free (dtv[modid].pointer.val);
+		free (dtv[modid].pointer.val);
 
 	      /* This module is loaded dynamically- We defer memory
 		 allocation.  */
@@ -710,8 +685,6 @@
 
       /* This will be the new maximum generation counter.  */
       dtv[0].counter = new_gen;
-   out:
-      _dl_unmask_signals (&old);
     }
 
   return the_map;
@@ -737,60 +710,39 @@
 
       the_map = listp->slotinfo[idx].map;
     }
-  sigset_t old;
-  _dl_mask_all_signals (&old);
-
-  /* As with update_slotinfo, we use the sigmask as a check against
-     reentrancy.  */
-  if (dtv[GET_ADDR_MODULE].pointer.val != TLS_DTV_UNALLOCATED)
-    goto out;
-
-  /* Synchronize against a parallel dlopen() forcing this variable
-     into static storage.  If that happens, we have to be more careful
-     about initializing the area, as that dlopen() will be iterating
-     the threads to do so itself.  */
-  ptrdiff_t offset;
-  if ((offset = the_map->l_tls_offset) == NO_TLS_OFFSET)
-    {
-      /* l_tls_offset starts out at NO_TLS_OFFSET, and all attempts to
-	 change it go from NO_TLS_OFFSET to some other value.  We use
-	 compare_and_exchange to ensure only one attempt succeeds.  We
-	 don't actually need any memory ordering here, but _acq is the
-	 weakest available.  */
-      (void) atomic_compare_and_exchange_bool_acq (&the_map->l_tls_offset,
-						   FORCED_DYNAMIC_TLS_OFFSET,
-						   NO_TLS_OFFSET);
-      offset = the_map->l_tls_offset;
-      assert (offset != NO_TLS_OFFSET);
-    }
-  if (offset == FORCED_DYNAMIC_TLS_OFFSET)
-    {
-      allocate_and_init (&dtv[GET_ADDR_MODULE], the_map);
-    }
-  else
-    {
-      void **pp = &dtv[GET_ADDR_MODULE].pointer.val;
-      while (atomic_forced_read (*pp) == TLS_DTV_UNALLOCATED)
-	{
-	  /* for lack of a better (safe) thing to do, just spin.
-	    Someone else (not us; it's done under a signal mask) set
-	    this map to a static TLS offset, and they'll iterate all
-	    threads to initialize it.  They'll eventually write
-	    to pointer.val, at which point we know they've fully
-	    completed initialization.  */
-	  atomic_delay ();
-	}
-      /* Make sure we've picked up their initialization of the actual
-	 block; this pairs against the write barrier in
-	 init_one_static_tls, guaranteeing that we see their write of
-	 the tls_initimage into the static region.  */
-      atomic_read_barrier ();
-    }
-out:
-  assert (dtv[GET_ADDR_MODULE].pointer.val != TLS_DTV_UNALLOCATED);
-  _dl_unmask_signals (&old);
-
-  return (char *) dtv[GET_ADDR_MODULE].pointer.val + GET_ADDR_OFFSET;
+
+ again:
+  /* Make sure that, if a dlopen running in parallel forces the
+     variable into static storage, we'll wait until the address in the
+     static TLS block is set up, and use that.  If we're undecided
+     yet, make sure we make the decision holding the lock as well.  */
+  if (__builtin_expect (the_map->l_tls_offset
+			!= FORCED_DYNAMIC_TLS_OFFSET, 0))
+    {
+      __rtld_lock_lock_recursive (GL(dl_load_lock));
+      if (__builtin_expect (the_map->l_tls_offset == NO_TLS_OFFSET, 1))
+	{
+	  the_map->l_tls_offset = FORCED_DYNAMIC_TLS_OFFSET;
+	  __rtld_lock_unlock_recursive (GL(dl_load_lock));
+	}
+      else
+	{
+	  __rtld_lock_unlock_recursive (GL(dl_load_lock));
+	  if (__builtin_expect (the_map->l_tls_offset
+				!= FORCED_DYNAMIC_TLS_OFFSET, 1))
+	    {
+	      void *p = dtv[GET_ADDR_MODULE].pointer.val;
+	      if (__builtin_expect (p == TLS_DTV_UNALLOCATED, 0))
+		goto again;
+
+	      return (char *) p + GET_ADDR_OFFSET;
+	    }
+	}
+    }
+  void *p = dtv[GET_ADDR_MODULE].pointer.val = allocate_and_init (the_map);
+  dtv[GET_ADDR_MODULE].pointer.is_static = false;
+
+  return (char *) p + GET_ADDR_OFFSET;
 }
 
 

Modified: fsf/trunk/libc/manual/contrib.texi
==============================================================================
--- fsf/trunk/libc/manual/contrib.texi (original)
+++ fsf/trunk/libc/manual/contrib.texi Thu Feb  6 00:01:55 2014
@@ -12,7 +12,8 @@
 @itemize @bullet
 
 @item
-Ryan S. Arnold for his improvements for Linux on PowerPC.
+Ryan S. Arnold for his improvements for Linux on PowerPC and his direction
+as FSF Project Steward for @theglibc{}.
 
 @item
 Miles Bader for writing the @code{argp} argument-parsing package, and the
@@ -200,7 +201,8 @@
 @item
 Roland McGrath for writing most of @theglibc{} originally, for his
 work on the Hurd port, his direction as part of @theglibc{} steering
-committee, and for many bug fixes and reviewing of contributions.
+committee and as FSF Project Steward for @theglibc{}, and for many bug
+fixes and reviewing of contributions.
 
 @item
 Allan McRae for various fixes.
@@ -238,22 +240,25 @@
 Joseph S. Myers for numerous bug fixes for the libm functions, for
 his maintainership of the ARM and MIPS architectures, improving
 cross-compilation and cross-testing of @theglibc{}, expanded
-coverage of conformtest, and merging the ports/ subdirectory
-into the @glibcadj{} main repository.
+coverage of conformtest, merging the ports/ subdirectory
+into the @glibcadj{} main repository and his direction as FSF Project
+Steward for @theglibc{}.
 
 @item
 Will Newton for contributing some optimized string functions and pointer
 encryption support for ARM and various fixes.
 
 @item
-Carlos O'Donell for his maintainership of the HPPA architecture and
-maintaining @theglibc{} web pages.
+Carlos O'Donell for his maintainership of the HPPA architecture, for
+maintaining @theglibc{} web pages and wiki, for his direction as FSF
+Project Steward for @theglibc{} and various bug fixes.
 
 @item
 Alexandre Oliva for adding TLS descriptors for LD and GD on x86 and
 x86-64, for the am33 port, for completing the MIPS n64/n32/o32 multilib
 port, for thread-safety, async-signal safety and async-cancellation
-safety documentation in the manual and for various fixes.
+safety documentation in the manual, for his direction as FSF Project
+Maintainer and for various fixes.
 
 @item
 Paul Pluzhnikov for various fixes.

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Thu Feb  6 00:01:55 2014
@@ -1,3 +1,9 @@
+2014-02-05  Carlos O'Donell  <carlos@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/tst-setgetname.c (do_test): Skip the
+	test if !__ASSUME_PROC_PID_TASK_COMM and get_self_comm returns
+	ENOENT.
+
 2014-01-23  Stefan Liebler  <stli@xxxxxxxxxxxxxxxxxx>
 
 	* tst-tls7.c: Adjust testcase timeout
@@ -13,14 +19,7 @@
 	(do_test): Call it.
 	* tst-tls7mod.c (action): Move sem_post to caller.
 
-2014-01-03  Andrew Hunter  <ahh@xxxxxxxxxx>
-
-	* nptl/Makefile (tst-tls7): New test.
-	* nptl/tst-tls7.c: New file.
-	* nptl/tst-tls7mod.c: New file.
-	* nptl/allocatestack.c (init_one_static_tls): Use atomic barrier.
-
-2013-12-12  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
+2011-12-12  Adhemerval Zanella  <azanella@xxxxxxxxxxxxxxxxxx>
 
 	* sysdeps/powerpc/tls.h (struct tcbhead_t): Add DSO and TAR fields.
 	* nptl/sysdeps/powerpc/tcb-offsets.sym: Likewise.

Modified: fsf/trunk/libc/nptl/Makefile
==============================================================================
--- fsf/trunk/libc/nptl/Makefile (original)
+++ fsf/trunk/libc/nptl/Makefile Thu Feb  6 00:01:55 2014
@@ -293,7 +293,7 @@
 	 tst-oncex3 tst-oncex4
 endif
 ifeq ($(build-shared),yes)
-tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-tls7 tst-_res1 tst-fini1 \
+tests += tst-atfork2 tst-tls3 tst-tls4 tst-tls5 tst-_res1 tst-fini1 \
 	 tst-stackguard1
 tests-nolibpthread += tst-fini1
 ifeq ($(have-z-execstack),yes)
@@ -304,8 +304,7 @@
 modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
 		tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
 		tst-tls5modd tst-tls5mode tst-tls5modf \
-		tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \
-		tst-tls7mod
+		tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) tst-cleanup4aux.o
 test-extras += $(modules-names) tst-cleanup4aux
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
@@ -319,7 +318,6 @@
 tst-tls5modd.so-no-z-defs = yes
 tst-tls5mode.so-no-z-defs = yes
 tst-tls5modf.so-no-z-defs = yes
-tst-tls7mod.so-no-z-defs = yes
 
 ifeq ($(build-shared),yes)
 # Build all the modules even when not actually running test programs.
@@ -482,12 +480,6 @@
 LDFLAGS-tst-tls5 = $(no-as-needed)
 LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
 
-# ensure free(malloc()) isn't optimized out
-CFLAGS-tst-tls7.c = -fno-builtin-malloc -fno-builtin-free
-$(objpfx)tst-tls7: $(libdl) $(shared-thread-library)
-$(objpfx)tst-tls7.out: $(objpfx)tst-tls7mod.so
-$(objpfx)tst-tls7mod.so: $(shared-thread-library)
-
 ifeq ($(build-shared),yes)
 ifeq ($(run-built-tests),yes)
 tests: $(objpfx)tst-tls6.out

Modified: fsf/trunk/libc/nptl/allocatestack.c
==============================================================================
--- fsf/trunk/libc/nptl/allocatestack.c (original)
+++ fsf/trunk/libc/nptl/allocatestack.c Thu Feb  6 00:01:55 2014
@@ -242,7 +242,11 @@
 
   /* Clear the DTV.  */
   dtv_t *dtv = GET_DTV (TLS_TPADJ (result));
-  _dl_clear_dtv (dtv);
+  for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt)
+    if (! dtv[1 + cnt].pointer.is_static
+	&& dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED)
+      free (dtv[1 + cnt].pointer.val);
+  memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t));
 
   /* Re-initialize the TLS.  */
   _dl_allocate_tls_init (TLS_TPADJ (result));
@@ -1173,18 +1177,13 @@
 #  error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
 # endif
 
+  /* Fill in the DTV slot so that a later LD/GD access will find it.  */
+  dtv[map->l_tls_modid].pointer.val = dest;
+  dtv[map->l_tls_modid].pointer.is_static = true;
+
   /* Initialize the memory.  */
   memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
 	  '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
-
-  /* Fill in the DTV slot so that a later LD/GD access will find it.  */
-  dtv[map->l_tls_modid].pointer.is_static = true;
-  /* Pairs against the read barrier in tls_get_attr_tail, guaranteeing
-     any thread waiting for an update to pointer.val sees the
-     initimage write.  */
-  atomic_write_barrier ();
-  dtv[map->l_tls_modid].pointer.val = dest;
-
 }
 
 void

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/tst-setgetname.c Thu Feb  6 00:01:55 2014
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <kernel-features.h>
 
 /* New name of process.  */
 #define NEW_NAME "setname"
@@ -99,6 +100,19 @@
   if (res == 0)
     {
       res = get_self_comm (gettid (), name_check, TASK_COMM_LEN);
+
+#if !__ASSUME_PROC_PID_TASK_COMM
+      /* On this first test we look for ENOENT to be returned from
+         get_self_comm to indicate that the kernel is older than
+         2.6.33 and doesn't contain comm within the proc structure.
+         In that case we skip the entire test.  */
+      if (res == ENOENT)
+	{
+	  printf ("SKIP: The kernel does not have /proc/self/task/%%lu/comm.\n");
+	  return 0;
+	}
+#endif
+
       if (res == 0)
        {
          if (strncmp (name, name_check, strlen (BIG_NAME)) == 0)

Removed: fsf/trunk/libc/nptl/tst-tls7.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-tls7.c (original)
+++ fsf/trunk/libc/nptl/tst-tls7.c (removed)
@@ -1,143 +1,0 @@
-/* Copyright (C) 2013 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, see
-   <http://www.gnu.org/licenses/>.  */
-
-
-/* This test checks that TLS in a dlopened object works when first accessed
-   from a signal handler.  */
-
-#include <assert.h>
-#include <atomic.h>
-#include <dlfcn.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void *
-spin (void *ignored)
-{
-  while (1)
-    {
-      /* busywork */
-      free (malloc (128));
-    }
-
-  /* never reached */
-  return NULL;
-}
-
-static void (*tls7mod_action) (int, siginfo_t *, void *);
-
-static void
-action (int signo, siginfo_t *info, void *ignored)
-{
-  sem_t *sem = info->si_value.sival_ptr;
-
-  atomic_read_barrier ();
-  assert (tls7mod_action != NULL);
-  (*tls7mod_action) (signo, info, ignored);
-
-  /* This sem_post may trigger dlclose, which will invalidate tls7mod_action.
-     It is important to do that only after tls7mod_action is no longer
-     active.  */
-  sem_post (sem);
-}
-
-int
-do_test (void)
-{
-  pthread_t th[10];
-
-  for (int i = 0; i < 10; ++i)
-    {
-      if (pthread_create (&th[i], NULL, spin, NULL))
-        {
-          puts ("pthread_create failed");
-          exit (1);
-        }
-    }
-#define NITERS 75
-
-  for (int i = 0; i < NITERS; ++i)
-    {
-      void *h = dlopen ("tst-tls7mod.so", RTLD_LAZY);
-      if (h == NULL)
-        {
-          puts ("dlopen failed");
-          exit (1);
-        }
-
-      tls7mod_action = dlsym (h, "action");
-      if (tls7mod_action == NULL)
-        {
-          puts ("dlsym for action failed");
-          exit (1);
-        }
-      atomic_write_barrier ();
-
-      struct sigaction sa;
-      sa.sa_sigaction = action;
-      sigemptyset (&sa.sa_mask);
-      sa.sa_flags = SA_SIGINFO;
-      if (sigaction (SIGUSR1, &sa, NULL))
-        {
-          puts ("sigaction failed");
-          exit (1);
-        }
-
-      sem_t sem;
-      if (sem_init (&sem, 0, 0))
-        {
-          puts ("sem_init failed");
-        }
-
-      sigval_t val;
-      val.sival_ptr = &sem;
-      for (int i = 0; i < 10; ++i)
-        {
-          if (pthread_sigqueue (th[i], SIGUSR1, val))
-            {
-              puts ("pthread_sigqueue failed");
-            }
-        }
-
-
-      for (int i = 0; i < 10; ++i)
-        {
-          if (sem_wait (&sem))
-          {
-            puts ("sem_wait failed");
-          }
-        }
-
-      /* Paranoia.  */
-      tls7mod_action = NULL;
-
-      if (dlclose (h))
-        {
-          puts ("dlclose failed");
-          exit (1);
-        }
-    }
-  return 0;
-}
-
-#define TIMEOUT 8
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"

Removed: fsf/trunk/libc/nptl/tst-tls7mod.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-tls7mod.c (original)
+++ fsf/trunk/libc/nptl/tst-tls7mod.c (removed)
@@ -1,40 +1,0 @@
-/* Copyright (C) 2013 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, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* Dynamic module with TLS to be accessed by a signal handler to check safety
-   of that mode. */
-
-#include <semaphore.h>
-#include <signal.h>
-#include <unistd.h>
-
-/* This is an unlikely value to see in incorrectly initialized TLS
-   block -- make sure we're initialized properly. */
-static __thread intptr_t tls_data = 0xdeadbeef;
-
-void
-action (int signo, siginfo_t *info, void *ignored)
-{
-  if (tls_data != 0xdeadbeef)
-    {
-      write (STDOUT_FILENO, "wrong TLS value\n", 17);
-      _exit (1);
-    }
-
-  /* arbitrary choice, just write something unique-ish. */
-  tls_data = (intptr_t) info;
-}

Modified: fsf/trunk/libc/ports/ChangeLog.microblaze
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.microblaze (original)
+++ fsf/trunk/libc/ports/ChangeLog.microblaze Thu Feb  6 00:01:55 2014
@@ -2,11 +2,6 @@
 
 	* sysdeps/microblaze/libm-test-ulps: Update.
 	* sysdeps/microblaze/libm-test-ulps_new: Delete redundant file.
-
-2014-02-04  David Holsgrove <david.holsgrove@xxxxxxxxxx>
-
-	[BZ #15705]
-	* sysdeps/unix/sysv/linux/microblaze/mmap64.c: New file.
 
 2014-02-04  David Holsgrove <david.holsgrove@xxxxxxxxxx>
 

Removed: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/microblaze/mmap64.c (removed)
@@ -1,4 +1,0 @@
-/* Microblaze kernel has PAGE_SHIFT set to 12.
-   Determine the shift dynamically with getpagesize.  */
-#define MMAP2_PAGE_SHIFT -1
-#include <sysdeps/unix/sysv/linux/mmap64.c>

Modified: fsf/trunk/libc/sysdeps/generic/ldsodefs.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/ldsodefs.h (original)
+++ fsf/trunk/libc/sysdeps/generic/ldsodefs.h Thu Feb  6 00:01:55 2014
@@ -233,11 +233,6 @@
 /* Compute next higher prime number.  */
 extern unsigned long int _dl_higher_prime_number (unsigned long int n)
      internal_function;
-
-/* Mask every signal, returning the previous sigmask in OLD.  */
-extern void _dl_mask_all_signals (sigset_t *old) internal_function;
-/* Undo _dl_mask_all_signals.  */
-extern void _dl_unmask_signals (sigset_t *old) internal_function;
 
 /* Function used as argument for `_dl_receive_error' function.  The
    arguments are the error code, error string, and the objname the
@@ -989,17 +984,6 @@
 extern void *_dl_allocate_tls_init (void *) internal_function;
 rtld_hidden_proto (_dl_allocate_tls_init)
 
-/* Remove all allocated dynamic TLS regions from a DTV
-   for reuse by new thread.  */
-extern void _dl_clear_dtv (dtv_t *dtv) internal_function;
-rtld_hidden_proto (_dl_clear_dtv)
-
-extern void *__signal_safe_memalign (size_t boundary, size_t size);
-extern void *__signal_safe_malloc (size_t size);
-extern void __signal_safe_free (void *ptr);
-extern void *__signal_safe_realloc (void *ptr, size_t size);
-extern void *__signal_safe_calloc (size_t nmemb, size_t size);
-
 /* Deallocate memory allocated with _dl_allocate_tls.  */
 extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb) internal_function;
 rtld_hidden_proto (_dl_deallocate_tls)

Modified: fsf/trunk/libc/sysdeps/mach/hurd/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/dl-sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/dl-sysdep.h Thu Feb  6 00:01:55 2014
@@ -29,10 +29,3 @@
 # define DL_ARGV_NOT_RELRO 1
 # define LIBC_STACK_END_NOT_RELRO 1
 #endif
-
-#include <signal.h>
-inline void _dl_mask_all_signals (sigset_t *) internal_function;
-inline void _dl_mask_all_signals (sigset_t *) { }
-
-inline void _dl_unmask_all_signals (sigset_t *) internal_function;
-inline void _dl_unmask_all_signals (sigset_t *) { }

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.c Thu Feb  6 00:01:55 2014
@@ -19,7 +19,6 @@
 /* Linux needs some special initialization, but otherwise uses
    the generic dynamic linker system interface code.  */
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -131,48 +130,3 @@
 
   return version;
 }
-
-/* Mask every signal, returning the previous sigmask in OLD.  */
-void
-internal_function
-_dl_mask_all_signals (sigset_t *old)
-{
-  int ret;
-  sigset_t new;
-
-  sigfillset (&new);
-
-  /* This function serves as a replacement to pthread_sigmask, which
-     isn't available from within the dynamic linker since it would require
-     linking with libpthread. We duplicate some of the functionality here
-     to avoid requiring libpthread.  This isn't quite identical to
-     pthread_sigmask in that we do not mask internal signals used for
-     cancellation and setxid handling. This disables asynchronous
-     cancellation for the duration the signals are disabled, but it's a
-     small window, and prevents any problems with the use of TLS variables
-     in the signal handlers that would have executed.  */
-
-  /* It's very important we don't touch errno here, as that's TLS; since this
-     gets called from get_tls_addr we might end up recursing.  */
-
-  INTERNAL_SYSCALL_DECL (err);
-
-  ret = INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &new, old,
-			  _NSIG / 8);
-
-  assert (ret == 0);
-}
-
-/* Return sigmask to what it was before a call to _dl_mask_all_signals.  */
-void
-internal_function
-_dl_unmask_signals (sigset_t *old)
-{
-  int ret;
-  INTERNAL_SYSCALL_DECL (err);
-
-  ret = INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, old, NULL,
-			  _NSIG / 8);
-
-  assert (ret == 0);
-}

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h Thu Feb  6 00:01:55 2014
@@ -30,8 +30,4 @@
 /* Get version of the OS.  */
 extern int _dl_discover_osversion (void) attribute_hidden;
 # define HAVE_DL_DISCOVER_OSVERSION	1
-
-#include <signal.h>
-void _dl_mask_all_signals (sigset_t *) internal_function;
-void _dl_unmask_all_signals (sigset_t *) internal_function;
 #endif

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/kernel-features.h Thu Feb  6 00:01:55 2014
@@ -202,6 +202,12 @@
 # define __ASSUME_RECVMMSG	1
 #endif
 
+/* Support for /proc/self/task/$tid/comm and /proc/$pid/task/$tid/comm was
+   added in 2.6.33.  */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_PROC_PID_TASK_COMM	1
+#endif
+
 /* statfs fills in f_flags since 2.6.36.  */
 #if __LINUX_KERNEL_VERSION >= 0x020624
 # define __ASSUME_STATFS_F_FLAGS	1

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits