11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
644 lines
19 KiB
C
644 lines
19 KiB
C
/* Load the dependencies of a mapped object.
|
|
Copyright (C) 1996-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <assert.h>
|
|
#include <dlfcn.h>
|
|
#include <errno.h>
|
|
#include <libintl.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/param.h>
|
|
#include <ldsodefs.h>
|
|
|
|
#include <dl-dst.h>
|
|
|
|
/* Whether an shared object references one or more auxiliary objects
|
|
is signaled by the AUXTAG entry in l_info. */
|
|
#define AUXTAG (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
|
|
+ DT_EXTRATAGIDX (DT_AUXILIARY))
|
|
/* Whether an shared object references one or more auxiliary objects
|
|
is signaled by the AUXTAG entry in l_info. */
|
|
#define FILTERTAG (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
|
|
+ DT_EXTRATAGIDX (DT_FILTER))
|
|
|
|
|
|
/* When loading auxiliary objects we must ignore errors. It's ok if
|
|
an object is missing. */
|
|
struct openaux_args
|
|
{
|
|
/* The arguments to openaux. */
|
|
struct link_map *map;
|
|
int trace_mode;
|
|
int open_mode;
|
|
const char *strtab;
|
|
const char *name;
|
|
|
|
/* The return value of openaux. */
|
|
struct link_map *aux;
|
|
};
|
|
|
|
static void
|
|
openaux (void *a)
|
|
{
|
|
struct openaux_args *args = (struct openaux_args *) a;
|
|
|
|
args->aux = _dl_map_object (args->map, args->name, 0,
|
|
(args->map->l_type == lt_executable
|
|
? lt_library : args->map->l_type),
|
|
args->trace_mode, args->open_mode,
|
|
args->map->l_ns);
|
|
}
|
|
|
|
static ptrdiff_t
|
|
internal_function
|
|
_dl_build_local_scope (struct link_map **list, struct link_map *map)
|
|
{
|
|
struct link_map **p = list;
|
|
struct link_map **q;
|
|
|
|
*p++ = map;
|
|
map->l_reserved = 1;
|
|
if (map->l_initfini)
|
|
for (q = map->l_initfini + 1; *q; ++q)
|
|
if (! (*q)->l_reserved)
|
|
p += _dl_build_local_scope (p, *q);
|
|
return p - list;
|
|
}
|
|
|
|
|
|
/* We use a very special kind of list to track the path
|
|
through the list of loaded shared objects. We have to
|
|
produce a flat list with unique members of all involved objects.
|
|
*/
|
|
struct list
|
|
{
|
|
int done; /* Nonzero if this map was processed. */
|
|
struct link_map *map; /* The data. */
|
|
struct list *next; /* Elements for normal list. */
|
|
};
|
|
|
|
|
|
/* Macro to expand DST. It is an macro since we use `alloca'. */
|
|
#define expand_dst(l, str, fatal) \
|
|
({ \
|
|
const char *__str = (str); \
|
|
const char *__result = __str; \
|
|
size_t __dst_cnt = DL_DST_COUNT (__str, 0); \
|
|
\
|
|
if (__dst_cnt != 0) \
|
|
{ \
|
|
char *__newp; \
|
|
\
|
|
/* DST must not appear in SUID/SGID programs. */ \
|
|
if (INTUSE(__libc_enable_secure)) \
|
|
_dl_signal_error (0, __str, NULL, N_("\
|
|
DST not allowed in SUID/SGID programs")); \
|
|
\
|
|
__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str), \
|
|
__dst_cnt)); \
|
|
\
|
|
__result = _dl_dst_substitute (l, __str, __newp, 0); \
|
|
\
|
|
if (*__result == '\0') \
|
|
{ \
|
|
/* The replacement for the DST is not known. We can't \
|
|
processed. */ \
|
|
if (fatal) \
|
|
_dl_signal_error (0, __str, NULL, N_("\
|
|
empty dynamic string token substitution")); \
|
|
else \
|
|
{ \
|
|
/* This is for DT_AUXILIARY. */ \
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS, 0))\
|
|
_dl_debug_printf (N_("\
|
|
cannot load auxiliary `%s' because of empty dynamic string token " \
|
|
"substitution\n"), __str); \
|
|
continue; \
|
|
} \
|
|
} \
|
|
} \
|
|
\
|
|
__result; })
|
|
|
|
|
|
void
|
|
internal_function
|
|
_dl_map_object_deps (struct link_map *map,
|
|
struct link_map **preloads, unsigned int npreloads,
|
|
int trace_mode, int open_mode)
|
|
{
|
|
struct list *known = __alloca (sizeof *known * (1 + npreloads + 1));
|
|
struct list *runp, *tail;
|
|
unsigned int nlist, i;
|
|
/* Object name. */
|
|
const char *name;
|
|
int errno_saved;
|
|
int errno_reason;
|
|
const char *errstring;
|
|
const char *objname;
|
|
|
|
auto inline void preload (struct link_map *map);
|
|
|
|
inline void preload (struct link_map *map)
|
|
{
|
|
known[nlist].done = 0;
|
|
known[nlist].map = map;
|
|
known[nlist].next = &known[nlist + 1];
|
|
|
|
++nlist;
|
|
/* We use `l_reserved' as a mark bit to detect objects we have
|
|
already put in the search list and avoid adding duplicate
|
|
elements later in the list. */
|
|
map->l_reserved = 1;
|
|
}
|
|
|
|
/* No loaded object so far. */
|
|
nlist = 0;
|
|
|
|
/* First load MAP itself. */
|
|
preload (map);
|
|
|
|
/* Add the preloaded items after MAP but before any of its dependencies. */
|
|
for (i = 0; i < npreloads; ++i)
|
|
preload (preloads[i]);
|
|
|
|
/* Terminate the lists. */
|
|
known[nlist - 1].next = NULL;
|
|
|
|
/* Pointer to last unique object. */
|
|
tail = &known[nlist - 1];
|
|
|
|
/* Process each element of the search list, loading each of its
|
|
auxiliary objects and immediate dependencies. Auxiliary objects
|
|
will be added in the list before the object itself and
|
|
dependencies will be appended to the list as we step through it.
|
|
This produces a flat, ordered list that represents a
|
|
breadth-first search of the dependency tree.
|
|
|
|
The whole process is complicated by the fact that we better
|
|
should use alloca for the temporary list elements. But using
|
|
alloca means we cannot use recursive function calls. */
|
|
errno_saved = errno;
|
|
errno_reason = 0;
|
|
errstring = NULL;
|
|
errno = 0;
|
|
name = NULL;
|
|
for (runp = known; runp; )
|
|
{
|
|
struct link_map *l = runp->map;
|
|
struct link_map **needed = NULL;
|
|
unsigned int nneeded = 0;
|
|
|
|
/* Unless otherwise stated, this object is handled. */
|
|
runp->done = 1;
|
|
|
|
/* Allocate a temporary record to contain the references to the
|
|
dependencies of this object. */
|
|
if (l->l_searchlist.r_list == NULL && l->l_initfini == NULL
|
|
&& l != map && l->l_ldnum > 0)
|
|
needed = (struct link_map **) alloca (l->l_ldnum
|
|
* sizeof (struct link_map *));
|
|
|
|
if (l->l_info[DT_NEEDED] || l->l_info[AUXTAG] || l->l_info[FILTERTAG])
|
|
{
|
|
const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
|
|
struct openaux_args args;
|
|
struct list *orig;
|
|
const ElfW(Dyn) *d;
|
|
|
|
args.strtab = strtab;
|
|
args.map = l;
|
|
args.trace_mode = trace_mode;
|
|
args.open_mode = open_mode;
|
|
orig = runp;
|
|
|
|
for (d = l->l_ld; d->d_tag != DT_NULL; ++d)
|
|
if (__builtin_expect (d->d_tag, DT_NEEDED) == DT_NEEDED)
|
|
{
|
|
/* Map in the needed object. */
|
|
struct link_map *dep;
|
|
|
|
/* Recognize DSTs. */
|
|
name = expand_dst (l, strtab + d->d_un.d_val, 0);
|
|
/* Store the tag in the argument structure. */
|
|
args.name = name;
|
|
|
|
bool malloced;
|
|
int err = _dl_catch_error (&objname, &errstring, &malloced,
|
|
openaux, &args);
|
|
if (__builtin_expect (errstring != NULL, 0))
|
|
{
|
|
char *new_errstring = strdupa (errstring);
|
|
objname = strdupa (objname);
|
|
if (malloced)
|
|
free ((char *) errstring);
|
|
errstring = new_errstring;
|
|
|
|
if (err)
|
|
errno_reason = err;
|
|
else
|
|
errno_reason = -1;
|
|
goto out;
|
|
}
|
|
else
|
|
dep = args.aux;
|
|
|
|
if (! dep->l_reserved)
|
|
{
|
|
/* Allocate new entry. */
|
|
struct list *newp;
|
|
|
|
newp = alloca (sizeof (struct list));
|
|
|
|
/* Append DEP to the list. */
|
|
newp->map = dep;
|
|
newp->done = 0;
|
|
newp->next = NULL;
|
|
tail->next = newp;
|
|
tail = newp;
|
|
++nlist;
|
|
/* Set the mark bit that says it's already in the list. */
|
|
dep->l_reserved = 1;
|
|
}
|
|
|
|
/* Remember this dependency. */
|
|
if (needed != NULL)
|
|
needed[nneeded++] = dep;
|
|
}
|
|
else if (d->d_tag == DT_AUXILIARY || d->d_tag == DT_FILTER)
|
|
{
|
|
struct list *newp;
|
|
|
|
/* Recognize DSTs. */
|
|
name = expand_dst (l, strtab + d->d_un.d_val,
|
|
d->d_tag == DT_AUXILIARY);
|
|
/* Store the tag in the argument structure. */
|
|
args.name = name;
|
|
|
|
if (d->d_tag == DT_AUXILIARY)
|
|
{
|
|
/* Say that we are about to load an auxiliary library. */
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS,
|
|
0))
|
|
_dl_debug_printf ("load auxiliary object=%s"
|
|
" requested by file=%s\n",
|
|
name,
|
|
l->l_name[0]
|
|
? l->l_name : rtld_progname);
|
|
|
|
/* We must be prepared that the addressed shared
|
|
object is not available. */
|
|
bool malloced;
|
|
(void) _dl_catch_error (&objname, &errstring, &malloced,
|
|
openaux, &args);
|
|
if (__builtin_expect (errstring != NULL, 0))
|
|
{
|
|
/* We are not interested in the error message. */
|
|
assert (errstring != NULL);
|
|
if (malloced)
|
|
free ((char *) errstring);
|
|
|
|
/* Simply ignore this error and continue the work. */
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* Say that we are about to load an auxiliary library. */
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_LIBS,
|
|
0))
|
|
_dl_debug_printf ("load filtered object=%s"
|
|
" requested by file=%s\n",
|
|
name,
|
|
l->l_name[0]
|
|
? l->l_name : rtld_progname);
|
|
|
|
/* For filter objects the dependency must be available. */
|
|
bool malloced;
|
|
int err = _dl_catch_error (&objname, &errstring, &malloced,
|
|
openaux, &args);
|
|
if (__builtin_expect (errstring != NULL, 0))
|
|
{
|
|
char *new_errstring = strdupa (errstring);
|
|
objname = strdupa (objname);
|
|
if (malloced)
|
|
free ((char *) errstring);
|
|
errstring = new_errstring;
|
|
|
|
if (err)
|
|
errno_reason = err;
|
|
else
|
|
errno_reason = -1;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
/* The auxiliary object is actually available.
|
|
Incorporate the map in all the lists. */
|
|
|
|
/* Allocate new entry. This always has to be done. */
|
|
newp = alloca (sizeof (struct list));
|
|
|
|
/* We want to insert the new map before the current one,
|
|
but we have no back links. So we copy the contents of
|
|
the current entry over. Note that ORIG and NEWP now
|
|
have switched their meanings. */
|
|
memcpy (newp, orig, sizeof (*newp));
|
|
|
|
/* Initialize new entry. */
|
|
orig->done = 0;
|
|
orig->map = args.aux;
|
|
|
|
/* Remember this dependency. */
|
|
if (needed != NULL)
|
|
needed[nneeded++] = args.aux;
|
|
|
|
/* We must handle two situations here: the map is new,
|
|
so we must add it in all three lists. If the map
|
|
is already known, we have two further possibilities:
|
|
- if the object is before the current map in the
|
|
search list, we do nothing. It is already found
|
|
early
|
|
- if the object is after the current one, we must
|
|
move it just before the current map to make sure
|
|
the symbols are found early enough
|
|
*/
|
|
if (args.aux->l_reserved)
|
|
{
|
|
/* The object is already somewhere in the list.
|
|
Locate it first. */
|
|
struct list *late;
|
|
|
|
/* This object is already in the search list we
|
|
are building. Don't add a duplicate pointer.
|
|
Just added by _dl_map_object. */
|
|
for (late = newp; late->next != NULL; late = late->next)
|
|
if (late->next->map == args.aux)
|
|
break;
|
|
|
|
if (late->next != NULL)
|
|
{
|
|
/* The object is somewhere behind the current
|
|
position in the search path. We have to
|
|
move it to this earlier position. */
|
|
orig->next = newp;
|
|
|
|
/* Now remove the later entry from the list
|
|
and adjust the tail pointer. */
|
|
if (tail == late->next)
|
|
tail = late;
|
|
late->next = late->next->next;
|
|
|
|
/* We must move the object earlier in the chain. */
|
|
if (args.aux->l_prev != NULL)
|
|
args.aux->l_prev->l_next = args.aux->l_next;
|
|
if (args.aux->l_next != NULL)
|
|
args.aux->l_next->l_prev = args.aux->l_prev;
|
|
|
|
args.aux->l_prev = newp->map->l_prev;
|
|
newp->map->l_prev = args.aux;
|
|
if (args.aux->l_prev != NULL)
|
|
args.aux->l_prev->l_next = args.aux;
|
|
args.aux->l_next = newp->map;
|
|
}
|
|
else
|
|
{
|
|
/* The object must be somewhere earlier in the
|
|
list. Undo to the current list element what
|
|
we did above. */
|
|
memcpy (orig, newp, sizeof (*newp));
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* This is easy. We just add the symbol right here. */
|
|
orig->next = newp;
|
|
++nlist;
|
|
/* Set the mark bit that says it's already in the list. */
|
|
args.aux->l_reserved = 1;
|
|
|
|
/* The only problem is that in the double linked
|
|
list of all objects we don't have this new
|
|
object at the correct place. Correct this here. */
|
|
if (args.aux->l_prev)
|
|
args.aux->l_prev->l_next = args.aux->l_next;
|
|
if (args.aux->l_next)
|
|
args.aux->l_next->l_prev = args.aux->l_prev;
|
|
|
|
args.aux->l_prev = newp->map->l_prev;
|
|
newp->map->l_prev = args.aux;
|
|
if (args.aux->l_prev != NULL)
|
|
args.aux->l_prev->l_next = args.aux;
|
|
args.aux->l_next = newp->map;
|
|
}
|
|
|
|
/* Move the tail pointer if necessary. */
|
|
if (orig == tail)
|
|
tail = newp;
|
|
|
|
/* Move on the insert point. */
|
|
orig = newp;
|
|
}
|
|
}
|
|
|
|
/* Terminate the list of dependencies and store the array address. */
|
|
if (needed != NULL)
|
|
{
|
|
needed[nneeded++] = NULL;
|
|
|
|
l->l_initfini = (struct link_map **)
|
|
malloc ((2 * nneeded + 1) * sizeof needed[0]);
|
|
if (l->l_initfini == NULL)
|
|
_dl_signal_error (ENOMEM, map->l_name, NULL,
|
|
N_("cannot allocate dependency list"));
|
|
l->l_initfini[0] = l;
|
|
memcpy (&l->l_initfini[1], needed, nneeded * sizeof needed[0]);
|
|
memcpy (&l->l_initfini[nneeded + 1], l->l_initfini,
|
|
nneeded * sizeof needed[0]);
|
|
}
|
|
|
|
/* If we have no auxiliary objects just go on to the next map. */
|
|
if (runp->done)
|
|
do
|
|
runp = runp->next;
|
|
while (runp != NULL && runp->done);
|
|
}
|
|
|
|
out:
|
|
if (errno == 0 && errno_saved != 0)
|
|
__set_errno (errno_saved);
|
|
|
|
if (map->l_initfini != NULL && map->l_type == lt_loaded)
|
|
{
|
|
/* This object was previously loaded as a dependency and we have
|
|
a separate l_initfini list. We don't need it anymore. */
|
|
assert (map->l_searchlist.r_list == NULL);
|
|
free (map->l_initfini);
|
|
}
|
|
|
|
/* Store the search list we built in the object. It will be used for
|
|
searches in the scope of this object. */
|
|
map->l_initfini =
|
|
(struct link_map **) malloc ((2 * nlist + 1)
|
|
* sizeof (struct link_map *));
|
|
if (map->l_initfini == NULL)
|
|
_dl_signal_error (ENOMEM, map->l_name, NULL,
|
|
N_("cannot allocate symbol search list"));
|
|
|
|
|
|
map->l_searchlist.r_list = &map->l_initfini[nlist + 1];
|
|
map->l_searchlist.r_nlist = nlist;
|
|
|
|
for (nlist = 0, runp = known; runp; runp = runp->next)
|
|
{
|
|
if (__builtin_expect (trace_mode, 0) && runp->map->l_faked)
|
|
/* This can happen when we trace the loading. */
|
|
--map->l_searchlist.r_nlist;
|
|
else
|
|
map->l_searchlist.r_list[nlist++] = runp->map;
|
|
|
|
/* Now clear all the mark bits we set in the objects on the search list
|
|
to avoid duplicates, so the next call starts fresh. */
|
|
runp->map->l_reserved = 0;
|
|
}
|
|
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK, 0) != 0
|
|
&& map == GL(dl_ns)[LM_ID_BASE]._ns_loaded)
|
|
{
|
|
/* If we are to compute conflicts, we have to build local scope
|
|
for each library, not just the ultimate loader. */
|
|
for (i = 0; i < nlist; ++i)
|
|
{
|
|
struct link_map *l = map->l_searchlist.r_list[i];
|
|
unsigned int j, cnt;
|
|
|
|
/* The local scope has been already computed. */
|
|
if (l == map
|
|
|| (l->l_local_scope[0]
|
|
&& l->l_local_scope[0]->r_nlist) != 0)
|
|
continue;
|
|
|
|
if (l->l_info[AUXTAG] || l->l_info[FILTERTAG])
|
|
{
|
|
/* As current DT_AUXILIARY/DT_FILTER implementation needs to be
|
|
rewritten, no need to bother with prelinking the old
|
|
implementation. */
|
|
_dl_signal_error (EINVAL, l->l_name, NULL, N_("\
|
|
Filters not supported with LD_TRACE_PRELINKING"));
|
|
}
|
|
|
|
cnt = _dl_build_local_scope (map->l_initfini, l);
|
|
assert (cnt <= nlist);
|
|
for (j = 0; j < cnt; j++)
|
|
map->l_initfini[j]->l_reserved = 0;
|
|
|
|
l->l_local_scope[0] =
|
|
(struct r_scope_elem *) malloc (sizeof (struct r_scope_elem)
|
|
+ (cnt
|
|
* sizeof (struct link_map *)));
|
|
if (l->l_local_scope[0] == NULL)
|
|
_dl_signal_error (ENOMEM, map->l_name, NULL,
|
|
N_("cannot allocate symbol search list"));
|
|
l->l_local_scope[0]->r_nlist = cnt;
|
|
l->l_local_scope[0]->r_list =
|
|
(struct link_map **) (l->l_local_scope[0] + 1);
|
|
memcpy (l->l_local_scope[0]->r_list, map->l_initfini,
|
|
cnt * sizeof (struct link_map *));
|
|
}
|
|
}
|
|
|
|
/* Maybe we can remove some relocation dependencies now. */
|
|
assert (map->l_searchlist.r_list[0] == map);
|
|
for (i = 0; i < map->l_reldepsact; ++i)
|
|
{
|
|
unsigned int j;
|
|
|
|
for (j = 1; j < nlist; ++j)
|
|
if (map->l_searchlist.r_list[j] == map->l_reldeps[i])
|
|
{
|
|
/* A direct or transitive dependency is also on the list
|
|
of relocation dependencies. Remove the latter. */
|
|
for (j = i + 1; j < map->l_reldepsact; ++j)
|
|
map->l_reldeps[j - 1] = map->l_reldeps[j];
|
|
|
|
--map->l_reldepsact;
|
|
|
|
/* Account for the '++i' performed by the 'for'. */
|
|
--i;
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Now determine the order in which the initialization has to happen. */
|
|
memcpy (map->l_initfini, map->l_searchlist.r_list,
|
|
nlist * sizeof (struct link_map *));
|
|
/* We can skip looking for the binary itself which is at the front
|
|
of the search list. Look through the list backward so that circular
|
|
dependencies are not changing the order. */
|
|
for (i = 1; i < nlist; ++i)
|
|
{
|
|
struct link_map *l = map->l_searchlist.r_list[i];
|
|
unsigned int j;
|
|
unsigned int k;
|
|
|
|
/* Find the place in the initfini list where the map is currently
|
|
located. */
|
|
for (j = 1; map->l_initfini[j] != l; ++j)
|
|
;
|
|
|
|
/* Find all object for which the current one is a dependency and
|
|
move the found object (if necessary) in front. */
|
|
for (k = j + 1; k < nlist; ++k)
|
|
{
|
|
struct link_map **runp;
|
|
|
|
runp = map->l_initfini[k]->l_initfini;
|
|
if (runp != NULL)
|
|
{
|
|
while (*runp != NULL)
|
|
if (__builtin_expect (*runp++ == l, 0))
|
|
{
|
|
struct link_map *here = map->l_initfini[k];
|
|
|
|
/* Move it now. */
|
|
memmove (&map->l_initfini[j] + 1,
|
|
&map->l_initfini[j],
|
|
(k - j) * sizeof (struct link_map *));
|
|
map->l_initfini[j] = here;
|
|
|
|
/* Don't insert further matches before the last
|
|
entry moved to the front. */
|
|
++j;
|
|
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
/* Terminate the list of dependencies. */
|
|
map->l_initfini[nlist] = NULL;
|
|
|
|
if (errno_reason)
|
|
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
|
|
NULL, errstring);
|
|
}
|