Module Name: src
Committed By: joerg
Date: Fri Feb 25 14:32:38 UTC 2011
Modified Files:
src/lib/libpthread: pthread_int.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/lib/libpthread/pthread_int.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread_int.h
diff -u src/lib/libpthread/pthread_int.h:1.74 src/lib/libpthread/pthread_int.h:1.75
--- src/lib/libpthread/pthread_int.h:1.74 Thu Feb 24 04:28:43 2011
+++ src/lib/libpthread/pthread_int.h Fri Feb 25 14:32:38 2011
@@ -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 @@
} while (/*CONSTCOND*/0)
-#ifdef __HAVE___LWP_GETPRIVATE_FAST
+#if 0 && defined(__HAVE___LWP_GETPRIVATE_FAST)
static inline pthread_t __constfunc
pthread__self(void)
{
