[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r2809 - in /fsf/glibc-2_6-branch/libc: ./ dlfcn/ elf/ include/ malloc/ math/ nis/ nptl/ nptl/sysdeps/alpha/ nptl/sysdeps/i38...
- To: commits@xxxxxxxxxx
- Subject: [commits] r2809 - in /fsf/glibc-2_6-branch/libc: ./ dlfcn/ elf/ include/ malloc/ math/ nis/ nptl/ nptl/sysdeps/alpha/ nptl/sysdeps/i38...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 13 Jul 2007 07:05:15 -0000
Author: eglibc
Date: Fri Jul 13 00:05:15 2007
New Revision: 2809
Log:
Import glibc-2.6 for 2007-07-13
Added:
fsf/glibc-2_6-branch/libc/nptl/tst-robust9.c
fsf/glibc-2_6-branch/libc/nptl/tst-robustpi9.c
fsf/glibc-2_6-branch/libc/nptl/tst-sem10.c
fsf/glibc-2_6-branch/libc/stdio-common/bug18.c
fsf/glibc-2_6-branch/libc/stdio-common/bug18a.c
fsf/glibc-2_6-branch/libc/stdio-common/bug19.c
fsf/glibc-2_6-branch/libc/stdio-common/bug19a.c
fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf2.c
fsf/glibc-2_6-branch/libc/sysdeps/ia64/ldbl2mpn.c
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/epoll_pwait.c
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/i386/epoll_pwait.S
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/cacheinfo.c
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/fpu/k_cosl.c
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/fpu/k_rem_pio2l.c
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/fpu/k_sinl.c
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/fpu/k_tanl.c
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/ldbl2mpn.c
Modified:
fsf/glibc-2_6-branch/libc/ChangeLog
fsf/glibc-2_6-branch/libc/dlfcn/dlinfo.c
fsf/glibc-2_6-branch/libc/elf/dl-addr.c
fsf/glibc-2_6-branch/libc/elf/dl-close.c
fsf/glibc-2_6-branch/libc/elf/dl-iteratephdr.c
fsf/glibc-2_6-branch/libc/elf/dl-load.c
fsf/glibc-2_6-branch/libc/elf/dl-lookup.c
fsf/glibc-2_6-branch/libc/elf/dl-minimal.c
fsf/glibc-2_6-branch/libc/elf/dl-object.c
fsf/glibc-2_6-branch/libc/elf/dl-open.c
fsf/glibc-2_6-branch/libc/elf/dl-runtime.c
fsf/glibc-2_6-branch/libc/elf/dl-support.c
fsf/glibc-2_6-branch/libc/elf/dl-sym.c
fsf/glibc-2_6-branch/libc/elf/dl-sysdep.c
fsf/glibc-2_6-branch/libc/elf/do-lookup.h
fsf/glibc-2_6-branch/libc/elf/rtld.c
fsf/glibc-2_6-branch/libc/include/link.h
fsf/glibc-2_6-branch/libc/malloc/Makefile
fsf/glibc-2_6-branch/libc/malloc/arena.c
fsf/glibc-2_6-branch/libc/malloc/hooks.c
fsf/glibc-2_6-branch/libc/malloc/malloc.c
fsf/glibc-2_6-branch/libc/malloc/mcheck.c
fsf/glibc-2_6-branch/libc/math/test-misc.c
fsf/glibc-2_6-branch/libc/nis/nss-default.c
fsf/glibc-2_6-branch/libc/nptl/ChangeLog
fsf/glibc-2_6-branch/libc/nptl/Makefile
fsf/glibc-2_6-branch/libc/nptl/allocatestack.c
fsf/glibc-2_6-branch/libc/nptl/descr.h
fsf/glibc-2_6-branch/libc/nptl/init.c
fsf/glibc-2_6-branch/libc/nptl/pthreadP.h
fsf/glibc-2_6-branch/libc/nptl/pthread_getattr_np.c
fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_lock.c
fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_timedlock.c
fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_trylock.c
fsf/glibc-2_6-branch/libc/nptl/sysdeps/alpha/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/i386/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/ia64/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/powerpc/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/s390/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/sh/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/sparc/tls.h
fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
fsf/glibc-2_6-branch/libc/nptl/sysdeps/x86_64/tls.h
fsf/glibc-2_6-branch/libc/nscd/nscd_helper.c
fsf/glibc-2_6-branch/libc/rt/tst-shm.c
fsf/glibc-2_6-branch/libc/stdio-common/Makefile
fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf.c
fsf/glibc-2_6-branch/libc/stdio-common/vfprintf.c
fsf/glibc-2_6-branch/libc/stdio-common/vfscanf.c
fsf/glibc-2_6-branch/libc/sysdeps/generic/ldsodefs.h
fsf/glibc-2_6-branch/libc/sysdeps/i386/ldbl2mpn.c
fsf/glibc-2_6-branch/libc/sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c
fsf/glibc-2_6-branch/libc/sysdeps/ieee754/ldbl-128ibm/printf_fphex.c
fsf/glibc-2_6-branch/libc/sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c
fsf/glibc-2_6-branch/libc/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/Makefile
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/i386/sync_file_range.S
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/syscalls.list
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h
fsf/glibc-2_6-branch/libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/Makefile
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/memcpy.S
fsf/glibc-2_6-branch/libc/sysdeps/x86_64/mempcpy.S
Modified: fsf/glibc-2_6-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_6-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_6-branch/libc/ChangeLog Fri Jul 13 00:05:15 2007
@@ -1,3 +1,242 @@
+2007-06-04 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * math/test-misc.c (main): Don't run last batch of tests with
+ IBM long double format.
+
+2007-07-07 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #4745]
+ * stdio-common/vfscanf.c (_IO_vfscanf): Add additional test for EOF
+ in loop to look for conversion specifier to avoid testing of
+ wrong errno value.
+ * stdio-common/Makefile (tests): Add bug18, bug18a, bug19, bug19a.
+ * stdio-common/bug18.c: New file.
+ * stdio-common/bug18a.c: New file.
+ * stdio-common/bug19.c: New file.
+ * stdio-common/bug19a.c: New file.
+
+2007-06-06 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ [BZ #4586]
+ * sysdeps/i386/ldbl2mpn.c (__mpn_extract_long_double): Treat
+ pseudo-zeros as zero.
+ * sysdeps/x86_64/ldbl2mpn.c: New file.
+ * sysdeps/ia64/ldbl2mpn.c: New file.
+
+2007-07-01 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * elf/dl-sysdep.c (_dl_important_hwcaps): Add integer overflow check.
+ * elf/dl-minimal.c (__libc_memalign): Likewise. Handle malloc (0).
+ Return NULL if mmap failed instead of asserting it does not.
+ (calloc): Check for integer overflow.
+
+ * elf/dl-minimal.c (__strtoul_internal): Fix parsing of numbers bigger
+ than LONG_MAX / 10.
+
+2007-07-03 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ [BZ #4702]
+ * nis/nss-default.c: Include errno.h.
+ (init): Preserve errno.
+
+2007-06-19 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/generic/ldsodefs.h (rtld_global): Reorder some elements
+ to fill in holes
+ (rtld_global_ro): Likewise.
+
+2007-06-18 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * elf/dl-addr.c (_dl_addr): Skip PT_LOAD checking if l_contiguous.
+ Move PT_LOAD checking to...
+ (_dl_addr_inside_object): ... here, new function.
+ * elf/dl-sym.c (do_sym): If not l_contiguous,
+ call _dl_addr_inside_object.
+ * elf/dl-iteratephdr.c (__dl_iterate_phdr): Likewise.
+ * dlfcn/dlinfo.c (dlinfo_doit): Likewise.
+ * elf/dl-open.c (dl_open_worker): Likewise.
+ (_dl_addr_inside_object): New function if IS_IN_rtld.
+ * elf/dl-load.c (_dl_map_object_from_fd): Set l_contiguous if no
+ holes are present or are PROT_NONE protected.
+ * include/link.h (struct link_map): Add l_contiguous field.
+ * sysdeps/generic/ldsodefs.h (_dl_addr_inside_object): New prototype.
+
+2007-06-18 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * elf/rtld.c (dl_main): Don't call init_tls more than once.
+
+2007-06-19 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * elf/dl-close.c (free_mem): Free _dl_scope_free_list.
+
+2007-06-13 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * include/link.h: Don't include rtld-lowlevel.h.
+ (struct link_map): Remove l_scope_lock.
+ * sysdeps/generic/ldsodefs.h: Don't include rtld-lowlevel.h.
+ (_dl_scope_free_list): New field (variable) in _rtld_global.
+ (DL_LOOKUP_SCOPE_LOCK): Remove.
+ (_dl_scope_free): New prototype.
+ * elf/dl-runtime.c (_dl_fixup): Don't use __rtld_mrlock_*lock.
+ Don't pass DL_LOOKUP_SCOPE_LOCK to _dl_lookup_symbol_x.
+ (_dl_profile_fixup): Likewise.
+ * elf/dl-sym.c (do_sym): Likewise. Use wrapped _dl_lookup_symbol_x
+ whenever !RTLD_SINGLE_THREAD_P, use THREAD_GSCOPE_SET_FLAG and
+ THREAD_GSCOPE_RESET_FLAG around it.
+ * elf/dl-close.c (_dl_close_worker): Don't use
+ __rtld_mrlock_{change,done}. Call _dl_scope_free on the old
+ scope. Make sure THREAD_GSCOPE_WAIT () happens if any old
+ scopes were queued or if l_scope_mem has been abandoned.
+ * elf/dl-open.c (_dl_scope_free): New function.
+ (dl_open_worker): Use it. Don't use __rtld_mrlock_{change,done}.
+ * elf/dl-support.c (_dl_scope_free_list): New variable.
+ * elf/dl-lookup.c (add_dependency): Remove flags argument.
+ Remove DL_LOOKUP_SCOPE_LOCK handling.
+ (_dl_lookup_symbol_x): Adjust caller. Remove DL_LOOKUP_SCOPE_LOCK
+ handling.
+ * elf/dl-object.c (_dl_new_object): Don't use
+ __rtld_mrlock_initialize.
+
+2007-06-09 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * elf/do-lookup.h (do_lookup_x): Read r_nlist before r_list and
+ make sure gcc doesn't mess around with this.
+
+2007-06-08 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * elf/dl-lookup.c (_dl_lookup_symbol_x): Remove use of r_nlist.
+
+2007-06-08 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * elf/dl-close.c (_dl_close_worker): Remove all to be removed
+ libraries from the global scope at once and call THREAD_GSCOPE_WAIT
+
+2007-05-18 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * elf/dl-close.c (_dl_close_worker): When removing object from
+ global scope, wait for all lookups to finish afterwards.
+ * elf/dl-open.c (add_to_global): When global scope array must
+ grow, allocate a new one and free old array only after all
+ lookups finish.
+ * elf/dl-runtime.c (_dl_fixup): Protect using global scope.
+ (_dl_lookup_symbol_x): Likewise.
+ * elf/dl-support.c: Define _dl_wait_lookup_done.
+ * sysdeps/generic/ldsodefs.h (struct rtld_global): Add
+ _dl_wait_lookup_done.
+
+2007-06-05 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/ieee754/ldbl-128ibm/mpn2ldbl.c
+ (__mpn_construct_long_double): Fix conversion where result ought
+ to be smaller than __LDBL_MIN__, or the low double should be
+ denormal. Fix decision where to negate low double - honor round
+ to even rules.
+ * stdio-common/tst-sprintf2.c: Include string.h.
+ (COMPARE_LDBL): Define.
+ (TEST): Also test whether a string hexadecimal float representation
+ can be parsed back to the number.
+ (main): Add a couple of further tests.
+
+2007-06-04 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/ieee754/ldbl-128ibm/printf_fphex.c
+ (PRINT_FPHEX_LONG_DOUBLE): Fix printing numbers where lower double
+ is non-zero, but smaller than 2 * __DBL_MIN__.
+ * stdio-common/tst-sprintf2.c: New test.
+ * stdio-common/Makefile (tests): Add tst-sprintf2.
+
+2007-06-04 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c (nextafterl): Remove
+ unused ily variable. Fix nextafterl on +-__LDBL_MAX__ and +-Inf.
+ Remove unreachable code at the end.
+
+2007-06-01 Steven Munroe <sjmunroe@xxxxxxxxxx>
+
+ * sysdeps/ieee754/ldbl-128ibm/s_fpclassifyl.c: Correct description of
+ ldbl-128ibm in comment.
+ (fpclassifyl): Correct classification of denormals.
+ * sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c (nextafterl): Correct
+ return value for MIN denormal. Rewrite using long double math too
+ correctly handle denormals and canonicalize the results.
+
+2007-05-29 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * nscd/nscd_helper.c (get_mapping): Handle short replies instead
+ of crashing. When this is the case or if the reply is malformed,
+ don't try to close the new file descriptor since it does not
+ exist.
+ Patch in part by Guillaume Chazarain <guichaz@xxxxxxxx>.
+
+2007-05-21 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/x86_64/cacheinfo.c (init_cacheinfo): Pass correct value
+ as second parameter to handle_intel.
+
+ * sysdeps/unix/sysv/linux/x86_64/sysconf.c: Move cache information
+ handling to ...
+ * sysdeps/x86_64/cacheinfo.c: ... here. New file.
+ * sysdeps/x86_64/Makefile [subdir=string] (sysdep_routines): Add
+ cacheinfo.
+ * sysdeps/x86_64/memcpy.S: Complete rewrite.
+ * sysdeps/x86_64/mempcpy.S: Adjust appropriately.
+ Patch by Evandro Menezes <evandro.menezes@xxxxxxx>.
+
+2007-05-21 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/i386/epoll_pwait.S: New file.
+
+2007-05-21 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ [BZ #4525]
+ * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add epoll_pwait.
+ * sysdeps/unix/sysv/linux/epoll_pwait.c: New file.
+ * sysdeps/unix/sysv/linux/syscalls.list (epoll_pwait): Remove.
+
+ * sysdeps/unix/sysv/linux/x86_64/sys/epoll.h (epoll_pwait): Declare.
+
+ [BZ #4514]
+ * stdio-common/vfprintf.c (vfprintf): Don't shadow workstart variable,
+ reinitialize workend at the start of each do_positional format spec
+ loop, free workstart before do_positional loops.
+ (printf_unknown): Fix size of work_buffer.
+ * stdio-common/tst-sprintf.c (main): Add 3 new testcases.
+
+ * malloc/hooks.c (MALLOC_STATE_VERSION): Bump.
+ (public_sET_STATe): If ms->version < 3, put all chunks into
+ unsorted chunks and clear {fd,bk}_nextsize fields of largebin
+ chunks.
+
+ * malloc/malloc.c [MALLOC_DEBUG]: Revert 2007-05-13 changes.
+ * malloc/hooks.c: Likewise.
+ * malloc/arena.c: Likewise.
+ * malloc/malloc.c (do_check_malloc_state): Don't assert
+ n_mmaps is not greater than n_mmaps_max. This removes the need
+ for the previous change.
+
+ * malloc/Makefile (CFLAGS-malloc.c): Revert accidental
+ 2007-05-07 commit.
+
+2007-05-18 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * malloc/malloc.c (do_check_chunk): Correct check for mmaped block
+ not overlapping with arena.
+
+ * malloc/mcheck.c (reallochook): If size==0, free the block.
+
+ * rt/tst-shm.c: Use fstat64 instead of fstat.
+
+ * sysdeps/unix/sysv/linux/i386/sync_file_range.S: Fix case where
+ __NR_sync_file_range is not defined.
+
+2007-05-17 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ Dummy files to prevent stub versions from being used.
+ * sysdeps/x86_64/fpu/k_cosl.c: New file.
+ * sysdeps/x86_64/fpu/k_rem_pio2l.c: New file.
+ * sysdeps/x86_64/fpu/k_sinl.c: New file.
+ * sysdeps/x86_64/fpu/k_tanl.c: New file.
+
2007-05-14 Ulrich Drepper <drepper@xxxxxxxxxx>
* version.h (VERSION): Define to 6.
Modified: fsf/glibc-2_6-branch/libc/dlfcn/dlinfo.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/dlfcn/dlinfo.c (original)
+++ fsf/glibc-2_6-branch/libc/dlfcn/dlinfo.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* dlinfo -- Get information from the dynamic linker.
- Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2006, 2007 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
@@ -56,9 +56,8 @@
/* Find the highest-addressed object that CALLER is not below. */
for (nsid = 0; nsid < DL_NNS; ++nsid)
for (l = GL(dl_ns)[nsid]._ns_loaded; l != NULL; l = l->l_next)
- if (caller >= l->l_map_start && caller < l->l_map_end)
- /* There must be exactly one DSO for the range of the virtual
- memory. Otherwise something is really broken. */
+ if (caller >= l->l_map_start && caller < l->l_map_end
+ && (l->l_contiguous || _dl_addr_inside_object (l, caller)))
break;
if (l == NULL)
Modified: fsf/glibc-2_6-branch/libc/elf/dl-addr.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-addr.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-addr.c Fri Jul 13 00:05:15 2007
@@ -134,22 +134,12 @@
/* Find the highest-addressed object that ADDRESS is not below. */
for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l; l = l->l_next)
- if (addr >= l->l_map_start && addr < l->l_map_end)
+ if (addr >= l->l_map_start && addr < l->l_map_end
+ && (l->l_contiguous || _dl_addr_inside_object (l, addr)))
{
- /* Make sure it lies within one of L's segments. */
- int n = l->l_phnum;
- const ElfW(Addr) reladdr = addr - l->l_addr;
- while (--n >= 0)
- if (l->l_phdr[n].p_type == PT_LOAD)
- {
- if (reladdr - l->l_phdr[n].p_vaddr >= 0
- && reladdr - l->l_phdr[n].p_vaddr < l->l_phdr[n].p_memsz)
- {
- determine_info (addr, l, info, mapp, symbolp);
- result = 1;
- goto out;
- }
- }
+ determine_info (addr, l, info, mapp, symbolp);
+ result = 1;
+ goto out;
}
out:
@@ -158,3 +148,19 @@
return result;
}
libc_hidden_def (_dl_addr)
+
+/* Return non-zero if ADDR lies within one of L's segments. */
+int
+internal_function
+_dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr)
+{
+ int n = l->l_phnum;
+ const ElfW(Addr) reladdr = addr - l->l_addr;
+
+ while (--n >= 0)
+ if (l->l_phdr[n].p_type == PT_LOAD
+ && reladdr - l->l_phdr[n].p_vaddr >= 0
+ && reladdr - l->l_phdr[n].p_vaddr < l->l_phdr[n].p_memsz)
+ return 1;
+ return 0;
+}
Modified: fsf/glibc-2_6-branch/libc/elf/dl-close.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-close.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-close.c Fri Jul 13 00:05:15 2007
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <sys/mman.h>
#include <sysdep-cancel.h>
+#include <tls.h>
/* Type of the constructor functions. */
@@ -228,6 +229,8 @@
bool do_audit = GLRO(dl_naudit) > 0 && !ns->_ns_loaded->l_auditing;
#endif
bool unload_any = false;
+ bool scope_mem_left = false;
+ unsigned int unload_global = 0;
unsigned int first_loaded = ~0;
for (unsigned int i = 0; i < nloaded; ++i)
{
@@ -291,6 +294,9 @@
/* We indeed have an object to remove. */
unload_any = true;
+
+ if (imap->l_global)
+ ++unload_global;
/* Remember where the first dynamically loaded object is. */
if (i < first_loaded)
@@ -400,18 +406,18 @@
struct r_scope_elem **old = imap->l_scope;
- if (RTLD_SINGLE_THREAD_P)
- imap->l_scope = newp;
- else
- {
- __rtld_mrlock_change (imap->l_scope_lock);
- imap->l_scope = newp;
- __rtld_mrlock_done (imap->l_scope_lock);
- }
+ imap->l_scope = newp;
/* No user anymore, we can free it now. */
if (old != imap->l_scope_mem)
- free (old);
+ {
+ if (_dl_scope_free (old))
+ /* If _dl_scope_free used THREAD_GSCOPE_WAIT (),
+ no need to repeat it. */
+ scope_mem_left = false;
+ }
+ else
+ scope_mem_left = true;
imap->l_scope_max = new_size;
}
@@ -457,6 +463,46 @@
r->r_state = RT_DELETE;
_dl_debug_state ();
+ if (unload_global)
+ {
+ /* Some objects are in the global scope list. Remove them. */
+ struct r_scope_elem *ns_msl = ns->_ns_main_searchlist;
+ unsigned int i;
+ unsigned int j = 0;
+ unsigned int cnt = ns_msl->r_nlist;
+
+ while (cnt > 0 && ns_msl->r_list[cnt - 1]->l_removed)
+ --cnt;
+
+ if (cnt + unload_global == ns_msl->r_nlist)
+ /* Speed up removing most recently added objects. */
+ j = cnt;
+ else
+ for (i = 0; i < cnt; i++)
+ if (ns_msl->r_list[i]->l_removed == 0)
+ {
+ if (i != j)
+ ns_msl->r_list[j] = ns_msl->r_list[i];
+ j++;
+ }
+ ns_msl->r_nlist = j;
+ }
+
+ if (!RTLD_SINGLE_THREAD_P
+ && (unload_global
+ || scope_mem_left
+ || (GL(dl_scope_free_list) != NULL
+ && GL(dl_scope_free_list)->count)))
+ {
+ struct dl_scope_free_list *fsl;
+
+ THREAD_GSCOPE_WAIT ();
+ /* Now we can free any queued old scopes. */
+ if ((fsl = GL(dl_scope_free_list)) != NULL)
+ while (fsl->count > 0)
+ free (fsl->list[--fsl->count]);
+ }
+
size_t tls_free_start;
size_t tls_free_end;
tls_free_start = tls_free_end = NO_TLS_OFFSET;
@@ -472,22 +518,6 @@
/* That was the last reference, and this was a dlopen-loaded
object. We can unmap it. */
- if (__builtin_expect (imap->l_global, 0))
- {
- /* This object is in the global scope list. Remove it. */
- struct r_scope_elem *ns_msl = ns->_ns_main_searchlist;
- unsigned int cnt = ns_msl->r_nlist;
-
- do
- --cnt;
- while (ns_msl->r_list[cnt] != imap);
-
- /* The object was already correctly registered. */
- while (++cnt < ns_msl->r_nlist)
- ns_msl->r_list[cnt - 1] = ns_msl->r_list[cnt];
-
- --ns_msl->r_nlist;
- }
/* Remove the object from the dtv slotinfo array if it uses TLS. */
if (__builtin_expect (imap->l_tls_blocksize > 0, 0))
@@ -769,4 +799,8 @@
malloc), and in the static library it's in .bss space. */
free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)->next);
}
+
+ void *scope_free_list = GL(dl_scope_free_list);
+ GL(dl_scope_free_list) = NULL;
+ free (scope_free_list);
}
Modified: fsf/glibc-2_6-branch/libc/elf/dl-iteratephdr.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-iteratephdr.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-iteratephdr.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Get loaded objects program headers.
- Copyright (C) 2001,2002,2003,2004,2006 Free Software Foundation, Inc.
+ Copyright (C) 2001,2002,2003,2004,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2001.
@@ -54,9 +54,9 @@
nloaded += GL(dl_ns)[cnt]._ns_nloaded;
if (caller >= (const void *) l->l_map_start
- && caller < (const void *) l->l_map_end)
- /* There must be exactly one DSO for the range of the virtual
- memory. Otherwise something is really broken. */
+ && caller < (const void *) l->l_map_end
+ && (l->l_contiguous
+ || _dl_addr_inside_object (l, (ElfW(Addr)) caller)))
ns = cnt;
}
Modified: fsf/glibc-2_6-branch/libc/elf/dl-load.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-load.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-load.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Map in a shared object's segments from the file.
- Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1995-2005, 2006, 2007 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
@@ -1223,6 +1223,8 @@
loadcmds[nloadcmds - 1].mapstart - c->mapend,
PROT_NONE);
+ l->l_contiguous = 1;
+
goto postmap;
}
@@ -1242,6 +1244,7 @@
/* Remember which part of the address space this object uses. */
l->l_map_start = c->mapstart + l->l_addr;
l->l_map_end = l->l_map_start + maplength;
+ l->l_contiguous = !has_holes;
while (c < &loadcmds[nloadcmds])
{
Modified: fsf/glibc-2_6-branch/libc/elf/dl-lookup.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-lookup.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-lookup.c Fri Jul 13 00:05:15 2007
@@ -86,7 +86,7 @@
/* Add extra dependency on MAP to UNDEF_MAP. */
static int
internal_function
-add_dependency (struct link_map *undef_map, struct link_map *map, int flags)
+add_dependency (struct link_map *undef_map, struct link_map *map)
{
struct link_map **list;
struct link_map *runp;
@@ -99,18 +99,8 @@
if (undef_map == map)
return 0;
- /* Make sure nobody can unload the object while we are at it.
- If we hold a scope lock drop it now to avoid ABBA locking problems. */
- if ((flags & DL_LOOKUP_SCOPE_LOCK) != 0 && !RTLD_SINGLE_THREAD_P)
- {
- __rtld_mrlock_unlock (undef_map->l_scope_lock);
-
- __rtld_lock_lock_recursive (GL(dl_load_lock));
-
- __rtld_mrlock_lock (undef_map->l_scope_lock);
- }
- else
- __rtld_lock_lock_recursive (GL(dl_load_lock));
+ /* Make sure nobody can unload the object while we are at it. */
+ __rtld_lock_lock_recursive (GL(dl_load_lock));
/* Avoid references to objects which cannot be unloaded anyway. */
if (map->l_type != lt_loaded
@@ -237,20 +227,15 @@
bump_num_relocations ();
- /* No other flag than DL_LOOKUP_ADD_DEPENDENCY and DL_LOOKUP_SCOPE_LOCK
- is allowed if we look up a versioned symbol. */
- assert (version == NULL || (flags & ~(DL_LOOKUP_ADD_DEPENDENCY
- | DL_LOOKUP_SCOPE_LOCK)) == 0);
+ /* No other flag than DL_LOOKUP_ADD_DEPENDENCY is allowed if we look
+ up a versioned symbol. */
+ assert (version == NULL || (flags & ~(DL_LOOKUP_ADD_DEPENDENCY)) == 0);
size_t i = 0;
if (__builtin_expect (skip_map != NULL, 0))
- {
- /* Search the relevant loaded objects for a definition. */
- while ((*scope)->r_list[i] != skip_map)
- ++i;
-
- assert (i < (*scope)->r_nlist);
- }
+ /* Search the relevant loaded objects for a definition. */
+ while ((*scope)->r_list[i] != skip_map)
+ ++i;
/* Search the relevant loaded objects for a definition. */
for (size_t start = i; *scope != NULL; start = 0, ++scope)
@@ -350,13 +335,11 @@
runtime lookups. */
&& (flags & DL_LOOKUP_ADD_DEPENDENCY) != 0
/* Add UNDEF_MAP to the dependencies. */
- && add_dependency (undef_map, current_value.m, flags) < 0)
+ && add_dependency (undef_map, current_value.m) < 0)
/* Something went wrong. Perhaps the object we tried to reference
was just removed. Try finding another definition. */
- return _dl_lookup_symbol_x (undef_name, undef_map, ref,
- (flags & DL_LOOKUP_SCOPE_LOCK) == 0
- ? symbol_scope : undef_map->l_scope, version,
- type_class, flags, skip_map);
+ return _dl_lookup_symbol_x (undef_name, undef_map, ref, symbol_scope,
+ version, type_class, flags, skip_map);
/* The object is used. */
current_value.m->l_used = 1;
Modified: fsf/glibc-2_6-branch/libc/elf/dl-minimal.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-minimal.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-minimal.c Fri Jul 13 00:05:15 2007
@@ -75,14 +75,21 @@
alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + align - 1)
& ~(align - 1));
- if (alloc_ptr + n >= alloc_end)
+ if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr)
{
/* Insufficient space left; allocate another page. */
caddr_t page;
size_t nup = (n + GLRO(dl_pagesize) - 1) & ~(GLRO(dl_pagesize) - 1);
+ if (__builtin_expect (nup == 0, 0))
+ {
+ if (n)
+ return NULL;
+ nup = GLRO(dl_pagesize);
+ }
page = __mmap (0, nup, PROT_READ|PROT_WRITE,
MAP_ANON|MAP_PRIVATE, _dl_zerofd, 0);
- assert (page != MAP_FAILED);
+ if (page == MAP_FAILED)
+ return NULL;
if (page != alloc_end)
alloc_ptr = page;
alloc_end = page + nup;
@@ -108,7 +115,14 @@
/* New memory from the trivial malloc above is always already cleared.
(We make sure that's true in the rare occasion it might not be,
by clearing memory in free, below.) */
- return malloc (nmemb * size);
+ size_t bytes = nmemb * size;
+
+#define HALF_SIZE_T (((size_t) 1) << (8 * sizeof (size_t) / 2))
+ if (__builtin_expect ((nmemb | size) >= HALF_SIZE_T, 0)
+ && size != 0 && bytes / size != nmemb)
+ return NULL;
+
+ return malloc (bytes);
}
/* This will rarely be called. */
@@ -264,7 +278,7 @@
while (*nptr >= '0' && *nptr <= '9')
{
unsigned long int digval = *nptr - '0';
- if (result > LONG_MAX / 10
+ if (result > ULONG_MAX / 10
|| (result == ULONG_MAX / 10 && digval > ULONG_MAX % 10))
{
errno = ERANGE;
Modified: fsf/glibc-2_6-branch/libc/elf/dl-object.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-object.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-object.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Storage management for the chain of loaded shared objects.
- Copyright (C) 1995-2002, 2004, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1995-2002, 2004, 2006, 2007 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
@@ -85,11 +85,6 @@
new->l_scope = new->l_scope_mem;
new->l_scope_max = sizeof (new->l_scope_mem) / sizeof (new->l_scope_mem[0]);
- /* No need to initialize the scope lock if the initializer is zero. */
-#if _RTLD_MRLOCK_INITIALIZER != 0
- __rtld_mrlock_initialize (new->l_scope_lock);
-#endif
-
/* Counter for the scopes we have to handle. */
idx = 0;
Modified: fsf/glibc-2_6-branch/libc/elf/dl-open.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-open.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-open.c Fri Jul 13 00:05:15 2007
@@ -32,6 +32,7 @@
#include <bp-sym.h>
#include <caller.h>
#include <sysdep-cancel.h>
+#include <tls.h>
#include <dl-dst.h>
@@ -125,15 +126,25 @@
{
/* We have to extend the existing array of link maps in the
main map. */
+ struct link_map **old_global
+ = GL(dl_ns)[new->l_ns]._ns_main_searchlist->r_list;
+ size_t new_nalloc = ((ns->_ns_global_scope_alloc + to_add) * 2);
+
new_global = (struct link_map **)
- realloc (ns->_ns_main_searchlist->r_list,
- ((ns->_ns_global_scope_alloc + to_add + 8)
- * sizeof (struct link_map *)));
+ malloc (new_nalloc * sizeof (struct link_map *));
if (new_global == NULL)
goto nomem;
- ns->_ns_global_scope_alloc += to_add + 8;
+ memcpy (new_global, old_global,
+ ns->_ns_global_scope_alloc * sizeof (struct link_map *));
+
+ ns->_ns_global_scope_alloc = new_nalloc;
ns->_ns_main_searchlist->r_list = new_global;
+
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_WAIT ();
+
+ free (old_global);
}
/* Now add the new entries. */
@@ -154,6 +165,40 @@
return 0;
}
+int
+_dl_scope_free (struct r_scope_elem **old)
+{
+ struct dl_scope_free_list *fsl;
+#define DL_SCOPE_FREE_LIST_SIZE (sizeof (fsl->list) / sizeof (fsl->list[0]))
+
+ if (RTLD_SINGLE_THREAD_P)
+ free (old);
+ else if ((fsl = GL(dl_scope_free_list)) == NULL)
+ {
+ GL(dl_scope_free_list) = fsl = malloc (sizeof (*fsl));
+ if (fsl == NULL)
+ {
+ THREAD_GSCOPE_WAIT ();
+ free (old);
+ return 1;
+ }
+ else
+ {
+ fsl->list[0] = old;
+ fsl->count = 1;
+ }
+ }
+ else if (fsl->count < DL_SCOPE_FREE_LIST_SIZE)
+ fsl->list[fsl->count++] = old;
+ else
+ {
+ THREAD_GSCOPE_WAIT ();
+ while (fsl->count > 0)
+ free (fsl->list[--fsl->count]);
+ return 1;
+ }
+ return 0;
+}
static void
dl_open_worker (void *a)
@@ -190,10 +235,10 @@
for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
if (caller_dlopen >= (const void *) l->l_map_start
- && caller_dlopen < (const void *) l->l_map_end)
+ && caller_dlopen < (const void *) l->l_map_end
+ && (l->l_contiguous
+ || _dl_addr_inside_object (l, (ElfW(Addr)) caller_dlopen)))
{
- /* There must be exactly one DSO for the range of the virtual
- memory. Otherwise something is really broken. */
assert (ns == l->l_ns);
call_map = l;
goto found_caller;
@@ -418,17 +463,10 @@
memcpy (newp, imap->l_scope, cnt * sizeof (imap->l_scope[0]));
struct r_scope_elem **old = imap->l_scope;
- if (RTLD_SINGLE_THREAD_P)
- imap->l_scope = newp;
- else
- {
- __rtld_mrlock_change (imap->l_scope_lock);
- imap->l_scope = newp;
- __rtld_mrlock_done (imap->l_scope_lock);
- }
+ imap->l_scope = newp;
if (old != imap->l_scope_mem)
- free (old);
+ _dl_scope_free (old);
imap->l_scope_max = new_size;
}
@@ -651,3 +689,21 @@
}
}
#endif
+
+#ifdef IS_IN_rtld
+/* Return non-zero if ADDR lies within one of L's segments. */
+int
+internal_function
+_dl_addr_inside_object (struct link_map *l, const ElfW(Addr) addr)
+{
+ int n = l->l_phnum;
+ const ElfW(Addr) reladdr = addr - l->l_addr;
+
+ while (--n >= 0)
+ if (l->l_phdr[n].p_type == PT_LOAD
+ && reladdr - l->l_phdr[n].p_vaddr >= 0
+ && reladdr - l->l_phdr[n].p_vaddr < l->l_phdr[n].p_memsz)
+ return 1;
+ return 0;
+}
+#endif
Modified: fsf/glibc-2_6-branch/libc/elf/dl-runtime.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-runtime.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-runtime.c Fri Jul 13 00:05:15 2007
@@ -26,6 +26,8 @@
#include <ldsodefs.h>
#include <sysdep-cancel.h>
#include "dynamic-link.h"
+#include <tls.h>
+
#if (!defined ELF_MACHINE_NO_RELA && !defined ELF_MACHINE_PLT_REL) \
|| ELF_MACHINE_NO_REL
@@ -97,17 +99,15 @@
not necessary for objects which cannot be unloaded or when
we are not using any threads (yet). */
int flags = DL_LOOKUP_ADD_DEPENDENCY;
- if (l->l_type == lt_loaded && !RTLD_SINGLE_THREAD_P)
- {
- __rtld_mrlock_lock (l->l_scope_lock);
- flags |= DL_LOOKUP_SCOPE_LOCK;
- }
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_SET_FLAG ();
result = _dl_lookup_symbol_x (strtab + sym->st_name, l, &sym, l->l_scope,
version, ELF_RTYPE_CLASS_PLT, flags, NULL);
- if ((flags & DL_LOOKUP_SCOPE_LOCK) != 0)
- __rtld_mrlock_unlock (l->l_scope_lock);
+ /* We are done with the global scope. */
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_RESET_FLAG ();
/* Currently result contains the base load address (or link map)
of the object that defines sym. Now add in the symbol
@@ -191,18 +191,16 @@
not necessary for objects which cannot be unloaded or when
we are not using any threads (yet). */
int flags = DL_LOOKUP_ADD_DEPENDENCY;
- if (l->l_type == lt_loaded && !RTLD_SINGLE_THREAD_P)
- {
- __rtld_mrlock_lock (l->l_scope_lock);
- flags |= DL_LOOKUP_SCOPE_LOCK;
- }
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_SET_FLAG ();
result = _dl_lookup_symbol_x (strtab + refsym->st_name, l,
&defsym, l->l_scope, version,
ELF_RTYPE_CLASS_PLT, flags, NULL);
- if ((flags & DL_LOOKUP_SCOPE_LOCK) != 0)
- __rtld_mrlock_unlock (l->l_scope_lock);
+ /* We are done with the global scope. */
+ if (!RTLD_SINGLE_THREAD_P)
+ THREAD_GSCOPE_RESET_FLAG ();
/* Currently result contains the base load address (or link map)
of the object that defines sym. Now add in the symbol
Modified: fsf/glibc-2_6-branch/libc/elf/dl-support.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-support.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-support.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Support for dynamic linking code in static libc.
- Copyright (C) 1996-2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-2005, 2006, 2007 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
@@ -132,6 +132,11 @@
= _dl_make_stack_executable;
+/* Function in libpthread to wait for termination of lookups. */
+void (*_dl_wait_lookup_done) (void);
+
+struct dl_scope_free_list *_dl_scope_free_list;
+
#ifdef NEED_DL_SYSINFO
/* Needed for improved syscall handling on at least x86/Linux. */
uintptr_t _dl_sysinfo = DL_SYSINFO_DEFAULT;
Modified: fsf/glibc-2_6-branch/libc/elf/dl-sym.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-sym.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-sym.c Fri Jul 13 00:05:15 2007
@@ -98,10 +98,9 @@
for (Lmid_t ns = 0; ns < DL_NNS; ++ns)
for (struct link_map *l = GL(dl_ns)[ns]._ns_loaded; l != NULL;
l = l->l_next)
- if (caller >= l->l_map_start && caller < l->l_map_end)
- {
- /* There must be exactly one DSO for the range of the virtual
- memory. Otherwise something is really broken. */
+ if (caller >= l->l_map_start && caller < l->l_map_end
+ && (l->l_contiguous || _dl_addr_inside_object (l, caller)))
+ {
match = l;
break;
}
@@ -113,21 +112,21 @@
the initial binary. And then the more complex part
where the object is dynamically loaded and the scope
array can change. */
- if (match->l_type != lt_loaded || RTLD_SINGLE_THREAD_P)
+ if (RTLD_SINGLE_THREAD_P)
result = GLRO(dl_lookup_symbol_x) (name, match, &ref,
match->l_scope, vers, 0,
flags | DL_LOOKUP_ADD_DEPENDENCY,
NULL);
else
{
- __rtld_mrlock_lock (match->l_scope_lock);
-
struct call_dl_lookup_args args;
args.name = name;
args.map = match;
args.vers = vers;
- args.flags = flags | DL_LOOKUP_ADD_DEPENDENCY | DL_LOOKUP_SCOPE_LOCK;
+ args.flags = flags | DL_LOOKUP_ADD_DEPENDENCY;
args.refp = &ref;
+
+ THREAD_GSCOPE_SET_FLAG ();
const char *objname;
const char *errstring = NULL;
@@ -135,7 +134,7 @@
int err = GLRO(dl_catch_error) (&objname, &errstring, &malloced,
call_dl_lookup, &args);
- __rtld_mrlock_unlock (match->l_scope_lock);
+ THREAD_GSCOPE_RESET_FLAG ();
if (__builtin_expect (errstring != NULL, 0))
{
Modified: fsf/glibc-2_6-branch/libc/elf/dl-sysdep.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/dl-sysdep.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/dl-sysdep.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Operating system support for run-time dynamic linker. Generic Unix version.
- Copyright (C) 1995-1998, 2000-2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000-2006, 2007 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
@@ -460,9 +460,21 @@
total = temp[0].len + 1;
else
{
- total = (1UL << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
- for (n = 1; n + 1 < cnt; ++n)
- total += (1UL << (cnt - 3)) * (temp[n].len + 1);
+ total = temp[0].len + temp[cnt - 1].len + 2;
+ if (cnt > 2)
+ {
+ total <<= 1;
+ for (n = 1; n + 1 < cnt; ++n)
+ total += temp[n].len + 1;
+ if (cnt > 3
+ && (cnt >= sizeof (size_t) * 8
+ || total + (sizeof (*result) << 3)
+ >= (1UL << (sizeof (size_t) * 8 - cnt + 3))))
+ _dl_signal_error (ENOMEM, NULL, NULL,
+ N_("cannot create capability list"));
+
+ total <<= cnt - 3;
+ }
}
/* The result structure: we use a very compressed way to store the
Modified: fsf/glibc-2_6-branch/libc/elf/do-lookup.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/do-lookup.h (original)
+++ fsf/glibc-2_6-branch/libc/elf/do-lookup.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Look up a symbol in the loaded objects.
- Copyright (C) 1995-2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1995-2004, 2005, 2006, 2007 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
@@ -29,8 +29,13 @@
const struct r_found_version *const version, int flags,
struct link_map *skip, int type_class)
{
+ size_t n = scope->r_nlist;
+ /* Make sure we read the value before proceeding. Otherwise we
+ might use r_list pointing to the initial scope and r_nlist being
+ the value after a resize. That is the only path in dl-open.c not
+ protected by GSCOPE. A read barrier here might be to expensive. */
+ __asm volatile ("" : "+r" (n), "+m" (scope->r_list));
struct link_map **list = scope->r_list;
- size_t n = scope->r_nlist;
do
{
Modified: fsf/glibc-2_6-branch/libc/elf/rtld.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/elf/rtld.c (original)
+++ fsf/glibc-2_6-branch/libc/elf/rtld.c Fri Jul 13 00:05:15 2007
@@ -1400,6 +1400,11 @@
/* Iterate over all entries in the list. The order is important. */
struct audit_ifaces *last_audit = NULL;
struct audit_list *al = audit_list->next;
+
+ /* Since we start using the auditing DSOs right away we need to
+ initialize the data structures now. */
+ tcbp = init_tls ();
+
do
{
int tls_idx = GL(dl_tls_max_dtv_idx);
@@ -1409,11 +1414,6 @@
always allocate the static block, we never defer it even if
no DF_STATIC_TLS bit is set. The reason is that we know
glibc will use the static model. */
-
- /* Since we start using the auditing DSOs right away we need to
- initialize the data structures now. */
- tcbp = init_tls ();
-
struct dlmopen_args dlmargs;
dlmargs.fname = al->name;
dlmargs.map = NULL;
Modified: fsf/glibc-2_6-branch/libc/include/link.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/include/link.h (original)
+++ fsf/glibc-2_6-branch/libc/include/link.h Fri Jul 13 00:05:15 2007
@@ -44,7 +44,6 @@
#include <dl-lookupcfg.h>
#include <tls.h>
#include <bits/libc-lock.h>
-#include <rtld-lowlevel.h>
/* Some internal data structures of the dynamic linker used in the
@@ -187,6 +186,9 @@
is interested in the PLT interception.*/
unsigned int l_removed:1; /* Nozero if the object cannot be used anymore
since it is removed. */
+ unsigned int l_contiguous:1; /* Nonzero if inter-segment holes are
+ mprotected or if no holes are present at
+ all. */
/* Collected information about own RPATH directories. */
struct r_search_path_struct l_rpath_dirs;
@@ -220,8 +222,6 @@
/* This is an array defining the lookup scope for this link map.
There are initially at most three different scope lists. */
struct r_scope_elem **l_scope;
- /* We need to protect using the SCOPEREC. */
- __rtld_mrlock_define (, l_scope_lock)
/* A similar array, this time only with the local scope. This is
used occasionally. */
Modified: fsf/glibc-2_6-branch/libc/malloc/Makefile
==============================================================================
--- fsf/glibc-2_6-branch/libc/malloc/Makefile (original)
+++ fsf/glibc-2_6-branch/libc/malloc/Makefile Fri Jul 13 00:05:15 2007
@@ -104,7 +104,6 @@
include ../Rules
CFLAGS-mcheck-init.c = $(PIC-ccflag)
-CFLAGS-malloc.c += -DMALLOC_DEBUG
$(objpfx)libmcheck.a: $(objpfx)mcheck-init.o
-rm -f $@
Modified: fsf/glibc-2_6-branch/libc/malloc/arena.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/malloc/arena.c (original)
+++ fsf/glibc-2_6-branch/libc/malloc/arena.c Fri Jul 13 00:05:15 2007
@@ -370,9 +370,6 @@
mp_.top_pad = DEFAULT_TOP_PAD;
#endif
mp_.n_mmaps_max = DEFAULT_MMAP_MAX;
-#if MALLOC_DEBUG
- mp_.n_mmaps_cmax = DEFAULT_MMAP_MAX;
-#endif
mp_.mmap_threshold = DEFAULT_MMAP_THRESHOLD;
mp_.trim_threshold = DEFAULT_TRIM_THRESHOLD;
mp_.pagesize = malloc_getpagesize;
Modified: fsf/glibc-2_6-branch/libc/malloc/hooks.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/malloc/hooks.c (original)
+++ fsf/glibc-2_6-branch/libc/malloc/hooks.c Fri Jul 13 00:05:15 2007
@@ -496,7 +496,7 @@
then the hooks are reset to 0. */
#define MALLOC_STATE_MAGIC 0x444c4541l
-#define MALLOC_STATE_VERSION (0*0x100l + 2l) /* major*0x100 + minor */
+#define MALLOC_STATE_VERSION (0*0x100l + 3l) /* major*0x100 + minor */
struct malloc_save_state {
long magic;
@@ -507,9 +507,6 @@
unsigned long trim_threshold;
unsigned long top_pad;
unsigned int n_mmaps_max;
-#if MALLOC_DEBUG
- unsigned int n_mmaps_cmax;
-#endif
unsigned long mmap_threshold;
int check_action;
unsigned long max_sbrked_mem;
@@ -553,9 +550,6 @@
ms->trim_threshold = mp_.trim_threshold;
ms->top_pad = mp_.top_pad;
ms->n_mmaps_max = mp_.n_mmaps_max;
-#if MALLOC_DEBUG
- ms->n_mmaps_cmax = mp_.n_mmaps_cmax;
-#endif
ms->mmap_threshold = mp_.mmap_threshold;
ms->check_action = check_action;
ms->max_sbrked_mem = main_arena.max_system_mem;
@@ -601,8 +595,9 @@
assert(ms->av[2*i+3] == 0);
first(b) = last(b) = b;
} else {
- if(i<NSMALLBINS || (largebin_index(chunksize(ms->av[2*i+2]))==i &&
- largebin_index(chunksize(ms->av[2*i+3]))==i)) {
+ if(ms->version >= 3 &&
+ (i<NSMALLBINS || (largebin_index(chunksize(ms->av[2*i+2]))==i &&
+ largebin_index(chunksize(ms->av[2*i+3]))==i))) {
first(b) = ms->av[2*i+2];
last(b) = ms->av[2*i+3];
/* Make sure the links to the bins within the heap are correct. */
@@ -622,14 +617,22 @@
}
}
}
+ if (ms->version < 3) {
+ /* Clear fd_nextsize and bk_nextsize fields. */
+ b = unsorted_chunks(&main_arena)->fd;
+ while (b != unsorted_chunks(&main_arena)) {
+ if (!in_smallbin_range(chunksize(b))) {
+ b->fd_nextsize = NULL;
+ b->bk_nextsize = NULL;
+ }
+ b = b->fd;
+ }
+ }
mp_.sbrk_base = ms->sbrk_base;
main_arena.system_mem = ms->sbrked_mem_bytes;
mp_.trim_threshold = ms->trim_threshold;
mp_.top_pad = ms->top_pad;
mp_.n_mmaps_max = ms->n_mmaps_max;
-#if MALLOC_DEBUG
- mp_.n_mmaps_cmax = ms->n_mmaps_cmax;
-#endif
mp_.mmap_threshold = ms->mmap_threshold;
check_action = ms->check_action;
main_arena.max_system_mem = ms->max_sbrked_mem;
Modified: fsf/glibc-2_6-branch/libc/malloc/malloc.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/malloc/malloc.c (original)
+++ fsf/glibc-2_6-branch/libc/malloc/malloc.c Fri Jul 13 00:05:15 2007
@@ -2358,9 +2358,6 @@
/* Memory map support */
int n_mmaps;
int n_mmaps_max;
-#if MALLOC_DEBUG
- int n_mmaps_cmax;
-#endif
int max_n_mmaps;
/* the mmap_threshold is dynamic, until the user sets
it manually, at which point we need to disable any
@@ -2572,7 +2569,7 @@
#if HAVE_MMAP
/* address is outside main heap */
if (contiguous(av) && av->top != initial_top(av)) {
- assert(((char*)p) < min_address || ((char*)p) > max_address);
+ assert(((char*)p) < min_address || ((char*)p) >= max_address);
}
/* chunk is page-aligned */
assert(((p->prev_size + sz) & (mp_.pagesize-1)) == 0);
@@ -2876,8 +2873,6 @@
assert(total <= (unsigned long)(mp_.max_total_mem));
assert(mp_.n_mmaps >= 0);
#endif
- assert(mp_.n_mmaps <= mp_.n_mmaps_cmax);
- assert(mp_.n_mmaps_max <= mp_.n_mmaps_cmax);
assert(mp_.n_mmaps <= mp_.max_n_mmaps);
assert((unsigned long)(av->system_mem) <=
@@ -3475,13 +3470,6 @@
}
mp_.n_mmaps--;
-#if MALLOC_DEBUG
- if (mp_.n_mmaps_cmax > mp_.n_mmaps_max)
- {
- assert (mp_.n_mmaps_cmax == mp_.n_mmaps + 1);
- mp_.n_mmaps_cmax = mp_.n_mmaps;
- }
-#endif
mp_.mmapped_mem -= total_size;
int ret __attribute__ ((unused)) = munmap((char *)block, total_size);
@@ -5397,9 +5385,6 @@
mp_.n_mmaps_max = 0;
mem = _int_malloc(av, size);
mp_.n_mmaps_max = mmx; /* reset mmap */
-#if MALLOC_DEBUG
- mp_.n_mmaps_cmax = mmx;
-#endif
if (mem == 0)
return 0;
@@ -5725,17 +5710,8 @@
res = 0;
else
#endif
- {
-#if MALLOC_DEBUG
- if (mp_.n_mmaps <= value)
- mp_.n_mmaps_cmax = value;
- else
- mp_.n_mmaps_cmax = mp_.n_mmaps;
-#endif
-
- mp_.n_mmaps_max = value;
- mp_.no_dyn_threshold = 1;
- }
+ mp_.n_mmaps_max = value;
+ mp_.no_dyn_threshold = 1;
break;
case M_CHECK_ACTION:
Modified: fsf/glibc-2_6-branch/libc/malloc/mcheck.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/malloc/mcheck.c (original)
+++ fsf/glibc-2_6-branch/libc/malloc/mcheck.c Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Standard debugging hooks for `malloc'.
- Copyright (C) 1990-1997,99,2000,01,02 Free Software Foundation, Inc.
+ Copyright (C) 1990-1997,1999,2000-2002,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written May 1989 by Mike Haertel.
@@ -264,6 +264,12 @@
static __ptr_t
reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
{
+ if (size == 0)
+ {
+ freehook (ptr, caller);
+ return NULL;
+ }
+
struct hdr *hdr;
__malloc_size_t osize;
Modified: fsf/glibc-2_6-branch/libc/math/test-misc.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/math/test-misc.c (original)
+++ fsf/glibc-2_6-branch/libc/math/test-misc.c Fri Jul 13 00:05:15 2007
@@ -1235,7 +1235,12 @@
}
#endif
-#if !defined NO_LONG_DOUBLE && LDBL_MANT_DIG >= DBL_MANT_DIG + 4
+/* Skip testing IBM long double format, for 2 reasons:
+ 1) it only supports FE_TONEAREST
+ 2) nextafter (0.0, 1.0) == nextafterl (0.0L, 1.0L), so
+ nextafter (0.0, 1.0) / 16.0L will be 0.0L. */
+#if !defined NO_LONG_DOUBLE && LDBL_MANT_DIG >= DBL_MANT_DIG + 4 \
+ && LDBL_MANT_DIG != 106
int oldmode = fegetround ();
int j;
for (j = 0; j < 4; j++)
Modified: fsf/glibc-2_6-branch/libc/nis/nss-default.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nis/nss-default.c (original)
+++ fsf/glibc-2_6-branch/libc/nis/nss-default.c Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 2001, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 2001, 2004, 2006, 2007 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
@@ -17,6 +17,7 @@
02111-1307 USA. */
#include <ctype.h>
+#include <errno.h>
#include <stdio.h>
#include <stdio_ext.h>
#include <stdlib.h>
@@ -54,6 +55,7 @@
static void
init (void)
{
+ int saved_errno = errno;
FILE *fp = fopen (default_nss, "rc");
if (fp != NULL)
{
@@ -111,6 +113,7 @@
fclose (fp);
}
+ __set_errno (saved_errno);
}
Modified: fsf/glibc-2_6-branch/libc/nptl/ChangeLog
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/ChangeLog (original)
+++ fsf/glibc-2_6-branch/libc/nptl/ChangeLog Fri Jul 13 00:05:15 2007
@@ -1,3 +1,124 @@
+2007-06-22 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * pthread_getattr_np.c (pthread_getattr_np): Clear cpuset and
+ cpusetsize if pthread_getaffinity_np failed with ENOSYS.
+
+2007-05-28 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/i386/tls.h (THREAD_GSCOPE_RESET_FLAG): Use explicit
+ insn suffix.
+ (THREAD_GSCOPE_GET_FLAG): Remove.
+ * sysdeps/x86_64/tls.h (THREAD_GSCOPE_GET_FLAG): Remove.
+ * allocatestack.c (__wait_lookup_done): Revert 2007-05-24
+ changes.
+ * sysdeps/powerpc/tls.h (tcbhead_t): Remove gscope_flag.
+ (THREAD_GSCOPE_GET_FLAG): Remove.
+ (THREAD_GSCOPE_RESET_FLAG): Use THREAD_SELF->header.gscope_flag
+ instead of THREAD_GSCOPE_GET_FLAG.
+ (THREAD_GSCOPE_SET_FLAG): Likewise. Add atomic_write_barrier after
+ it.
+ * sysdeps/s390/tls.h (THREAD_GSCOPE_FLAG_UNUSED,
+ THREAD_GSCOPE_FLAG_USED, THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_WAIT): Define.
+ * sysdeps/sparc/tls.h (THREAD_GSCOPE_FLAG_UNUSED,
+ THREAD_GSCOPE_FLAG_USED, THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_WAIT): Define.
+ * sysdeps/sh/tls.h (THREAD_GSCOPE_FLAG_UNUSED,
+ THREAD_GSCOPE_FLAG_USED, THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_WAIT): Define.
+ * sysdeps/ia64/tls.h (THREAD_GSCOPE_FLAG_UNUSED,
+ THREAD_GSCOPE_FLAG_USED, THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_WAIT): Define.
+
+2007-05-24 Richard Henderson <rth@xxxxxxxxxx>
+
+ * descr.h (struct pthread): Add header.gscope_flag.
+ * sysdeps/alpha/tls.h (THREAD_GSCOPE_FLAG_UNUSED,
+ THREAD_GSCOPE_FLAG_USED, THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_WAIT): Define.
+
+2007-05-26 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * allocatestack.c: Revert last change.
+ * init.c: Likewise.
+ * sysdeps/i386/tls.h: Likewise.
+ * sysdeps/x86_64/tls.h: Likewise.
+
+2007-05-24 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/powerpc/tls.h (tcbhead_t): Add gscope_flag.
+ (THREAD_GSCOPE_FLAG_UNUSED, THREAD_GSCOPE_FLAG_USED,
+ THREAD_GSCOPE_FLAG_WAIT): Define.
+ (THREAD_GSCOPE_GET_FLAG, THREAD_GSCOPE_SET_FLAG,
+ THREAD_GSCOPE_RESET_FLAG, THREAD_GSCOPE_WAIT): Define.
+ * sysdeps/i386/tls.h (THREAD_GSCOPE_WAIT): Don't use
+ PTR_DEMANGLE.
+ (THREAD_GSCOPE_GET_FLAG): Define.
+ * sysdeps/x86_64/tls.h (THREAD_GSCOPE_GET_FLAG): Define.
+ * allocatestack.c (__wait_lookup_done): Use THREAD_GSCOPE_GET_FLAG
+ instead of ->header.gscope_flag directly.
+
+2007-05-21 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/pthread/pthread-functions.h (struct pthread_functions):
+ Remove ptr_wait_lookup_done again.
+ * init.c (pthread_functions): Don't add .ptr_wait_lookup_done here.
+ (__pthread_initialize_minimal_internal): Initialize
+ _dl_wait_lookup_done pointer in _rtld_global directly.
+ * sysdeps/unix/sysv/linux/libc_pthread_init.c (__libc_pthread_init):
+ Remove code to code _dl_wait_lookup_done.
+ * sysdeps/x86_64/tls.h (THREAD_GSCOPE_WAIT): The pointer is not
+ encrypted for now.
+
+2007-05-19 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * allocatestack.c (__wait_lookup_done): New function.
+ * sysdeps/pthread/pthread-functions.h (struct pthread_functions):
+ Add ptr_wait_lookup_done.
+ * init.c (pthread_functions): Initialize .ptr_wait_lookup_done.
+ * pthreadP.h: Declare __wait_lookup_done.
+ * sysdeps/i386/tls.h (tcbhead_t): Add gscope_flag.
+ Define macros to implement reference handling of global scope.
+ * sysdeps/x86_64/tls.h: Likewise.
+ * sysdeps/unix/sysv/linux/libc_pthread_init.c (__libc_pthread_init):
+ Initialize GL(dl_wait_lookup_done).
+
+2007-05-25 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * Makefile (tests): Add tst-sem10.
+ * tst-sem10.c: New file.
+
+2007-05-25 Ulrich Drepper <drepper@xxxxxxxxxx>
+ Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S (sem_timedwait):
+ Move __pthread_enable_asynccancel right before futex syscall.
+ * sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (sem_timedwait):
+ Likewise.
+
+2007-05-21 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * tst-robust9.c (do_test): Don't fail if ENABLE_PI and
+ pthread_mutex_init failed with ENOTSUP.
+
+2007-05-17 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ [BZ #4512]
+ * pthread_mutex_lock.c: Preserve FUTEX_WAITERS bit when dead owner
+ is detected.
+ * pthread_mutex_timedlock.c: Likewise.
+ * pthread_mutex_trylock.c: Likewise.
+ Patch in part by Atsushi Nemoto <anemo@xxxxxxxxxxxxx>.
+
+ * Makefile (tests): Add tst-robust9 and tst-robustpi9.
+ * tst-robust9.c: New file.
+ * tst-robustpi9.c: New file.
+
2007-05-14 Ulrich Drepper <drepper@xxxxxxxxxx>
* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Remove unnecessary
Modified: fsf/glibc-2_6-branch/libc/nptl/Makefile
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/Makefile (original)
+++ fsf/glibc-2_6-branch/libc/nptl/Makefile Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-# Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2005,2006,2007 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
@@ -209,16 +209,16 @@
tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
tst-cond20 tst-cond21 tst-cond22 \
tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
- tst-robust6 tst-robust7 tst-robust8 \
- tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 \
- tst-robustpi5 tst-robustpi6 tst-robustpi7 tst-robustpi8 \
+ tst-robust6 tst-robust7 tst-robust8 tst-robust9 \
+ tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \
+ tst-robustpi6 tst-robustpi7 tst-robustpi8 tst-robustpi9 \
tst-rwlock1 tst-rwlock2 tst-rwlock3 tst-rwlock4 tst-rwlock5 \
tst-rwlock6 tst-rwlock7 tst-rwlock8 tst-rwlock9 tst-rwlock10 \
tst-rwlock11 tst-rwlock12 tst-rwlock13 tst-rwlock14 \
tst-once1 tst-once2 tst-once3 tst-once4 \
tst-key1 tst-key2 tst-key3 tst-key4 \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
- tst-sem8 tst-sem9 \
+ tst-sem8 tst-sem9 tst-sem10 \
tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
tst-align tst-align2 tst-align3 \
tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
Modified: fsf/glibc-2_6-branch/libc/nptl/allocatestack.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/allocatestack.c (original)
+++ fsf/glibc-2_6-branch/libc/nptl/allocatestack.c Fri Jul 13 00:05:15 2007
@@ -996,3 +996,60 @@
lll_unlock (stack_cache_lock);
}
+
+
+void
+attribute_hidden
+__wait_lookup_done (void)
+{
+ lll_lock (stack_cache_lock);
+
+ struct pthread *self = THREAD_SELF;
+
+ /* Iterate over the list with system-allocated threads first. */
+ list_t *runp;
+ list_for_each (runp, &stack_used)
+ {
+ struct pthread *t = list_entry (runp, struct pthread, list);
+ if (t == self || t->header.gscope_flag == THREAD_GSCOPE_FLAG_UNUSED)
+ continue;
+
+ int *const gscope_flagp = &t->header.gscope_flag;
+
+ /* We have to wait until this thread is done with the global
+ scope. First tell the thread that we are waiting and
+ possibly have to be woken. */
+ if (atomic_compare_and_exchange_bool_acq (gscope_flagp,
+ THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_FLAG_USED))
+ continue;
+
+ do
+ lll_futex_wait (gscope_flagp, THREAD_GSCOPE_FLAG_WAIT);
+ while (*gscope_flagp == THREAD_GSCOPE_FLAG_WAIT);
+ }
+
+ /* Now the list with threads using user-allocated stacks. */
+ list_for_each (runp, &__stack_user)
+ {
+ struct pthread *t = list_entry (runp, struct pthread, list);
+ if (t == self || t->header.gscope_flag == THREAD_GSCOPE_FLAG_UNUSED)
+ continue;
+
+ int *const gscope_flagp = &t->header.gscope_flag;
+
+ /* We have to wait until this thread is done with the global
+ scope. First tell the thread that we are waiting and
+ possibly have to be woken. */
+ if (atomic_compare_and_exchange_bool_acq (gscope_flagp,
+ THREAD_GSCOPE_FLAG_WAIT,
+ THREAD_GSCOPE_FLAG_USED))
+ continue;
+
+ do
+ lll_futex_wait (gscope_flagp, THREAD_GSCOPE_FLAG_WAIT);
+ while (*gscope_flagp == THREAD_GSCOPE_FLAG_WAIT);
+ }
+
+ lll_unlock (stack_cache_lock);
+}
Modified: fsf/glibc-2_6-branch/libc/nptl/descr.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/descr.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/descr.h Fri Jul 13 00:05:15 2007
@@ -131,6 +131,7 @@
struct
{
int multiple_threads;
+ int gscope_flag;
} header;
#endif
Modified: fsf/glibc-2_6-branch/libc/nptl/init.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/init.c (original)
+++ fsf/glibc-2_6-branch/libc/nptl/init.c Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -386,6 +386,8 @@
GL(dl_init_static_tls) = &__pthread_init_static_tls;
+ GL(dl_wait_lookup_done) = &__wait_lookup_done;
+
/* Register the fork generation counter with the libc. */
#ifndef TLS_MULTIPLE_THREADS_IN_TCB
__libc_multiple_threads_ptr =
Modified: fsf/glibc-2_6-branch/libc/nptl/pthreadP.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/pthreadP.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/pthreadP.h Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -545,6 +545,8 @@
extern void __free_stack_cache (void) attribute_hidden;
+extern void __wait_lookup_done (void) attribute_hidden;
+
#ifdef SHARED
# define PTHREAD_STATIC_FN_REQUIRE(name)
#else
Modified: fsf/glibc-2_6-branch/libc/nptl/pthread_getattr_np.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/pthread_getattr_np.c (original)
+++ fsf/glibc-2_6-branch/libc/nptl/pthread_getattr_np.c Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -168,8 +168,12 @@
{
free (cpuset);
if (ret == ENOSYS)
- /* There is no such functionality. */
- ret = 0;
+ {
+ /* There is no such functionality. */
+ ret = 0;
+ iattr->cpuset = NULL;
+ iattr->cpusetsize = 0;
+ }
}
}
Modified: fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_lock.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_lock.c (original)
+++ fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_lock.c Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -127,6 +127,8 @@
int newval = id;
#ifdef NO_INCR
newval |= FUTEX_WAITERS;
+#else
+ newval |= (oldval & FUTEX_WAITERS);
#endif
newval
Modified: fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_timedlock.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_timedlock.c (original)
+++ fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_timedlock.c Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -119,9 +119,11 @@
if ((oldval & FUTEX_OWNER_DIED) != 0)
{
/* The previous owner died. Try locking the mutex. */
- int newval
+ int newval = id | (oldval & FUTEX_WAITERS);
+
+ newval
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
- id, oldval);
+ newval, oldval);
if (newval != oldval)
{
oldval = newval;
Modified: fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_trylock.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_trylock.c (original)
+++ fsf/glibc-2_6-branch/libc/nptl/pthread_mutex_trylock.c Fri Jul 13 00:05:15 2007
@@ -84,9 +84,11 @@
if ((oldval & FUTEX_OWNER_DIED) != 0)
{
/* The previous owner died. Try locking the mutex. */
- int newval
+ int newval = id | (oldval & FUTEX_WAITERS);
+
+ newval
= atomic_compare_and_exchange_val_acq (&mutex->__data.__lock,
- id, oldval);
+ newval, oldval);
if (newval != oldval)
{
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/alpha/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/alpha/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/alpha/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. NPTL/Alpha version.
- Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007 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
@@ -121,6 +121,29 @@
#define THREAD_SETMEM_NC(descr, member, idx, value) \
descr->member[idx] = (value)
+/* Get and set the global scope generation counter in struct pthread. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/i386/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/i386/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/i386/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. nptl/i386 version.
- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002,2003,2004,2005,2006,2007 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
@@ -51,6 +51,7 @@
uintptr_t sysinfo;
uintptr_t stack_guard;
uintptr_t pointer_guard;
+ int gscope_flag;
} tcbhead_t;
# define TLS_MULTIPLE_THREADS_IN_TCB 1
@@ -431,6 +432,26 @@
= THREAD_GETMEM (THREAD_SELF, header.pointer_guard))
+/* Get and set the global scope generation counter in the TCB head. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res; \
+ asm volatile ("xchgl %0, %%gs:%P1" \
+ : "=r" (__res) \
+ : "i" (offsetof (struct pthread, header.gscope_flag)), \
+ "0" (THREAD_GSCOPE_FLAG_UNUSED)); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/ia64/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/ia64/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/ia64/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. nptl/IA-64 version.
- Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006, 2007 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
@@ -163,6 +163,29 @@
(((uintptr_t *) ((char *) (descr) + TLS_PRE_TCB_SIZE))[-2] \
= THREAD_GET_POINTER_GUARD ())
+/* Get and set the global scope generation counter in struct pthread. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/powerpc/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/powerpc/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/powerpc/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. NPTL/PowerPC version.
- Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007 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
@@ -180,6 +180,29 @@
different value to mean unset l_tls_offset. */
# define NO_TLS_OFFSET -1
+/* Get and set the global scope generation counter in struct pthread. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/s390/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/s390/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/s390/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. NPTL/s390 version.
- Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005, 2006, 2007 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
@@ -50,6 +50,7 @@
int multiple_threads;
uintptr_t sysinfo;
uintptr_t stack_guard;
+ int gscope_flag;
} tcbhead_t;
# ifndef __s390x__
@@ -168,6 +169,29 @@
#define THREAD_SET_POINTER_GUARD(value)
#define THREAD_COPY_POINTER_GUARD(descr)
+/* Get and set the global scope generation counter in struct pthread. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/sh/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/sh/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/sh/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definition for thread-local data handling. NPTL/SH version.
- Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007 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
@@ -150,6 +150,29 @@
__asm __volatile ("stc gbr,%0" : "=r" (__tcbp)); \
((tcbhead_t *) (descr + 1))->pointer_guard = __tcbp->pointer_guard;})
+/* Get and set the global scope generation counter in struct pthread. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/sparc/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/sparc/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/sparc/tls.h Fri Jul 13 00:05:15 2007
@@ -1,5 +1,5 @@
/* Definitions for thread-local data handling. NPTL/sparc version.
- Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2005, 2006, 2007 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
@@ -141,6 +141,29 @@
# define THREAD_COPY_POINTER_GUARD(descr) \
((descr)->header.pointer_guard = THREAD_GET_POINTER_GUARD ())
+/* Get and set the global scope generation counter in struct pthread. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res \
+ = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ do \
+ { \
+ THREAD_SELF->header.gscope_flag = THREAD_GSCOPE_FLAG_USED; \
+ atomic_write_barrier (); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* !ASSEMBLER */
#endif /* tls.h */
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S Fri Jul 13 00:05:15 2007
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -79,10 +79,7 @@
jae 6f
cfi_offset(3, -16) /* %ebx */
-7: call __pthread_enable_asynccancel
- movl %eax, 8(%esp)
-
- xorl %ecx, %ecx
+7: xorl %ecx, %ecx
movl %esp, %ebx
movl %ecx, %edx
movl $SYS_gettimeofday, %eax
@@ -105,6 +102,10 @@
movl %ecx, (%esp) /* Store relative timeout. */
movl %edx, 4(%esp)
+
+ call __pthread_enable_asynccancel
+ movl %eax, 8(%esp)
+
movl 28(%esp), %ebx
xorl %ecx, %ecx
movl %esp, %esi
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S Fri Jul 13 00:05:15 2007
@@ -73,10 +73,7 @@
cfi_offset(14, -24) /* %r14 */
jae 6f
-7: call __pthread_enable_asynccancel
- movl %eax, 16(%rsp)
-
- xorl %esi, %esi
+7: xorl %esi, %esi
movq %rsp, %rdi
movq $VSYSCALL_ADDR_vgettimeofday, %rax
callq *%rax
@@ -98,6 +95,9 @@
movq %rdi, (%rsp) /* Store relative timeout. */
movq %rsi, 8(%rsp)
+
+ call __pthread_enable_asynccancel
+ movl %eax, 16(%rsp)
movq %rsp, %r10
movq %r12, %rdi
Modified: fsf/glibc-2_6-branch/libc/nptl/sysdeps/x86_64/tls.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/sysdeps/x86_64/tls.h (original)
+++ fsf/glibc-2_6-branch/libc/nptl/sysdeps/x86_64/tls.h Fri Jul 13 00:05:15 2007
@@ -47,6 +47,7 @@
dtv_t *dtv;
void *self; /* Pointer to the thread descriptor. */
int multiple_threads;
+ int gscope_flag;
uintptr_t sysinfo;
uintptr_t stack_guard;
uintptr_t pointer_guard;
@@ -337,6 +338,26 @@
= THREAD_GETMEM (THREAD_SELF, header.pointer_guard))
+/* Get and set the global scope generation counter in the TCB head. */
+#define THREAD_GSCOPE_FLAG_UNUSED 0
+#define THREAD_GSCOPE_FLAG_USED 1
+#define THREAD_GSCOPE_FLAG_WAIT 2
+#define THREAD_GSCOPE_RESET_FLAG() \
+ do \
+ { int __res; \
+ asm volatile ("xchgl %0, %%fs:%P1" \
+ : "=r" (__res) \
+ : "i" (offsetof (struct pthread, header.gscope_flag)), \
+ "0" (THREAD_GSCOPE_FLAG_UNUSED)); \
+ if (__res == THREAD_GSCOPE_FLAG_WAIT) \
+ lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1); \
+ } \
+ while (0)
+#define THREAD_GSCOPE_SET_FLAG() \
+ THREAD_SETMEM (THREAD_SELF, header.gscope_flag, THREAD_GSCOPE_FLAG_USED)
+#define THREAD_GSCOPE_WAIT() \
+ GL(dl_wait_lookup_done) ()
+
#endif /* __ASSEMBLER__ */
#endif /* tls.h */
Added: fsf/glibc-2_6-branch/libc/nptl/tst-robust9.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/tst-robust9.c (added)
+++ fsf/glibc-2_6-branch/libc/nptl/tst-robust9.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,94 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+
+static pthread_mutex_t m;
+
+static void *
+tf (void *data)
+{
+ int err = pthread_mutex_lock (&m);
+ if (err == EOWNERDEAD)
+ {
+ err = pthread_mutex_consistent_np (&m);
+ if (err)
+ {
+ puts ("pthread_mutex_consistent_np");
+ exit (1);
+ }
+ }
+ else if (err)
+ {
+ puts ("pthread_mutex_lock");
+ exit (1);
+ }
+ printf ("thread%ld got the lock.\n", (long int) data);
+ sleep (1);
+ /* exit without unlock */
+ return NULL;
+}
+
+static int
+do_test (void)
+{
+ int err, i;
+ pthread_t t[3];
+ pthread_mutexattr_t ma;
+
+ pthread_mutexattr_init (&ma);
+ err = pthread_mutexattr_setrobust_np (&ma, PTHREAD_MUTEX_ROBUST_NP);
+ if (err)
+ {
+ puts ("pthread_mutexattr_setrobust_np");
+ return 1;
+ }
+#ifdef ENABLE_PI
+ if (pthread_mutexattr_setprotocol (&ma, PTHREAD_PRIO_INHERIT) != 0)
+ {
+ puts ("pthread_mutexattr_setprotocol failed");
+ return 1;
+ }
+#endif
+ err = pthread_mutex_init (&m, &ma);
+#ifdef ENABLE_PI
+ if (err == ENOTSUP)
+ {
+ puts ("PI robust mutexes not supported");
+ return 0;
+ }
+#endif
+ if (err)
+ {
+ puts ("pthread_mutex_init");
+ return 1;
+ }
+
+ for (i = 0; i < sizeof (t) / sizeof (t[0]); i++)
+ {
+ err = pthread_create (&t[i], NULL, tf, (void *) (long int) i);
+ if (err)
+ {
+ puts ("pthread_create");
+ return 1;
+ }
+ }
+
+ for (i = 0; i < sizeof (t) / sizeof (t[0]); i++)
+ {
+ err = pthread_join (t[i], NULL);
+ if (err)
+ {
+ puts ("pthread_join");
+ return 1;
+ }
+ }
+ return 0;
+}
+
+#define TIMEOUT 5
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
Added: fsf/glibc-2_6-branch/libc/nptl/tst-robustpi9.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/tst-robustpi9.c (added)
+++ fsf/glibc-2_6-branch/libc/nptl/tst-robustpi9.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,2 @@
+#define ENABLE_PI 1
+#include "tst-robust9.c"
Added: fsf/glibc-2_6-branch/libc/nptl/tst-sem10.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nptl/tst-sem10.c (added)
+++ fsf/glibc-2_6-branch/libc/nptl/tst-sem10.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,88 @@
+/* Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@xxxxxxxxxx>, 2007.
+
+ 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. */
+
+#include <errno.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+
+static int
+do_test (void)
+{
+ sem_t s;
+ if (sem_init (&s, 0, 0) == -1)
+ {
+ puts ("sem_init failed");
+ return 1;
+ }
+
+ struct timeval tv;
+ if (gettimeofday (&tv, NULL) != 0)
+ {
+ puts ("gettimeofday failed");
+ return 1;
+ }
+
+ struct timespec ts;
+ TIMEVAL_TO_TIMESPEC (&tv, &ts);
+
+ /* Set ts to yesterday. */
+ ts.tv_sec -= 86400;
+
+ int type_before;
+ if (pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED, &type_before) != 0)
+ {
+ puts ("first pthread_setcanceltype failed");
+ return 1;
+ }
+
+ errno = 0;
+ if (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)) != -1)
+ {
+ puts ("sem_timedwait succeeded");
+ return 1;
+ }
+ if (errno != ETIMEDOUT)
+ {
+ printf ("sem_timedwait return errno = %d instead of ETIMEDOUT\n",
+ errno);
+ return 1;
+ }
+
+ int type_after;
+ if (pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED, &type_after) != 0)
+ {
+ puts ("second pthread_setcanceltype failed");
+ return 1;
+ }
+ if (type_after != PTHREAD_CANCEL_DEFERRED)
+ {
+ puts ("sem_timedwait changed cancellation type");
+ return 1;
+ }
+
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
Modified: fsf/glibc-2_6-branch/libc/nscd/nscd_helper.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/nscd/nscd_helper.c (original)
+++ fsf/glibc-2_6-branch/libc/nscd/nscd_helper.c Fri Jul 13 00:05:15 2007
@@ -269,11 +269,12 @@
!= keylen, 0))
goto out_close2;
+ if (__builtin_expect (CMSG_FIRSTHDR (&msg) == NULL
+ || (CMSG_FIRSTHDR (&msg)->cmsg_len
+ != CMSG_LEN (sizeof (int))), 0))
+ goto out_close2;
+
mapfd = *(int *) CMSG_DATA (cmsg);
-
- if (__builtin_expect (CMSG_FIRSTHDR (&msg)->cmsg_len
- != CMSG_LEN (sizeof (int)), 0))
- goto out_close;
struct stat64 st;
if (__builtin_expect (strcmp (resdata, key) != 0, 0)
Modified: fsf/glibc-2_6-branch/libc/rt/tst-shm.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/rt/tst-shm.c (original)
+++ fsf/glibc-2_6-branch/libc/rt/tst-shm.c Fri Jul 13 00:05:15 2007
@@ -60,7 +60,7 @@
worker (int write_now)
{
struct timespec ts;
- struct stat st;
+ struct stat64 st;
int i;
int fd = do_open ();
char *mem;
@@ -68,8 +68,10 @@
if (fd == -1)
exit (fd);
- if (fstat (fd, &st) == -1 || st.st_size != 4000)
+ if (fstat64 (fd, &st) == -1)
error (EXIT_FAILURE, 0, "stat failed");
+ if (st.st_size != 4000)
+ error (EXIT_FAILURE, 0, "size incorrect");
mem = mmap (NULL, 4000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (mem == NULL)
@@ -131,7 +133,7 @@
pid_t pid2;
int status1;
int status2;
- struct stat st;
+ struct stat64 st;
/* Create the shared memory object. */
fd = shm_open ("/shm-test", O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600);
@@ -155,10 +157,15 @@
return 0;
}
- if (fstat (fd, &st) == -1 || st.st_size != 4000)
+ if (fstat64 (fd, &st) == -1)
{
shm_unlink ("/shm-test");
error (EXIT_FAILURE, 0, "initial stat failed");
+ }
+ if (st.st_size != 4000)
+ {
+ shm_unlink ("/shm-test");
+ error (EXIT_FAILURE, 0, "initial size not correct");
}
/* Spawn to processes which will do the work. */
Modified: fsf/glibc-2_6-branch/libc/stdio-common/Makefile
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/Makefile (original)
+++ fsf/glibc-2_6-branch/libc/stdio-common/Makefile Fri Jul 13 00:05:15 2007
@@ -54,7 +54,8 @@
tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
- tst-fwrite bug16 bug17 tst-swscanf
+ tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
+ bug19 bug19a
test-srcs = tst-unbputc tst-printf
Added: fsf/glibc-2_6-branch/libc/stdio-common/bug18.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/bug18.c (added)
+++ fsf/glibc-2_6-branch/libc/stdio-common/bug18.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,48 @@
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+#ifndef CHAR
+# define CHAR char
+# define L(str) str
+# define SSCANF sscanf
+#endif
+
+
+static int
+do_test (void)
+{
+ printf("setting errno to EINTR\n");
+ errno = EINTR;
+
+ printf("checking sscanf\n");
+
+ CHAR str[] = L("7-11");
+ int i, j, n;
+
+ i = j = n = 0;
+ SSCANF (str, L(" %i - %i %n"), &i, &j, &n);
+ printf ("found %i-%i (length=%i)\n", i, j, n);
+
+ int result = 0;
+ if (i != 7)
+ {
+ printf ("i is %d, expected 7\n", i);
+ result = 1;
+ }
+ if (j != 11)
+ {
+ printf ("j is %d, expected 11\n", j);
+ result = 1;
+ }
+ if (n != 4)
+ {
+ printf ("n is %d, expected 4\n", j);
+ result = 1;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
Added: fsf/glibc-2_6-branch/libc/stdio-common/bug18a.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/bug18a.c (added)
+++ fsf/glibc-2_6-branch/libc/stdio-common/bug18a.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,6 @@
+#include <wchar.h>
+#define CHAR wchar_t
+#define L(str) L##str
+#define SSCANF swscanf
+
+#include "bug18.c"
Added: fsf/glibc-2_6-branch/libc/stdio-common/bug19.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/bug19.c (added)
+++ fsf/glibc-2_6-branch/libc/stdio-common/bug19.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,58 @@
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+#ifndef CHAR
+# define CHAR char
+# define L(str) str
+# define FPUTS fputs
+# define FSCANF fscanf
+#endif
+
+
+static int
+do_test (void)
+{
+ FILE *fp = tmpfile ();
+ if (fp == NULL)
+ {
+ puts ("cannot open file");
+ return 1;
+ }
+
+ FPUTS (L("7-11"), fp);
+ rewind (fp);
+
+ printf("setting errno to EINTR\n");
+ errno = EINTR;
+
+ printf("checking sscanf\n");
+
+ int i, j, n;
+
+ i = j = n = 0;
+ FSCANF (fp, L(" %i - %i %n"), &i, &j, &n);
+ printf ("found %i-%i (length=%i)\n", i, j, n);
+
+ int result = 0;
+ if (i != 7)
+ {
+ printf ("i is %d, expected 7\n", i);
+ result = 1;
+ }
+ if (j != 11)
+ {
+ printf ("j is %d, expected 11\n", j);
+ result = 1;
+ }
+ if (n != 4)
+ {
+ printf ("n is %d, expected 4\n", j);
+ result = 1;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
Added: fsf/glibc-2_6-branch/libc/stdio-common/bug19a.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/bug19a.c (added)
+++ fsf/glibc-2_6-branch/libc/stdio-common/bug19a.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,7 @@
+#include <wchar.h>
+#define CHAR wchar_t
+#define L(str) L##str
+#define FPUTS fputws
+#define FSCANF fwscanf
+
+#include "bug19.c"
Modified: fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf.c (original)
+++ fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf.c Fri Jul 13 00:05:15 2007
@@ -37,5 +37,26 @@
free (dst);
}
+ if (sprintf (buf, "%1$d%3$.*2$s%4$d", 7, 67108863, "x", 8) != 3
+ || strcmp (buf, "7x8") != 0)
+ {
+ printf ("sprintf (buf, \"%%1$d%%3$.*2$s%%4$d\", 7, 67108863, \"x\", 8) produced `%s' output", buf);
+ result = 1;
+ }
+
+ if (sprintf (buf, "%67108863.16\"%d", 7) != 14
+ || strcmp (buf, "%67108863.16\"7") != 0)
+ {
+ printf ("sprintf (buf, \"%%67108863.16\\\"%%d\", 7) produced `%s' output", buf);
+ result = 1;
+ }
+
+ if (sprintf (buf, "%*\"%d", 0x3ffffff, 7) != 11
+ || strcmp (buf, "%67108863\"7") != 0)
+ {
+ printf ("sprintf (buf, \"%%*\\\"%%d\", 0x3ffffff, 7) produced `%s' output", buf);
+ result = 1;
+ }
+
return result;
}
Added: fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf2.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf2.c (added)
+++ fsf/glibc-2_6-branch/libc/stdio-common/tst-sprintf2.c Fri Jul 13 00:05:15 2007
@@ -1,0 +1,82 @@
+#include <float.h>
+#include <math.h>
+#include <stdio.h>
+#include <string.h>
+
+int
+main (void)
+{
+ volatile union { long double l; long long x[2]; } u, v;
+ char buf[64];
+ int result = 0;
+
+#if LDBL_MANT_DIG == 106 || LDBL_MANT_DIG == 113
+# define COMPARE_LDBL(u, v) \
+ ((u).l == (v).l && (u).x[0] == (v).x[0] && (u).x[1] == (v).x[1])
+#else
+# define COMPARE_LDBL(u, v) ((u).l == (v).l)
+#endif
+
+#define TEST(val) \
+ do \
+ { \
+ u.l = (val); \
+ snprintf (buf, sizeof buf, "%LaL", u.l); \
+ if (strcmp (buf, #val) != 0) \
+ { \
+ printf ("Error on line %d: %s != %s\n", __LINE__, buf, #val); \
+ result = 1; \
+ } \
+ if (sscanf (#val, "%La", &v.l) != 1 || !COMPARE_LDBL (u, v)) \
+ { \
+ printf ("Error sscanf on line %d: %La != %La\n", __LINE__, \
+ u.l, v.l); \
+ result = 1; \
+ } \
+ /* printf ("%s %La %016Lx %016Lx\n", #val, u.l, u.x[0], u.x[1]); */ \
+ } \
+ while (0)
+
+#if LDBL_MANT_DIG >= 106
+# if LDBL_MANT_DIG == 106
+ TEST (0x0.ffffffffffffp-1022L);
+ TEST (0x0.ffffffffffff1p-1022L);
+ TEST (0x0.fffffffffffffp-1022L);
+# endif
+ TEST (0x1p-1022L);
+ TEST (0x1.0000000000001p-1022L);
+ TEST (0x1.00000000001e7p-1022L);
+ TEST (0x1.fffffffffffffp-1022L);
+ TEST (0x1p-1021L);
+ TEST (0x1.00000000000008p-1021L);
+ TEST (0x1.0000000000001p-1021L);
+ TEST (0x1.00000000000018p-1021L);
+ TEST (0x1.0000000000000f8p-1017L);
+ TEST (0x1.0000000000001p-1017L);
+ TEST (0x1.000000000000108p-1017L);
+ TEST (0x1.000000000000dcf8p-1013L);
+ TEST (0x1.000000000000ddp-1013L);
+ TEST (0x1.000000000000dd08p-1013L);
+ TEST (0x1.ffffffffffffffffffffffffffp-1L);
+ TEST (0x1.ffffffffffffffffffffffffff8p-1L);
+ TEST (0x1p+0L);
+ TEST (0x1.000000000000000000000000008p+0L);
+ TEST (0x1.00000000000000000000000001p+0L);
+ TEST (0x1.000000000000000000000000018p+0L);
+ TEST (0x1.23456789abcdef123456789abc8p+0L);
+ TEST (0x1.23456789abcde7123456789abc8p+0L);
+ TEST (0x1.23456789abcdef123456789abc8p+64L);
+ TEST (0x1.23456789abcde7123456789abc8p+64L);
+ TEST (0x1.123456789abcdef123456789p-969L);
+# if LDBL_MANT_DIG == 106
+ TEST (-0x1.2d71957cc1263bbbeb1d365f1e8p-969L);
+ TEST (0x1.23456789abcdef0123456789abp-970L);
+ TEST (0x1.579bde02468acp-1001L);
+ TEST (0x0.abcdef0123456p-1022L);
+ TEST (0x1.abcdef0123456p-1022L);
+ TEST (0x1.abcdef012345678p-1014L);
+ TEST (0x1.abcdef0123456f8p-1014L);
+# endif
+#endif
+ return result;
+}
Modified: fsf/glibc-2_6-branch/libc/stdio-common/vfprintf.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/vfprintf.c (original)
+++ fsf/glibc-2_6-branch/libc/stdio-common/vfprintf.c Fri Jul 13 00:05:15 2007
@@ -1627,6 +1627,8 @@
/* Just a counter. */
size_t cnt;
+ free (workstart);
+ workstart = NULL;
if (grouping == (const char *) -1)
{
@@ -1801,7 +1803,9 @@
int use_outdigits = specs[nspecs_done].info.i18n;
char pad = specs[nspecs_done].info.pad;
CHAR_T spec = specs[nspecs_done].info.spec;
- CHAR_T *workstart = NULL;
+
+ workstart = NULL;
+ workend = &work_buffer[sizeof (work_buffer) / sizeof (CHAR_T)];
/* Fill in last information. */
if (specs[nspecs_done].width_arg != -1)
@@ -1897,8 +1901,7 @@
break;
}
- if (__builtin_expect (workstart != NULL, 0))
- free (workstart);
+ free (workstart);
workstart = NULL;
/* Write the following constant string. */
@@ -1926,7 +1929,7 @@
{
int done = 0;
- CHAR_T work_buffer[MAX (info->width, info->spec) + 32];
+ CHAR_T work_buffer[MAX (sizeof (info->width), sizeof (info->prec)) * 3];
CHAR_T *const workend
= &work_buffer[sizeof (work_buffer) / sizeof (CHAR_T)];
register CHAR_T *w;
Modified: fsf/glibc-2_6-branch/libc/stdio-common/vfscanf.c
==============================================================================
--- fsf/glibc-2_6-branch/libc/stdio-common/vfscanf.c (original)
+++ fsf/glibc-2_6-branch/libc/stdio-common/vfscanf.c Fri Jul 13 00:05:15 2007
@@ -530,12 +530,17 @@
{
/* Eat whitespace. */
int save_errno = errno;
- errno = 0;
+ __set_errno (0);
do
- if (__builtin_expect (inchar () == EOF && errno == EINTR, 0))
+ /* We add the additional test for EOF here since otherwise
+ inchar will restore the old errno value which might be
+ EINTR but does not indicate an interrupt since nothing
+ was read at this time. */
+ if (__builtin_expect ((c == EOF || inchar () == EOF)
+ && errno == EINTR, 0))
input_error ();
while (ISSPACE (c));
- errno = save_errno;
+ __set_errno (save_errno);
ungetc (c, s);
skip_space = 0;
}
Modified: fsf/glibc-2_6-branch/libc/sysdeps/generic/ldsodefs.h
==============================================================================
--- fsf/glibc-2_6-branch/libc/sysdeps/generic/ldsodefs.h (original)
+++ fsf/glibc-2_6-branch/libc/sysdeps/generic/ldsodefs.h Fri Jul 13 00:05:15 2007
@@ -38,7 +38,6 @@
#include <bits/libc-lock.h>
#include <hp-timing.h>
#include <tls.h>
-#include <rtld-lowlevel.h>
__BEGIN_DECLS
@@ -439,18 +438,18 @@
EXTERN void (*_dl_rtld_unlock_recursive) (void *);
#endif
- /* Prevailing state of the stack, PF_X indicating it's executable. */
- EXTERN ElfW(Word) _dl_stack_flags;
-
/* If loading a shared object requires that we make the stack executable
when it was not, we do it by calling this function.
It returns an errno code or zero on success. */
EXTERN int (*_dl_make_stack_executable_hook) (void **) internal_function;
+ /* Prevailing state of the stack, PF_X indicating it's executable. */
+ EXTERN ElfW(Word) _dl_stack_flags;
+
+ /* Flag signalling whether there are gaps in the module ID allocation. */
+ EXTERN bool _dl_tls_dtv_gaps;
/* Highest dtv index currently needed. */
EXTERN size_t _dl_tls_max_dtv_idx;
- /* Flag signalling whether there are gaps in the module ID allocation. */
- EXTERN bool _dl_tls_dtv_gaps;
/* Information about the dtv slots. */
EXTERN struct dtv_slotinfo_list
{
@@ -486,6 +485,14 @@
EXTERN void (*_dl_init_static_tls) (struct link_map *);
+ EXTERN void (*_dl_wait_lookup_done) (void);
+
+ /* Scopes to free after next THREAD_GSCOPE_WAIT (). */
+ EXTERN struct dl_scope_free_list
+ {
+ size_t count;
+ struct r_scope_elem **list[50];
+ } *_dl_scope_free_list;
#ifdef SHARED
};
# define __rtld_global_attribute__
@@ -532,15 +539,15 @@
#define DL_DEBUG_HELP (1 << 9)
#define DL_DEBUG_PRELINK (1 << 10)
- /* Cached value of `getpagesize ()'. */
- EXTERN size_t _dl_pagesize;
-
/* OS version. */
EXTERN unsigned int _dl_osversion;
/* Platform name. */
EXTERN const char *_dl_platform;
EXTERN size_t _dl_platformlen;
+ /* Cached value of `getpagesize ()'. */
+ EXTERN size_t _dl_pagesize;
+
/* Copy of the content of `_dl_main_searchlist' at startup time. */
EXTERN struct r_scope_elem _dl_initial_searchlist;
@@ -568,9 +575,6 @@
/* Expected cache ID. */
EXTERN int _dl_correct_cache_id;
-
- /* 0 if internal pointer values should not be guarded, 1 if they should. */
- EXTERN int _dl_pointer_guard;
/* Mask for hardware capabilities that are available. */
EXTERN uint64_t _dl_hwcap;
@@ -655,6 +659,9 @@
/* List of auditing interfaces. */
struct audit_ifaces *_dl_audit;
unsigned int _dl_naudit;
+
+ /* 0 if internal pointer values should not be guarded, 1 if they should. */
+ EXTERN int _dl_pointer_guard;
};
# define __rtld_global_attribute__
# ifdef IS_IN_rtld
@@ -838,9 +845,7 @@
DL_LOOKUP_ADD_DEPENDENCY = 1,
/* Return most recent version instead of default version for
unversioned lookup. */
- DL_LOOKUP_RETURN_NEWEST = 2,
- /* Set if the scopr lock in the UNDEF_MAP is taken. */
- DL_LOOKUP_SCOPE_LOCK = 4
+ DL_LOOKUP_RETURN_NEWEST = 2
};
/* Lookup versioned symbol. */
@@ -1048,6 +1053,11 @@
Lmid_t nsid, int argc, char *argv[], char *env[])
attribute_hidden;
+/* Free or queue for freeing scope OLD. If other threads might be
+ in the middle of _dl_fixup, _dl_profile_fixup or dl*sym using the
+ old scope, OLD can't be freed until no thread is using it. */
+extern int _dl_scope_free (struct r_scope_elem **old) attribute_hidden;
+
/* Add module to slot information data. */
extern void _dl_add_to_slotinfo (struct link_map *l) attribute_hidden;
[... 2182 lines stripped ...]