[Glibc-bsd-commits] r5949 - trunk/glibc-ports-2.23/fbtl/sysdeps/pthread

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-19 23:42:00 +0000 (Sat, 19 Mar 2016)
New Revision: 5949

Modified:
   trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h
Log:
Merge from upstream:

commit 6782806d8f6664d87d17bb30f8ce4e0c7c931e17
Author: Florian Weimer <fweimer at redhat.com>
Date:   Sat Oct 17 12:06:48 2015 +0200

    malloc: Rewrite with explicit TLS access using __thread



Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h	2016-03-19 23:40:07 UTC (rev 5948)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/pthread/malloc-machine.h	2016-03-19 23:42:00 UTC (rev 5949)
@@ -58,16 +58,6 @@
   __linkin_atfork (&atfork_mem)
 #endif
 
-/* thread specific data for glibc */
-
-#include <libc-tsd.h>
-
-typedef int tsd_key_t[1];	/* no key data structure, libc magic does it */
-__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 (void *, MALLOC, (data))
-#define tsd_getspecific(key, vptr)	((vptr) = __libc_tsd_get (void *, MALLOC))
-
 #include <sysdeps/generic/malloc-machine.h>
 
 #endif /* !defined(_MALLOC_MACHINE_H) */