summaryrefslogtreecommitdiff
path: root/lib/libpthread
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2011-02-25 14:32:38 +0000
committerjoerg <joerg@NetBSD.org>2011-02-25 14:32:38 +0000
commitefcb7ebbef22e0dce68399deb9dd8827023113db (patch)
treeb9a8d6c293030aca74021b18d356b14f9971abb2 /lib/libpthread
parente9b8177004e4538401feb406b6091b7f00189e29 (diff)
Back out using the thread register (if present) for now.
libgcc_s's __register_frame_info gets called from libc's CSU code before the libc constructors are run. __register_frame_info in turn calls pthread_mutex_lock. libpthread is not initialised at this point and therefore pthread__self() traps when deferencing the thread register. This worked before because the garbage from pthread__self() is effectively ignored.
Diffstat (limited to 'lib/libpthread')
-rw-r--r--lib/libpthread/pthread_int.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libpthread/pthread_int.h b/lib/libpthread/pthread_int.h
index 6ce97c4f918..7436bc34c5e 100644
--- a/lib/libpthread/pthread_int.h
+++ b/lib/libpthread/pthread_int.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_int.h,v 1.74 2011/02/24 04:28:43 joerg Exp $ */
+/* $NetBSD: pthread_int.h,v 1.75 2011/02/25 14:32:38 joerg Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -250,7 +250,7 @@ int pthread__find(pthread_t) PTHREAD_HIDE;
} while (/*CONSTCOND*/0)
-#ifdef __HAVE___LWP_GETPRIVATE_FAST
+#if 0 && defined(__HAVE___LWP_GETPRIVATE_FAST)
static inline pthread_t __constfunc
pthread__self(void)
{