diff options
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 19 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/generic/dl-support.c | 73 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/mips/Makefile | 4 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/mips/dl-support.c | 1 |
4 files changed, 92 insertions, 5 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 6f74e39e8..5c1560d1b 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -42,6 +42,7 @@ extern void weak_function _locale_init(void); #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 @@ __uClibc_main(int (*main)(int, char **, char **), int argc, 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 @@ __uClibc_main(int (*main)(int, char **, char **), int argc, 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; diff --git a/libpthread/nptl/sysdeps/generic/dl-support.c b/libpthread/nptl/sysdeps/generic/dl-support.c new file mode 100644 index 000000000..4d8ea6f8d --- /dev/null +++ b/libpthread/nptl/sysdeps/generic/dl-support.c @@ -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); +} diff --git a/libpthread/nptl/sysdeps/mips/Makefile b/libpthread/nptl/sysdeps/mips/Makefile index 2528194f3..949885073 100644 --- a/libpthread/nptl/sysdeps/mips/Makefile +++ b/libpthread/nptl/sysdeps/mips/Makefile @@ -21,6 +21,8 @@ TOPDIR=../../../../ 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 @@ $(AOBJ-LIBP-SH): %.os : %.S $(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) diff --git a/libpthread/nptl/sysdeps/mips/dl-support.c b/libpthread/nptl/sysdeps/mips/dl-support.c new file mode 100644 index 000000000..528ffffc5 --- /dev/null +++ b/libpthread/nptl/sysdeps/mips/dl-support.c @@ -0,0 +1 @@ +#include <sysdeps/generic/dl-support.c> |