svn commit: trunk/uClibc/libpthread/linuxthreads: sysdeps/pthread
psm at uclibc.org
psm at uclibc.org
Fri Mar 24 13:45:04 UTC 2006
Author: psm
Date: 2006-03-24 05:45:02 -0800 (Fri, 24 Mar 2006)
New Revision: 14648
Log:
Now new linuxthreads builds w/ SHARED
Modified:
trunk/uClibc/libpthread/linuxthreads/ptfork.c
trunk/uClibc/libpthread/linuxthreads/pthread.c
trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
Changeset:
Modified: trunk/uClibc/libpthread/linuxthreads/ptfork.c
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/ptfork.c 2006-03-24 13:43:37 UTC (rev 14647)
+++ trunk/uClibc/libpthread/linuxthreads/ptfork.c 2006-03-24 13:45:02 UTC (rev 14648)
@@ -78,7 +78,8 @@
return pid;
}
-#ifdef SHARED
+/* psm: have no idea why these are here, sjhill? */
+#if 0 /*def SHARED*/
pid_t __fork (void)
{
return __libc_fork ();
Modified: trunk/uClibc/libpthread/linuxthreads/pthread.c
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/pthread.c 2006-03-24 13:43:37 UTC (rev 14647)
+++ trunk/uClibc/libpthread/linuxthreads/pthread.c 2006-03-24 13:45:02 UTC (rev 14648)
@@ -449,7 +449,9 @@
}
}
-#ifdef SHARED
+/* psm: we do not have any ld.so support yet
+ * remove the USE_TLS guard if nptl is added */
+#if defined SHARED && defined USE_TLS
# if USE___THREAD
/* When using __thread for this, we do it in libc so as not
to give libpthread its own TLS segment just for this. */
@@ -587,7 +589,9 @@
/* How many processors. */
__pthread_smp_kernel = is_smp_system ();
-#ifdef SHARED
+/* psm: we do not have any ld.so support yet
+ * remove the USE_TLS guard if nptl is added */
+#if defined SHARED && defined USE_TLS
/* Transfer the old value from the dynamic linker's internal location. */
*__libc_dl_error_tsd () = *(*GL(dl_error_catch_tsd)) ();
GL(dl_error_catch_tsd) = &__libc_dl_error_tsd;
Modified: trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h 2006-03-24 13:43:37 UTC (rev 14647)
+++ trunk/uClibc/libpthread/linuxthreads/sysdeps/pthread/uClibc-glue.h 2006-03-24 13:45:02 UTC (rev 14648)
@@ -29,14 +29,6 @@
#define __libc_current_sigrtmin_private __libc_current_sigrtmin
#define __clone clone
-/* taken from ldsodefs.h, modified */
-#ifdef SHARED
-# define GL(name) _##name
-void (*_dl_rtld_lock_recursive) (void *);
-void (*_dl_rtld_unlock_recursive) (void *);
-void **(*_dl_error_catch_tsd) (void) __attribute__ ((const));
-#endif
-
extern void *__libc_stack_end;
extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
More information about the uClibc-cvs
mailing list