[glibc] htl: Drop common tcbhead_t definition

Samuel Thibault sthibaul@sourceware.org
Sat Jan 4 17:52:00 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=12e166dd80bd3056f667930719572017d25a79c4

commit 12e166dd80bd3056f667930719572017d25a79c4
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Jan 4 18:52:00 2020 +0100

    htl: Drop common tcbhead_t definition
    
    This would conflict when including pt-internal.h outside libpthread, while
    we can actually just include <tls.h>

Diff:
---
 htl/pt-internal.h | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index ebe7f43..8754f38 100644
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -37,6 +37,8 @@
 # include <ldsodefs.h>
 #endif
 
+#include <tls.h>
+
 /* Thread state.  */
 enum pthread_state
 {
@@ -58,16 +60,6 @@ enum pthread_state
 # define PTHREAD_SYSDEP_MEMBERS
 #endif
 
-#if !(IS_IN (libpthread))
-/* Type of the TCB.  */
-typedef struct
-{
-  void *tcb;			/* Points to this structure.  */
-  void *dtv;			/* Vector of pointers to TLS data.  */
-  thread_t self;		/* This thread's control port.  */
-} tcbhead_t;
-#endif /* ! IS_IN (libpthread) */
-
 /* This structure describes a POSIX thread.  */
 struct __pthread
 {



More information about the Glibc-cvs mailing list