mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-15 02:09:19 +08:00
b359e82cea
Tom Fitzsimmons <fitzsim@redhat.com> * configure.in: Add iconvdata support for x86 linux. * configure: Regenerated. * libc/sys/linux/Makefile.am: Add EL/IX level 3 network, dynamic library, iconv, and linuxthreads support. * libc/sys/linux/configure.in: Ditto. * libc/sys/linux/Makefile.in: Regenerated. * libc/sys/linux/configure: Ditto. * iconvdata/EUC-JP.irreversible: New file. * iconvdata/Makefile.am: Ditto. * iconvdata/Makefile.in: Ditto. * iconvdata/SJIS.irreversible: Ditto. * iconvdata/aclocal.m4: Ditto. * iconvdata/configure: Ditto. * iconvdata/configure.in: Ditto. * iconvdata/dummy.c: Ditto. * iconvdata/euc-jp.c: Ditto. * iconvdata/gconv-modules: Ditto. * iconvdata/jis0201.c: Ditto. * iconvdata/jis0201.h: Ditto. * iconvdata/jis0208.c: Ditto. * iconvdata/jis0208.h: Ditto. * iconvdata/jis0212.c: Ditto. * iconvdata/jis0212.h: Ditto. * iconvdata/sjis.c: Ditto. * libc/include/errno.h: Protect definition of error_t. * libc/sys/linux/gethostid.c: New file. * libc/sys/linux/sethostid.c: Ditto. * libc/sys/linux/dl/Makefile.am: Ditto. * libc/sys/linux/dl/Makefile.in: Ditto. * libc/sys/linux/dl/abi-tag.h: Ditto. * libc/sys/linux/dl/atomicity.h: Ditto. * libc/sys/linux/dl/dl-addr.c: Ditto. * libc/sys/linux/dl/dl-cache.c: Ditto. * libc/sys/linux/dl/dl-cache.h: Ditto. * libc/sys/linux/dl/dl-close.c: Ditto. * libc/sys/linux/dl/dl-debug.c: Ditto. * libc/sys/linux/dl/dl-deps.c: Ditto. * libc/sys/linux/dl/dl-dst.h: Ditto. * libc/sys/linux/dl/dl-error.c: Ditto. * libc/sys/linux/dl/dl-fini.c: Ditto. * libc/sys/linux/dl/dl-init.c: Ditto. * libc/sys/linux/dl/dl-iteratephdr.c: Ditto. * libc/sys/linux/dl/dl-libc.c: Ditto. * libc/sys/linux/dl/dl-librecon.h: Ditto. * libc/sys/linux/dl/dl-load.c: Ditto. * libc/sys/linux/dl/dl-lookup.c: Ditto. * libc/sys/linux/dl/dl-lookupcfg.h: Ditto. * libc/sys/linux/dl/dl-minimal.c: Ditto. * libc/sys/linux/dl/dl-misc.c: Ditto. * libc/sys/linux/dl/dl-object.c: Ditto. * libc/sys/linux/dl/dl-open.c: Ditto. * libc/sys/linux/dl/dl-osinfo.h: Ditto. * libc/sys/linux/dl/dl-profile.c: Ditto. * libc/sys/linux/dl/dl-profstub.c: Ditto. * libc/sys/linux/dl/dl-reloc.c: Ditto. * libc/sys/linux/dl/dl-runtime.c: Ditto. * libc/sys/linux/dl/dl-support.c: Ditto. * libc/sys/linux/dl/dl-sym.c: Ditto. * libc/sys/linux/dl/dl-version.c: Ditto. * libc/sys/linux/dl/dlfcn.h: Ditto. * libc/sys/linux/dl/do-lookup.h: Ditto. * libc/sys/linux/dl/do-rel.h: Ditto. * libc/sys/linux/dl/dynamic-link.h: Ditto. * libc/sys/linux/dl/kernel-features.h: Ditto. * libc/sys/linux/dl/ldsodefs.h: Ditto. * libc/sys/linux/dl/libintl.h: Ditto. * libc/sys/linux/dl/trusted-dirs.h: Ditto. * libc/sys/linux/dl/unsecvars.h: Ditto. * libc/sys/linux/iconv/Makefile.am: Ditto. * libc/sys/linux/iconv/Makefile.in: Ditto. * libc/sys/linux/iconv/categories.def: Ditto. * libc/sys/linux/iconv/dummy-repertoire.c: Ditto. * libc/sys/linux/iconv/gconv.c: Ditto. * libc/sys/linux/iconv/gconv_builtin.c: Ditto. * libc/sys/linux/iconv/gconv_builtin.h: Ditto. * libc/sys/linux/iconv/gconv_cache.c: Ditto. * libc/sys/linux/iconv/gconv_charset.h: Ditto. * libc/sys/linux/iconv/gconv_close.c: Ditto. * libc/sys/linux/iconv/gconv_conf.c: Ditto. * libc/sys/linux/iconv/gconv_db.c: Ditto. * libc/sys/linux/iconv/gconv_dl.c: Ditto. * libc/sys/linux/iconv/gconv_int.h: Ditto. * libc/sys/linux/iconv/gconv_open.c: Ditto. * libc/sys/linux/iconv/gconv_simple.c: Ditto. * libc/sys/linux/iconv/gconv_trans.c: Ditto. * libc/sys/linux/iconv/hash-string.h: Ditto. * libc/sys/linux/iconv/iconv.c: Ditto. * libc/sys/linux/iconv/iconv.h: Ditto. * libc/sys/linux/iconv/iconv_charmap.c: Ditto. * libc/sys/linux/iconv/iconv_close.c: Ditto. * libc/sys/linux/iconv/iconv_open.c: Ditto. * libc/sys/linux/iconv/iconvconfig.c: Ditto. * libc/sys/linux/iconv/iconvconfig.h: Ditto. * libc/sys/linux/iconv/loadinfo.h: Ditto. * libc/sys/linux/iconv/localeinfo.h: Ditto. * libc/sys/linux/iconv/loop.c: Ditto. * libc/sys/linux/iconv/skeleton.c: Ditto. * libc/sys/linux/iconv/strtab.c: Ditto. * libc/sys/linux/include/dl-hash.h: Ditto. * libc/sys/linux/include/dlfcn.h: Ditto. * libc/sys/linux/include/fnmatch.h: Ditto. * libc/sys/linux/include/gconv.h: Ditto. * libc/sys/linux/include/glob.h: Ditto. * libc/sys/linux/include/hesiod.h: Ditto. * libc/sys/linux/include/ifaddrs.h: Ditto. * libc/sys/linux/include/libc_private.h: Ditto. * libc/sys/linux/include/link.h: Ditto. * libc/sys/linux/include/namespace.h: Ditto. * libc/sys/linux/include/netconfig.h: Ditto. * libc/sys/linux/include/netdb.h: Ditto. * libc/sys/linux/include/nsswitch.h: Ditto. * libc/sys/linux/include/regex.h: Ditto. * libc/sys/linux/include/resolv.h: Ditto. * libc/sys/linux/include/rune.h: Ditto. * libc/sys/linux/include/runetype.h: Ditto. * libc/sys/linux/include/semaphore.h: Ditto. * libc/sys/linux/include/setlocale.h: Ditto. * libc/sys/linux/include/un-namespace.h: Ditto. * libc/sys/linux/include/wordexp.h: Ditto. * libc/sys/linux/include/arpa/ftp.h: Ditto. * libc/sys/linux/include/arpa/inet.h: Ditto. * libc/sys/linux/include/arpa/nameser.h: Ditto. * libc/sys/linux/include/arpa/nameser_compat.h: Ditto. * libc/sys/linux/include/arpa/telnet.h: Ditto. * libc/sys/linux/include/arpa/tftp.h: Ditto. * libc/sys/linux/include/net/bpf.h: Ditto. * libc/sys/linux/include/net/bpf_compat.h: Ditto. * libc/sys/linux/include/net/bpfdesc.h: Ditto. * libc/sys/linux/include/net/bridge.h: Ditto. * libc/sys/linux/include/net/ethernet.h: Ditto. * libc/sys/linux/include/net/fddi.h: Ditto. * libc/sys/linux/include/net/if.h: Ditto. * libc/sys/linux/include/net/if_arc.h: Ditto. * libc/sys/linux/include/net/if_arp.h: Ditto. * libc/sys/linux/include/net/if_atm.h: Ditto. * libc/sys/linux/include/net/if_dl.h: Ditto. * libc/sys/linux/include/net/if_gif.h: Ditto. * libc/sys/linux/include/net/if_ieee80211.h: Ditto. * libc/sys/linux/include/net/if_llc.h: Ditto. * libc/sys/linux/include/net/if_media.h: Ditto. * libc/sys/linux/include/net/if_mib.h: Ditto. * libc/sys/linux/include/net/if_ppp.h: Ditto. * libc/sys/linux/include/net/if_pppvar.h: Ditto. * libc/sys/linux/include/net/if_slvar.h: Ditto. * libc/sys/linux/include/net/if_sppp.h: Ditto. * libc/sys/linux/include/net/if_stf.h: Ditto. * libc/sys/linux/include/net/if_tap.h: Ditto. * libc/sys/linux/include/net/if_tapvar.h: Ditto. * libc/sys/linux/include/net/if_tun.h: Ditto. * libc/sys/linux/include/net/if_tunvar.h: Ditto. * libc/sys/linux/include/net/if_types.h: Ditto. * libc/sys/linux/include/net/if_var.h: Ditto. * libc/sys/linux/include/net/if_vlan_var.h: Ditto. * libc/sys/linux/include/net/intrq.h: Ditto. * libc/sys/linux/include/net/iso88025.h: Ditto. * libc/sys/linux/include/net/net_osdep.h: Ditto. * libc/sys/linux/include/net/netisr.h: Ditto. * libc/sys/linux/include/net/pfil.h: Ditto. * libc/sys/linux/include/net/pfkeyv2.h: Ditto. * libc/sys/linux/include/net/ppp_comp.h: Ditto. * libc/sys/linux/include/net/ppp_defs.h: Ditto. * libc/sys/linux/include/net/radix.h: Ditto. * libc/sys/linux/include/net/raw_cb.h: Ditto. * libc/sys/linux/include/net/route.h: Ditto. * libc/sys/linux/include/net/slcompress.h: Ditto. * libc/sys/linux/include/net/slip.h: Ditto. * libc/sys/linux/include/net/zlib.h: Ditto. * libc/sys/linux/include/netinet/icmp6.h: Ditto. * libc/sys/linux/include/netinet/icmp_var.h: Ditto. * libc/sys/linux/include/netinet/if_atm.h: Ditto. * libc/sys/linux/include/netinet/if_ether.h: Ditto. * libc/sys/linux/include/netinet/igmp.h: Ditto. * libc/sys/linux/include/netinet/igmp_var.h: Ditto. * libc/sys/linux/include/netinet/in.h: Ditto. * libc/sys/linux/include/netinet/in_gif.h: Ditto. * libc/sys/linux/include/netinet/in_pcb.h: Ditto. * libc/sys/linux/include/netinet/in_systm.h: Ditto. * libc/sys/linux/include/netinet/in_var.h: Ditto. * libc/sys/linux/include/netinet/ip.h: Ditto. * libc/sys/linux/include/netinet/ip6.h: Ditto. * libc/sys/linux/include/netinet/ip_dummynet.h: Ditto. * libc/sys/linux/include/netinet/ip_ecn.h: Ditto. * libc/sys/linux/include/netinet/ip_encap.h: Ditto. * libc/sys/linux/include/netinet/ip_flow.h: Ditto. * libc/sys/linux/include/netinet/ip_fw.h: Ditto. * libc/sys/linux/include/netinet/ip_icmp.h: Ditto. * libc/sys/linux/include/netinet/ip_mroute.h: Ditto. * libc/sys/linux/include/netinet/ip_var.h: Ditto. * libc/sys/linux/include/netinet/ipprotosw.h: Ditto. * libc/sys/linux/include/netinet/tcp.h: Ditto. * libc/sys/linux/include/netinet/tcp_debug.h: Ditto. * libc/sys/linux/include/netinet/tcp_fsm.h: Ditto. * libc/sys/linux/include/netinet/tcp_seq.h: Ditto. * libc/sys/linux/include/netinet/tcp_timer.h: Ditto. * libc/sys/linux/include/netinet/tcp_var.h: Ditto. * libc/sys/linux/include/netinet/tcpip.h: Ditto. * libc/sys/linux/include/netinet/udp.h: Ditto. * libc/sys/linux/include/netinet/udp_var.h: Ditto. * libc/sys/linux/include/netinet6/ah.h: Ditto. * libc/sys/linux/include/netinet6/ah6.h: Ditto. * libc/sys/linux/include/netinet6/esp.h: Ditto. * libc/sys/linux/include/netinet6/esp6.h: Ditto. * libc/sys/linux/include/netinet6/esp_rijndael.h: Ditto. * libc/sys/linux/include/netinet6/icmp6.h: Ditto. * libc/sys/linux/include/netinet6/in6.h: Ditto. * libc/sys/linux/include/netinet6/in6_gif.h: Ditto. * libc/sys/linux/include/netinet6/in6_ifattach.h: Ditto. * libc/sys/linux/include/netinet6/in6_pcb.h: Ditto. * libc/sys/linux/include/netinet6/in6_prefix.h: Ditto. * libc/sys/linux/include/netinet6/in6_var.h: Ditto. * libc/sys/linux/include/netinet6/ip6.h: Ditto. * libc/sys/linux/include/netinet6/ip6_ecn.h: Ditto. * libc/sys/linux/include/netinet6/ip6_fw.h: Ditto. * libc/sys/linux/include/netinet6/ip6_mroute.h: Ditto. * libc/sys/linux/include/netinet6/ip6_var.h: Ditto. * libc/sys/linux/include/netinet6/ip6protosw.h: Ditto. * libc/sys/linux/include/netinet6/ipcomp.h: Ditto. * libc/sys/linux/include/netinet6/ipcomp6.h: Ditto. * libc/sys/linux/include/netinet6/ipsec.h: Ditto. * libc/sys/linux/include/netinet6/ipsec6.h: Ditto. * libc/sys/linux/include/netinet6/mld6_var.h: Ditto. * libc/sys/linux/include/netinet6/nd6.h: Ditto. * libc/sys/linux/include/netinet6/pim6.h: Ditto. * libc/sys/linux/include/netinet6/pim6_var.h: Ditto. * libc/sys/linux/include/netinet6/raw_ip6.h: Ditto. * libc/sys/linux/include/netinet6/scope6_var.h: Ditto. * libc/sys/linux/include/netinet6/tcp6_var.h: Ditto. * libc/sys/linux/include/netinet6/udp6_var.h: Ditto. * libc/sys/linux/include/netns/idp.h: Ditto. * libc/sys/linux/include/netns/idp_var.h: Ditto. * libc/sys/linux/include/netns/ns.h: Ditto. * libc/sys/linux/include/netns/ns_error.h: Ditto. * libc/sys/linux/include/netns/ns_if.h: Ditto. * libc/sys/linux/include/netns/ns_pcb.h: Ditto. * libc/sys/linux/include/netns/sp.h: Ditto. * libc/sys/linux/include/netns/spidp.h: Ditto. * libc/sys/linux/include/netns/spp_debug.h: Ditto. * libc/sys/linux/include/netns/spp_timer.h: Ditto. * libc/sys/linux/include/netns/spp_var.h: Ditto. * libc/sys/linux/include/rpc/Makefile: Ditto. * libc/sys/linux/include/rpc/auth.h: Ditto. * libc/sys/linux/include/rpc/auth_des.h: Ditto. * libc/sys/linux/include/rpc/auth_kerb.h: Ditto. * libc/sys/linux/include/rpc/auth_unix.h: Ditto. * libc/sys/linux/include/rpc/clnt.h: Ditto. * libc/sys/linux/include/rpc/clnt_soc.h: Ditto. * libc/sys/linux/include/rpc/clnt_stat.h: Ditto. * libc/sys/linux/include/rpc/des.h: Ditto. * libc/sys/linux/include/rpc/des_crypt.h: Ditto. * libc/sys/linux/include/rpc/nettype.h: Ditto. * libc/sys/linux/include/rpc/pmap_clnt.h: Ditto. * libc/sys/linux/include/rpc/pmap_prot.h: Ditto. * libc/sys/linux/include/rpc/pmap_rmt.h: Ditto. * libc/sys/linux/include/rpc/raw.h: Ditto. * libc/sys/linux/include/rpc/rpc.h: Ditto. * libc/sys/linux/include/rpc/rpc_com.h: Ditto. * libc/sys/linux/include/rpc/rpc_msg.h: Ditto. * libc/sys/linux/include/rpc/rpcb_clnt.h: Ditto. * libc/sys/linux/include/rpc/rpcb_prot.h: Ditto. * libc/sys/linux/include/rpc/rpcb_prot.x: Ditto. * libc/sys/linux/include/rpc/rpcent.h: Ditto. * libc/sys/linux/include/rpc/svc.h: Ditto. * libc/sys/linux/include/rpc/svc_auth.h: Ditto. * libc/sys/linux/include/rpc/svc_dg.h: Ditto. * libc/sys/linux/include/rpc/svc_soc.h: Ditto. * libc/sys/linux/include/rpc/types.h: Ditto. * libc/sys/linux/include/rpc/xdr.h: Ditto. * libc/sys/linux/intl/Makefile.am: Ditto. * libc/sys/linux/intl/Makefile.in: Ditto. * libc/sys/linux/intl/bindtextdom.c: Ditto. * libc/sys/linux/intl/catgets.c: Ditto. * libc/sys/linux/intl/catgetsinfo.h: Ditto. * libc/sys/linux/intl/config.h: Ditto. * libc/sys/linux/intl/dcgettext.c: Ditto. * libc/sys/linux/intl/dcigettext.c: Ditto. * libc/sys/linux/intl/dcngettext.c: Ditto. * libc/sys/linux/intl/dgettext.c: Ditto. * libc/sys/linux/intl/dngettext.c: Ditto. * libc/sys/linux/intl/explodename.c: Ditto. * libc/sys/linux/intl/finddomain.c: Ditto. * libc/sys/linux/intl/gettext.c: Ditto. * libc/sys/linux/intl/gettext.h: Ditto. * libc/sys/linux/intl/gettextP.h: Ditto. * libc/sys/linux/intl/hash-string.h: Ditto. * libc/sys/linux/intl/l10nflist.c: Ditto. * libc/sys/linux/intl/loadinfo.h: Ditto. * libc/sys/linux/intl/loadmsgcat.c: Ditto. * libc/sys/linux/intl/locale.alias: Ditto. * libc/sys/linux/intl/localealias.c: Ditto. * libc/sys/linux/intl/ngettext.c: Ditto. * libc/sys/linux/intl/open_catalog.c: Ditto. * libc/sys/linux/intl/plural.c: Ditto. * libc/sys/linux/intl/plural.y: Ditto. * libc/sys/linux/intl/stpcpy.c: Ditto. * libc/sys/linux/intl/textdomain.c: Ditto. * libc/sys/linux/linuxthreads/LICENSE: Ditto. * libc/sys/linux/linuxthreads/Makefile.am: Ditto. * libc/sys/linux/linuxthreads/Makefile.in: Ditto. * libc/sys/linux/linuxthreads/aclocal.m4: Ditto. * libc/sys/linux/linuxthreads/attr.c: Ditto. * libc/sys/linux/linuxthreads/barrier.c: Ditto. * libc/sys/linux/linuxthreads/bp-sym.h: Ditto. * libc/sys/linux/linuxthreads/cancel.c: Ditto. * libc/sys/linux/linuxthreads/condvar.c: Ditto. * libc/sys/linux/linuxthreads/config.h: Ditto. * libc/sys/linux/linuxthreads/configure: Ditto. * libc/sys/linux/linuxthreads/configure.in: Ditto. * libc/sys/linux/linuxthreads/defs.awk: Ditto. * libc/sys/linux/linuxthreads/ecmutex.c: Ditto. * libc/sys/linux/linuxthreads/events.c: Ditto. * libc/sys/linux/linuxthreads/getcpuclockid.c: Ditto. * libc/sys/linux/linuxthreads/getreent.c: Ditto. * libc/sys/linux/linuxthreads/internals.h: Ditto. * libc/sys/linux/linuxthreads/join.c: Ditto. * libc/sys/linux/linuxthreads/joinrace.c: Ditto. * libc/sys/linux/linuxthreads/kernel-features.h: Ditto. * libc/sys/linux/linuxthreads/libc-internal.h: Ditto. * libc/sys/linux/linuxthreads/libc-symbols.h: Ditto. * libc/sys/linux/linuxthreads/linuxthreads.texi: Ditto. * libc/sys/linux/linuxthreads/lockfile.c: Ditto. * libc/sys/linux/linuxthreads/manager.c: Ditto. * libc/sys/linux/linuxthreads/mq_notify.c: Ditto. * libc/sys/linux/linuxthreads/mutex.c: Ditto. * libc/sys/linux/linuxthreads/no-tsd.c: Ditto. * libc/sys/linux/linuxthreads/oldsemaphore.c: Ditto. * libc/sys/linux/linuxthreads/posix-timer.h: Ditto. * libc/sys/linux/linuxthreads/prio.c: Ditto. * libc/sys/linux/linuxthreads/proc_service.h: Ditto. * libc/sys/linux/linuxthreads/pt-machine.c: Ditto. * libc/sys/linux/linuxthreads/ptclock_gettime.c: Ditto. * libc/sys/linux/linuxthreads/ptclock_settime.c: Ditto. * libc/sys/linux/linuxthreads/ptfork.c: Ditto. * libc/sys/linux/linuxthreads/pthread.c: Ditto. * libc/sys/linux/linuxthreads/ptlongjmp.c: Ditto. * libc/sys/linux/linuxthreads/queue.h: Ditto. * libc/sys/linux/linuxthreads/reent.c: Ditto. * libc/sys/linux/linuxthreads/reqsyscalls.c: Ditto. * libc/sys/linux/linuxthreads/restart.h: Ditto. * libc/sys/linux/linuxthreads/rwlock.c: Ditto. * libc/sys/linux/linuxthreads/semaphore.c: Ditto. * libc/sys/linux/linuxthreads/semaphore.h: Ditto. * libc/sys/linux/linuxthreads/shlib-compat.h: Ditto. * libc/sys/linux/linuxthreads/signals.c: Ditto. * libc/sys/linux/linuxthreads/specific.c: Ditto. * libc/sys/linux/linuxthreads/spinlock.c: Ditto. * libc/sys/linux/linuxthreads/spinlock.h: Ditto. * libc/sys/linux/linuxthreads/sysctl.c: Ditto. * libc/sys/linux/linuxthreads/td_init.c: Ditto. * libc/sys/linux/linuxthreads/td_log.c: Ditto. * libc/sys/linux/linuxthreads/td_symbol_list.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_clear_event.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_delete.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_enable_stats.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_event_addr.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_event_getmsg.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_get_nthreads.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_get_ph.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_get_stats.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_map_id2thr.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_map_lwp2thr.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_new.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_reset_stats.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_set_event.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_setconcurrency.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_thr_iter.c: Ditto. * libc/sys/linux/linuxthreads/td_ta_tsd_iter.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_clear_event.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_dbresume.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_dbsuspend.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_event_enable.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_event_getmsg.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_get_info.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getfpregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getgregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getxregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_getxregsize.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_set_event.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setfpregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setgregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setprio.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setsigpending.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_setxregs.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_sigsetmask.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_tsd.c: Ditto. * libc/sys/linux/linuxthreads/td_thr_validate.c: Ditto. * libc/sys/linux/linuxthreads/testrtsig.h: Ditto. * libc/sys/linux/linuxthreads/thread_db.h: Ditto. * libc/sys/linux/linuxthreads/thread_dbP.h: Ditto. * libc/sys/linux/linuxthreads/timer_create.c: Ditto. * libc/sys/linux/linuxthreads/timer_delete.c: Ditto. * libc/sys/linux/linuxthreads/timer_getoverr.c: Ditto. * libc/sys/linux/linuxthreads/timer_gettime.c: Ditto. * libc/sys/linux/linuxthreads/timer_routines.c: Ditto. * libc/sys/linux/linuxthreads/timer_settime.c: Ditto. * libc/sys/linux/linuxthreads/tst-cancel.c: Ditto. * libc/sys/linux/linuxthreads/tst-context.c: Ditto. * libc/sys/linux/linuxthreads/tststack.c: Ditto. * libc/sys/linux/linuxthreads/unload.c: Ditto. * libc/sys/linux/linuxthreads/weaks.c: Ditto. * libc/sys/linux/linuxthreads/wrapsyscall.c: Ditto. * libc/sys/linux/linuxthreads/bits/initspin.h: Ditto. * libc/sys/linux/linuxthreads/bits/libc-lock.h: Ditto. * libc/sys/linux/linuxthreads/bits/libc-tsd.h: Ditto. * libc/sys/linux/linuxthreads/bits/local_lim.h: Ditto. * libc/sys/linux/linuxthreads/bits/posix_opt.h: Ditto. * libc/sys/linux/linuxthreads/bits/pthreadtypes.h: Ditto. * libc/sys/linux/linuxthreads/bits/sigthread.h: Ditto. * libc/sys/linux/linuxthreads/machine/Makefile.am: Ditto. * libc/sys/linux/linuxthreads/machine/Makefile.in: Ditto. * libc/sys/linux/linuxthreads/machine/aclocal.m4: Ditto. * libc/sys/linux/linuxthreads/machine/configure: Ditto. * libc/sys/linux/linuxthreads/machine/configure.in: Ditto. * libc/sys/linux/linuxthreads/machine/generic/generic-sysd: Ditto.ep.h * libc/sys/linux/linuxthreads/machine/i386/Makefile.am: Ditto. * libc/sys/linux/linuxthreads/machine/i386/Makefile.in: Ditto. * libc/sys/linux/linuxthreads/machine/i386/aclocal.m4: Ditto. * libc/sys/linux/linuxthreads/machine/i386/bp-asm.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/clone.S: Ditto. * libc/sys/linux/linuxthreads/machine/i386/configure: Ditto. * libc/sys/linux/linuxthreads/machine/i386/configure.in: Ditto. * libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.S: Ditto. * libc/sys/linux/linuxthreads/machine/i386/i386-sysdep.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/pspinlock.c: Ditto. * libc/sys/linux/linuxthreads/machine/i386/pt-machine.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/sigcontextinfo.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/stackinfo.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/sysdep.S: Ditto. * libc/sys/linux/linuxthreads/machine/i386/sysdep.h: Ditto. * libc/sys/linux/linuxthreads/machine/i386/useldt.h: Ditto. * libc/sys/linux/machine/i386/dl-machine.h: Ditto. * libc/sys/linux/net/Makefile.am: Ditto. * libc/sys/linux/net/Makefile.in: Ditto. * libc/sys/linux/net/addr2ascii.3: Ditto. * libc/sys/linux/net/addr2ascii.c: Ditto. * libc/sys/linux/net/ascii2addr.c: Ditto. * libc/sys/linux/net/base64.c: Ditto. * libc/sys/linux/net/bindresvport.c: Ditto. * libc/sys/linux/net/byteorder.3: Ditto. * libc/sys/linux/net/ether_addr.c: Ditto. * libc/sys/linux/net/ethers.3: Ditto. * libc/sys/linux/net/getaddrinfo.3: Ditto. * libc/sys/linux/net/getaddrinfo.c: Ditto. * libc/sys/linux/net/gethostbydns.c: Ditto. * libc/sys/linux/net/gethostbyht.c: Ditto. * libc/sys/linux/net/gethostbyname.3: Ditto. * libc/sys/linux/net/gethostbynis.c: Ditto. * libc/sys/linux/net/gethostnamadr.c: Ditto. * libc/sys/linux/net/getifaddrs.3: Ditto. * libc/sys/linux/net/getifaddrs.c: Ditto. * libc/sys/linux/net/getipnodebyname.3: Ditto. * libc/sys/linux/net/getnameinfo.3: Ditto. * libc/sys/linux/net/getnameinfo.c: Ditto. * libc/sys/linux/net/getnetbydns.c: Ditto. * libc/sys/linux/net/getnetbyht.c: Ditto. * libc/sys/linux/net/getnetbynis.c: Ditto. * libc/sys/linux/net/getnetent.3: Ditto. * libc/sys/linux/net/getnetnamadr.c: Ditto. * libc/sys/linux/net/getproto.c: Ditto. * libc/sys/linux/net/getprotoent.3: Ditto. * libc/sys/linux/net/getprotoent.c: Ditto. * libc/sys/linux/net/getprotoname.c: Ditto. * libc/sys/linux/net/getservbyname.c: Ditto. * libc/sys/linux/net/getservbyport.c: Ditto. * libc/sys/linux/net/getservent.3: Ditto. * libc/sys/linux/net/getservent.c: Ditto. * libc/sys/linux/net/herror.c: Ditto. * libc/sys/linux/net/hesiod.3: Ditto. * libc/sys/linux/net/hesiod.c: Ditto. * libc/sys/linux/net/if_indextoname.3: Ditto. * libc/sys/linux/net/ifname.c: Ditto. * libc/sys/linux/net/inet.3: Ditto. * libc/sys/linux/net/inet6_option_s: Ditto.pace.3 * libc/sys/linux/net/inet6_rthdr_space.3: Ditto. * libc/sys/linux/net/inet_addr.c: Ditto. * libc/sys/linux/net/inet_lnaof.c: Ditto. * libc/sys/linux/net/inet_makeaddr.c: Ditto. * libc/sys/linux/net/inet_net.3: Ditto. * libc/sys/linux/net/inet_net_ntop.c: Ditto. * libc/sys/linux/net/inet_net_pton.c: Ditto. * libc/sys/linux/net/inet_neta.c: Ditto. * libc/sys/linux/net/inet_netof.c: Ditto. * libc/sys/linux/net/inet_network.c: Ditto. * libc/sys/linux/net/inet_ntoa.c: Ditto. * libc/sys/linux/net/inet_ntop.c: Ditto. * libc/sys/linux/net/inet_pton.c: Ditto. * libc/sys/linux/net/innetgr-stub.c: Ditto. * libc/sys/linux/net/ip6opt.c: Ditto. * libc/sys/linux/net/iso_addr.3: Ditto. * libc/sys/linux/net/iso_addr.c: Ditto. * libc/sys/linux/net/issetugid-stub.c: Ditto. * libc/sys/linux/net/linkaddr.3: Ditto. * libc/sys/linux/net/linkaddr.c: Ditto. * libc/sys/linux/net/map_v4v6.c: Ditto. * libc/sys/linux/net/name6.c: Ditto. * libc/sys/linux/net/namespace.h: Ditto. * libc/sys/linux/net/ns.3: Ditto. * libc/sys/linux/net/ns_addr.c: Ditto. * libc/sys/linux/net/ns_name.c: Ditto. * libc/sys/linux/net/ns_netint.c: Ditto. * libc/sys/linux/net/ns_ntoa.c: Ditto. * libc/sys/linux/net/ns_parse.c: Ditto. * libc/sys/linux/net/ns_print.c: Ditto. * libc/sys/linux/net/ns_ttl.c: Ditto. * libc/sys/linux/net/nsap_addr.c: Ditto. * libc/sys/linux/net/nsdispatch.3: Ditto. * libc/sys/linux/net/nsdispatch.c: Ditto. * libc/sys/linux/net/nslexer.c: Ditto. * libc/sys/linux/net/nslexer.l: Ditto. * libc/sys/linux/net/nsparser.c: Ditto. * libc/sys/linux/net/nsparser.h: Ditto. * libc/sys/linux/net/nsparser.y: Ditto. * libc/sys/linux/net/rcmd.3: Ditto. * libc/sys/linux/net/rcmd.c: Ditto. * libc/sys/linux/net/rcmdsh.3: Ditto. * libc/sys/linux/net/rcmdsh.c: Ditto. * libc/sys/linux/net/recv.c: Ditto. * libc/sys/linux/net/res_comp.c: Ditto. * libc/sys/linux/net/res_config.h: Ditto. * libc/sys/linux/net/res_data.c: Ditto. * libc/sys/linux/net/res_debug.c: Ditto. * libc/sys/linux/net/res_init.c: Ditto. * libc/sys/linux/net/res_mkquery.c: Ditto. * libc/sys/linux/net/res_mkupdate.c: Ditto. * libc/sys/linux/net/res_query.c: Ditto. * libc/sys/linux/net/res_send.c: Ditto. * libc/sys/linux/net/res_update.c: Ditto. * libc/sys/linux/net/resolver.3: Ditto. * libc/sys/linux/net/rthdr.c: Ditto. * libc/sys/linux/net/send.c: Ditto. * libc/sys/linux/net/un-namespace.h: Ditto. * libc/sys/linux/net/vars.c: Ditto. * libc/sys/linux/stdlib/COPYRIGHT: Ditto. * libc/sys/linux/stdlib/Makefile.am: Ditto. * libc/sys/linux/stdlib/Makefile.in: Ditto. * libc/sys/linux/stdlib/cclass.h: Ditto. * libc/sys/linux/stdlib/cname.h: Ditto. * libc/sys/linux/stdlib/collate.c: Ditto. * libc/sys/linux/stdlib/collate.h: Ditto. * libc/sys/linux/stdlib/collcmp.c: Ditto. * libc/sys/linux/stdlib/engine.c: Ditto. * libc/sys/linux/stdlib/fnmatch.3: Ditto. * libc/sys/linux/stdlib/fnmatch.c: Ditto. * libc/sys/linux/stdlib/glob.3: Ditto. * libc/sys/linux/stdlib/glob.c: Ditto. * libc/sys/linux/stdlib/reallocf.c: Ditto. * libc/sys/linux/stdlib/regcomp.c: Ditto. * libc/sys/linux/stdlib/regerror.c: Ditto. * libc/sys/linux/stdlib/regex.3: Ditto. * libc/sys/linux/stdlib/regex2.h: Ditto. * libc/sys/linux/stdlib/regexec.c: Ditto. * libc/sys/linux/stdlib/regfree.c: Ditto. * libc/sys/linux/stdlib/utils.h: Ditto. * libc/sys/linux/stdlib/wordexp.c: Ditto. * libc/sys/linux/stdlib/wordfree.c: Ditto. * libc/sys/linux/sys/dlfcn.h: Ditto. * libc/sys/linux/sys/elfclass.h: Ditto. * libc/sys/linux/sys/event.h: Ditto. * libc/sys/linux/sys/ioccom.h: Ditto. * libc/sys/linux/sys/libc-tsd.h: Ditto. * libc/sys/linux/sys/link.h: Ditto. * libc/sys/linux/sys/lock.h: Ditto. * libc/sys/linux/sys/param.h: Ditto. * libc/sys/linux/sys/socket.h: Ditto. * libc/sys/linux/sys/sockio.h: Ditto.
562 lines
16 KiB
C
562 lines
16 KiB
C
/* Load the dependencies of a mapped object.
|
|
Copyright (C) 1996,1997,1998,1999,2000,2001 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 <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))
|
|
|
|
/* This is zero at program start to signal that the global scope map is
|
|
allocated by rtld. Later it keeps the size of the map. It might be
|
|
reset if in _dl_close if the last global object is removed. */
|
|
size_t _dl_global_scope_alloc;
|
|
|
|
extern size_t _dl_platformlen;
|
|
|
|
/* 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;
|
|
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, 0);
|
|
}
|
|
|
|
|
|
|
|
/* 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 __cnt = DL_DST_COUNT(__str, 0); \
|
|
\
|
|
if (__cnt != 0) \
|
|
{ \
|
|
char *__newp; \
|
|
\
|
|
__newp = (char *) alloca (DL_DST_REQUIRED (l, __str, strlen (__str), \
|
|
__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 dynamics string token substitution")); \
|
|
else \
|
|
{ \
|
|
/* This is for DT_AUXILIARY. */ \
|
|
if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0)) \
|
|
_dl_debug_printf ("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)
|
|
{
|
|
struct list 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;
|
|
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;
|
|
int err;
|
|
|
|
/* Recognize DSTs. */
|
|
name = expand_dst (l, strtab + d->d_un.d_val, 0);
|
|
/* Store the tag in the argument structure. */
|
|
args.name = name;
|
|
|
|
err = _dl_catch_error (&objname, &errstring, openaux, &args);
|
|
if (__builtin_expect (errstring != NULL, 0))
|
|
{
|
|
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)
|
|
{
|
|
int err;
|
|
|
|
/* Say that we are about to load an auxiliary library. */
|
|
if (__builtin_expect (_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 : _dl_argv[0]);
|
|
|
|
/* We must be prepared that the addressed shared
|
|
object is not available. */
|
|
err = _dl_catch_error (&objname, &errstring, openaux,
|
|
&args);
|
|
if (__builtin_expect (errstring != NULL, 0))
|
|
{
|
|
/* We are not interested in the error message. */
|
|
assert (errstring != NULL);
|
|
if (errstring != _dl_out_of_memory)
|
|
free ((char *) errstring);
|
|
|
|
/* Simply ignore this error and continue the work. */
|
|
continue;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
int err;
|
|
|
|
/* Say that we are about to load an auxiliary library. */
|
|
if (__builtin_expect (_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 : _dl_argv[0]);
|
|
|
|
/* For filter objects the dependency must be available. */
|
|
err = _dl_catch_error (&objname, &errstring, openaux,
|
|
&args);
|
|
if (__builtin_expect (errstring != NULL, 0))
|
|
{
|
|
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 ((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]);
|
|
}
|
|
|
|
/* 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;
|
|
}
|
|
|
|
/* 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. */
|
|
--map->l_reldeps[i]->l_opencount;
|
|
|
|
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;
|
|
|
|
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);
|
|
}
|