summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-11-30 04:11:00 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2016-11-30 04:11:00 (GMT)
commited10e944ac7f9b4d55dc130987274a2799a115b1 (patch)
treea5860247a23ebe9ac64f26dab6327a8c306776b6
parent43a336e63f16c639e0e6fefdd7404509159c07b1 (diff)
NONTLS_INIT_TP is never defined, remove dead code
-rw-r--r--libpthread/linuxthreads/sysdeps/ia64/tls.h20
-rw-r--r--libpthread/nptl/sysdeps/generic/libc-tls.c11
2 files changed, 0 insertions, 31 deletions
diff --git a/libpthread/linuxthreads/sysdeps/ia64/tls.h b/libpthread/linuxthreads/sysdeps/ia64/tls.h
index a78f0ec..ffc8f77 100644
--- a/libpthread/linuxthreads/sysdeps/ia64/tls.h
+++ b/libpthread/linuxthreads/sysdeps/ia64/tls.h
@@ -113,26 +113,6 @@ typedef struct
# endif
-#else
-
-# ifndef __ASSEMBLER__
-
-typedef struct
-{
- void *tcb;
- dtv_t *dtv;
- void *self;
- int multiple_threads;
-} tcbhead_t;
-
-# define NONTLS_INIT_TP \
- do { \
- static const tcbhead_t nontls_init_tp = { .multiple_threads = 0 }; \
- __thread_self = (__typeof (__thread_self)) &nontls_init_tp; \
- } while (0)
-
-#endif
-
#endif /* USE_TLS */
#endif /* tls.h */
diff --git a/libpthread/nptl/sysdeps/generic/libc-tls.c b/libpthread/nptl/sysdeps/generic/libc-tls.c
index c7bd347..58e77ff 100644
--- a/libpthread/nptl/sysdeps/generic/libc-tls.c
+++ b/libpthread/nptl/sysdeps/generic/libc-tls.c
@@ -252,15 +252,4 @@ __pthread_initialize_minimal (void)
__libc_setup_tls (TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN);
}
-#elif defined NONTLS_INIT_TP
-
-/* This is the minimal initialization function used when libpthread is
- not used. */
-void
-__attribute__ ((weak))
-__pthread_initialize_minimal (void)
-{
- NONTLS_INIT_TP;
-}
-
#endif