svn commit: branches/uClibc-nptl: libc/misc/internals libpthread/nptl/sysd etc...
sjhill at uclibc.org
sjhill at uclibc.org
Tue Aug 30 04:42:15 UTC 2005
Author: sjhill
Date: 2005-08-29 21:42:13 -0700 (Mon, 29 Aug 2005)
New Revision: 11288
Log:
Add in calls needed for TLS setup for statically linked applications. A call is made to '_dl_aux_init' which is defined in 'dl-support.c' to set up TLS variables before '__uClibc_init' gets called.
Added:
branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-support.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c
Modified:
branches/uClibc-nptl/libc/misc/internals/__uClibc_main.c
branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile
Changeset:
Modified: branches/uClibc-nptl/libc/misc/internals/__uClibc_main.c
===================================================================
--- branches/uClibc-nptl/libc/misc/internals/__uClibc_main.c 2005-08-30 04:37:35 UTC (rev 11287)
+++ branches/uClibc-nptl/libc/misc/internals/__uClibc_main.c 2005-08-30 04:42:13 UTC (rev 11288)
@@ -42,6 +42,7 @@
#endif
#ifdef __UCLIBC_HAS_THREADS__
extern void weak_function __pthread_initialize_minimal(void);
+extern void weak_function _dl_aux_init(ElfW(auxv_t) *);
#endif
@@ -175,10 +176,6 @@
ElfW(auxv_t) auxvt[AT_EGID + 1];
#endif
__libc_stack_end = stack_end;
- /* We need to initialize uClibc. If we are dynamically linked this
- * may have already been completed by the shared lib loader. We call
- * __uClibc_init() regardless, to be sure the right thing happens. */
- __uClibc_init();
__rtld_fini = rtld_fini;
@@ -207,6 +204,20 @@
aux_dat += 2;
}
+#ifdef __UCLIBC_HAS_THREADS__
+ /*
+ * Before we can make any pthread calls, we have to do some
+ * some TLS setup. This call may do more in the future.
+ */
+ if (likely(_dl_aux_init != NULL))
+ _dl_aux_init(auxvt);
+#endif
+
+ /* We need to initialize uClibc. If we are dynamically linked this
+ * may have already been completed by the shared lib loader. We call
+ * __uClibc_init() regardless, to be sure the right thing happens. */
+ __uClibc_init();
+
/* Make certain getpagesize() gives the correct answer */
__pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
Added: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-support.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-support.c 2005-08-30 04:37:35 UTC (rev 11287)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-support.c 2005-08-30 04:42:13 UTC (rev 11288)
@@ -0,0 +1,73 @@
+/* Support for dynamic linking code in static libc.
+ Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+/* This file defines some things that for the dynamic linker are defined in
+ rtld.c and dl-sysdep.c in ways appropriate to bootstrap dynamic linking. */
+
+#include <assert.h>
+#include <tls.h>
+#include <link.h>
+#include <ldsodefs.h>
+#include <string.h>
+
+void (*_dl_init_static_tls) (struct link_map *) = &_dl_nothread_init_static_tls;
+
+ElfW(Phdr) *_dl_phdr;
+size_t _dl_phnum;
+
+void
+internal_function
+_dl_aux_init (ElfW(auxv_t) *av)
+{
+ for (; av->a_type != AT_NULL; ++av)
+ switch (av->a_type)
+ {
+ case AT_PHDR:
+ GL(dl_phdr) = (void *) av->a_un.a_val;
+ break;
+ case AT_PHNUM:
+ GL(dl_phnum) = av->a_un.a_val;
+ break;
+ }
+}
+
+/* Initialize static TLS area and DTV for current (only) thread.
+ libpthread implementations should provide their own hook
+ to handle all threads. */
+void
+_dl_nothread_init_static_tls (struct link_map *map)
+{
+# if TLS_TCB_AT_TP
+ void *dest = (char *) THREAD_SELF - map->l_tls_offset;
+# elif TLS_DTV_AT_TP
+ void *dest = (char *) THREAD_SELF + map->l_tls_offset + TLS_PRE_TCB_SIZE;
+# else
+# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
+# endif
+
+ /* Fill in the DTV slot so that a later LD/GD access will find it. */
+ dtv_t *dtv = THREAD_DTV ();
+ assert (map->l_tls_modid <= dtv[-1].counter);
+ dtv[map->l_tls_modid].pointer.val = dest;
+ dtv[map->l_tls_modid].pointer.is_static = true;
+
+ /* Initialize the memory. */
+ memset (__mempcpy (dest, map->l_tls_initimage, map->l_tls_initimage_size),
+ '\0', map->l_tls_blocksize - map->l_tls_initimage_size);
+}
Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile 2005-08-30 04:37:35 UTC (rev 11287)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/Makefile 2005-08-30 04:42:13 UTC (rev 11288)
@@ -21,6 +21,8 @@
include $(TOPDIR)Rules.mak
include ../../Rules.mak
+CFLAGS-dl-support.c = -D_GNU_SOURCE
+
COBJ-LIBC-ST = $(patsubst %.c, %.o, $(wildcard *.c))
AOBJ-LIBP-ST = $(patsubst %.S, %.o, $(wildcard *.S))
@@ -43,7 +45,7 @@
$(CC) $(ASFLAGS) $(ASFLAGS-NPTL) -DSHARED -c $< -o $@
$(COBJ-LIBC-ST): %.o : %.c
- $(CC) $(CFLAGS-LIBC) -c $< -o $@
+ $(CC) $(CFLAGS-LIBC) $(CFLAGS-$<) -c $< -o $@
objs-pthread-libc: $(COBJ-LIBC-ST)
ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
Added: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c 2005-08-30 04:37:35 UTC (rev 11287)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/dl-support.c 2005-08-30 04:42:13 UTC (rev 11288)
@@ -0,0 +1 @@
+#include <sysdeps/generic/dl-support.c>
More information about the uClibc-cvs
mailing list