[Glibc-bsd-commits] r6156 - in trunk/glibc-ports-2.25: fbtl kfreebsd/i386

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2017-08-04 11:46:31 +0000 (Fri, 04 Aug 2017)
New Revision: 6156

Modified:
   trunk/glibc-ports-2.25/fbtl/nptl-init.c
   trunk/glibc-ports-2.25/kfreebsd/i386/localplt.data
Log:
Merge from upstream: Implement _dl_catch_error, _dl_signal_error in libc.so [BZ #16628]

Upstream commit 9e78f6f6e7134a5f299cc8de77370218f8019237



Modified: trunk/glibc-ports-2.25/fbtl/nptl-init.c
===================================================================
--- trunk/glibc-ports-2.25/fbtl/nptl-init.c	2017-08-04 01:42:12 UTC (rev 6155)
+++ trunk/glibc-ports-2.25/fbtl/nptl-init.c	2017-08-04 11:46:31 UTC (rev 6156)
@@ -433,10 +433,6 @@
   lll_unlock (__default_pthread_attr_lock, LLL_PRIVATE);
 
 #ifdef SHARED
-  /* Transfer the old value from the dynamic linker's internal location.  */
-  *__libc_dl_error_tsd () = *(*GL(dl_error_catch_tsd)) ();
-  GL(dl_error_catch_tsd) = &__libc_dl_error_tsd;
-
   /* Make __rtld_lock_{,un}lock_recursive use pthread_mutex_{,un}lock,
      keep the lock count from the ld.so implementation.  */
   GL(dl_rtld_lock_recursive) = (void *) __pthread_mutex_lock;

Modified: trunk/glibc-ports-2.25/kfreebsd/i386/localplt.data
===================================================================
--- trunk/glibc-ports-2.25/kfreebsd/i386/localplt.data	2017-08-04 01:42:12 UTC (rev 6155)
+++ trunk/glibc-ports-2.25/kfreebsd/i386/localplt.data	2017-08-04 11:46:31 UTC (rev 6156)
@@ -17,3 +17,6 @@
 ld.so: calloc
 ld.so: realloc
 ld.so: free + REL R_386_GLOB_DAT
+# The TLS-enabled version of these functions is interposed from libc.so.
+ld.so: _dl_signal_error + REL R_386_GLOB_DAT
+ld.so: _dl_catch_error + REL R_386_GLOB_DAT