[Glibc-bsd-commits] r4502 - trunk/glibc-ports/linuxthreads_db

[Petr Salinger]

Author: ps-guest
Date: 2013-05-30 15:00:11 +0000 (Thu, 30 May 2013)
New Revision: 4502

Modified:
   trunk/glibc-ports/linuxthreads_db/td_ta_thr_iter.c
   trunk/glibc-ports/linuxthreads_db/td_thr_tls_get_addr.c
   trunk/glibc-ports/linuxthreads_db/td_thr_tlsbase.c
Log:
USE_TLS is mandatory


Modified: trunk/glibc-ports/linuxthreads_db/td_ta_thr_iter.c
===================================================================
--- trunk/glibc-ports/linuxthreads_db/td_ta_thr_iter.c	2013-05-30 14:29:43 UTC (rev 4501)
+++ trunk/glibc-ports/linuxthreads_db/td_ta_thr_iter.c	2013-05-30 15:00:11 UTC (rev 4502)
@@ -40,7 +40,7 @@
 	  memset (&pds, '\0', sizeof (pds));
 
 	  /* Empty thread descriptor the thread library would create.  */
-#if !defined USE_TLS || !TLS_DTV_AT_TP
+#if !TLS_DTV_AT_TP
 	  pds.p_header.data.self = &pds;
 #endif
 	  pds.p_nextlive = pds.p_prevlive = &pds;

Modified: trunk/glibc-ports/linuxthreads_db/td_thr_tls_get_addr.c
===================================================================
--- trunk/glibc-ports/linuxthreads_db/td_thr_tls_get_addr.c	2013-05-30 14:29:43 UTC (rev 4501)
+++ trunk/glibc-ports/linuxthreads_db/td_thr_tls_get_addr.c	2013-05-30 15:00:11 UTC (rev 4502)
@@ -27,7 +27,6 @@
 		     size_t offset __attribute__ ((unused)),
 		     void **address __attribute__ ((unused)))
 {
-#if USE_TLS
   /* Read the module ID from the link_map.  */
   size_t modid;
   if (ps_pdread (th->th_ta_p->ph,
@@ -39,7 +38,4 @@
   if (result == TD_OK)
     *address += offset;
   return result;
-#else
-  return TD_ERR;
-#endif
 }

Modified: trunk/glibc-ports/linuxthreads_db/td_thr_tlsbase.c
===================================================================
--- trunk/glibc-ports/linuxthreads_db/td_thr_tlsbase.c	2013-05-30 14:29:43 UTC (rev 4501)
+++ trunk/glibc-ports/linuxthreads_db/td_thr_tlsbase.c	2013-05-30 15:00:11 UTC (rev 4502)
@@ -30,7 +30,6 @@
   if (modid < 1)
     return TD_NOTLS;
 
-#if USE_TLS
   union dtv pdtv, *dtvp;
 
   LOG ("td_thr_tlsbase");
@@ -65,7 +64,4 @@
   *base = (char *) pdtv.pointer.val;
 
   return TD_OK;
-#else
-  return TD_ERR;
-#endif
 }