From e1e46622ac0fce73d802fa4a8a2e83cc25cd9e7a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 14 Feb 2015 23:04:02 -0600
Subject: Revert "resolve merge"

This reverts commit 6b6ede3d15f04fe825cfa9f697507457e3640344.
---
 libpthread/linuxthreads_db/td_ta_thr_iter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libpthread/linuxthreads_db/td_ta_thr_iter.c')

diff --git a/libpthread/linuxthreads_db/td_ta_thr_iter.c b/libpthread/linuxthreads_db/td_ta_thr_iter.c
index da230096f..35a2e7834 100644
--- a/libpthread/linuxthreads_db/td_ta_thr_iter.c
+++ b/libpthread/linuxthreads_db/td_ta_thr_iter.c
@@ -18,6 +18,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include "thread_dbP.h"
+#include <linuxthreads/internals.h>
 #include <alloca.h>
 
 static int
@@ -38,7 +39,9 @@ handle_descr (const td_thragent_t *ta, td_thr_iter_f *callback,
 	  memset (&pds, '\0', sizeof (pds));
 
 	  /* Empty thread descriptor the thread library would create.  */
-	  pds.p_self = &pds;
+#if !defined __UCLIBC_HAS_TLS__ || !TLS_DTV_AT_TP
+	  pds.p_header.data.self = &pds;
+#endif
 	  pds.p_nextlive = pds.p_prevlive = &pds;
 	  pds.p_tid = PTHREAD_THREADS_MAX;
 	  /* The init code also sets up p_lock, p_errnop, p_herrnop, and
-- 
cgit v1.2.3