1997-09-05 03:43:20 +02:00
|
|
|
/* Close a shared object opened by `_dl_open'.
|
2002-01-31 04:41:25 +01:00
|
|
|
Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
|
update from main archive 961116
Sun Nov 17 03:13:57 1996 Ulrich Drepper <drepper@cygnus.com>
* db/makedb.c: Update and reformat copyright.
* elf/Makefile: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-deps.c: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-fini.c: Likewise.
* elf/dl-init.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-minimal.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-symbol.c: Likewise.
* elf/dladdr.c: Likewise.
* elf/dlclose.c: Likewise.
* elf/dlerror.c: Likewise.
* elf/dlopen.c: Likewise.
* elf/dlsym.c: Likewise.
* elf/do-rel.h: Likewise.
* elf/dynamic-link.h: Likewise.
* elf/eval.c: Likewise.
* elf/rtld.c: Likewise.
* inet/ether_hton.c: Likewise.
* inet/ether_ntoh.c: Likewise.
* inet/ether_line.c: Likewise.
* inet/getnetgrent_r.c: Likewise.
* inet/Makefile (+gccwarn): Remove definition.
Instead set CFLAGS-rcmd.c, CFLAGS-rexec.c, and CFLAGS-ruserpass.c
to `-w'.
* inet/aliases.h: Add C++ protection.
* inet/ether_hton.c: Add prototype for __nss_ethers_lookup.
(ether_hostton): Remove unused variable result.
* inet/ether_ntoh.c: Likewise.
* inet/ether_line.c: Include <ctype.h> and <string.h>.
* inet/getnetgrent_r.c: Include <stdlib.h>.
Use casts to prevent warnings.
(innetgr): Initialize `known' and `needed'.
* inet/inet_net.c: Make local variable `i' of type u_int32_t.
* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)) [NEED__RES]: Don't
return NULL. Instead set *RESULT to NULL and return -1.
* nss/getXXent_r.c (INTERNAL (REENTRANT_GETNAME)): Likewise.
(SETFUNC_NAME, ENDFUNC_NAME) [NEED__RES]: Don't return anything.
* nss/nss_files/files-alias.c: Debug function. I didn't worked at
all before.
Sat Nov 16 15:25:34 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/readv.c: Don't use PTR anymore.
* sysdeps/posix/writev.c: Likewise.
* version.h (VERSION): Bump to 1.98.
* nss/db-Makefile: Generate lines for getXXXent iteration.
* sysdeps/alpha/Dist: Don't distribute removed files divlu.S,
divqu.S, remlu.S, and remqu.S.
Fri Nov 15 08:55:54 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* posix/unistd.h: Correct typo in documentation.
Thu Nov 14 18:08:14 1996 a sun <asun@zoology.washington.edu>
* inet/netinet/tcp.h: Use __ protected versions instead of
BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN directly.
Sat Nov 16 13:44:55 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Initialize so that
references in libc.so are not anymore undefined.
Sat Nov 16 18:17:36 1996 NIIBE Yutaka <gniibe@mri.co.jp>
* io/utime.h: Rename second parameter for utime to prevent warning
for -Wshadow.
* dirent/dirent.h: Same here for scandir prototype.
* math/mathcalls.h: Likewise for frexp and ldexp.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise for bindresvport.
Sat Nov 16 03:49:27 1996 Ulrich Drepper <drepper@cygnus.com>
* stdlib/tst-strtod.c: Add test for error case below.
Sat Nov 16 03:48:39 1996 Wolfram Gloger <Wolfram.Gloger@dent.med.uni-muenchen.de>
* stdlib/strtod.c: Recognize numbers like 0e-19.
Fri Nov 15 08:38:43 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* time/Makefile ($(installed-localtime-file)): Fix path to
rellns-sh.
* Makefile: Don't generate and install gnu/lib-names.h if
$(build-shared) is not `yes'.
Thu Nov 14 09:23:58 1996 H.J. Lu (hjl@gnu.ai.mit.edu)
* sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Depend
on $(..)posix/posix1_lim.h, not ../posix/posix1_lim.h.
* Makerules (REAL_MAKE_VERSION): New, use it instead of
MAKE_VERSION.
Thu Nov 14 22:10:43 1996 Ulrich Drepper <drepper@cygnus.com>
* nss/nss_files/files-XXX.x (_nss_files_get,ENTNAME_r): Fix typo.
* nss/getXXent_r.c: Fix typo. Set correct return value when
no further service is available.
Thu Nov 14 17:48:13 1996 Ulrich Drepper <drepper@cygnus.com>
* db/recno/rec_put.c: Add cast to avoid warning.
* db/recno/rec_close.c: Likewise.
* db/mpool/mpool.c: Likewise.
* db/hash/hash_bigkey.h: Likewise.
* db/hash/hash.c: Likewise.
* db/btree/bt_split.c: Likewise.
* db/btree/bt_put.c: Likewise.
Thu Nov 14 14:11:44 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/dirent.h: Update copyright.
* elf/elf.h: Likewise.
* elf/link.h: Likewise.
* gmon/sys/gmon_out.h: Likewise.
* gnu-versions.h: Likewise.
* intl/libintl.h: Likewise.
* io/fcntl.h: Likewise.
* io/ftw.h: Likewise.
* io/sys/statfs.h: Likewise.
* io/utime.h: Likewise.
* locale/langinfo.h: Likewise.
* malloc/malloc.h: Likewise.
* malloc/obstack.h: Likewise.
* misc/ar.h: Likewise.
* misc/error.h: Likewise.
* misc/mntent.h: Likewise.
* misc/sgtty.h: Likewise.
* misc/sys/cdefs.h: Likewise.
* misc/sys/dir.h: Likewise.
* misc/sys/file.h: Likewise.
* misc/sys/ioctl.h: Likewise.
* misc/sys/ustat.h: Likewise.
* posix/fnmatch.h: Likewise.
* posix/getopt.h: Likewise.
* posix/glob.h: Likewise.
* posix/posix2_lim.h: Likewise.
* posix/regex.h: Likewise.
* posix/sys/times.h: Likewise.
* posix/sys/types.h: Likewise.
* posix/sys/utsname.h: Likewise.
* posix/tar.h: Likewise.
* posix/wordexp.h: Likewise.
* resource/sys/resource.h: Likewise.
* resource/sys/vlimit.h: Likewise.
* resource/sys/vtimes.h: Likewise.
* socket/sys/socket.h: Likewise.
* socket/sys/un.h: Likewise.
* stdio-common/printf.h: Likewise.
* stdlib/alloca.h: Likewise.
* string/argz.h: Likewise.
* string/endian.h: Likewise.
* string/envz.h: Likewise.
* string/memory.h: Likewise.
* string/strings.h: Likewise.
* sysdeps/generic/crypt.h: Likewise.
* sysdeps/generic/direntry.h: Likewise.
* sysdeps/generic/gnu/types.h: Likewise.
* sysdeps/generic/ioctl-types.h: Likewise.
* sysdeps/generic/netinet/in.h: Likewise.
* sysdeps/generic/resourcebits.h: Likewise.
* sysdeps/generic/sigset.h: Likewise.
* sysdeps/generic/sockaddrcom.h: Likewise.
* sysdeps/generic/sys/mman.h: Likewise.
* sysdeps/generic/sys/ptrace.h: Likewise.
* sysdeps/generic/termbits.h: Likewise.
* sysdeps/generic/waitstatus.h: Likewise.
* sysdeps/ieee754/huge_val.h: Likewise.
* sysdeps/ieee754/nan.h: Likewise.
* sysdeps/mach/hurd/local_lim.h: Likewise.
* sysdeps/mach/hurd/statbuf.h: Likewise.
* sysdeps/stub/huge_val.h: Likewise.
* sysdeps/stub/libc-lock.h: Likewise.
* sysdeps/stub/signum.h: Likewise.
* sysdeps/stub/statbuf.h: Likewise.
* sysdeps/stub/waitflags.h: Likewise.
* sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise.
* sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise.
* sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
* sysdeps/unix/bsd/signum.h: Likewise.
* sysdeps/unix/bsd/statbuf.h: Likewise.
* sysdeps/unix/bsd/sun/signum.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise.
* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/waitflags.h: Likewise.
* sysdeps/unix/sysv/irix4/signum.h: Likewise.
* sysdeps/unix/sysv/irix4/statbuf.h: Likewise.
* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/direntry.h: Likewise.
* sysdeps/unix/sysv/linux/gnu/types.h: Likewise.
* sysdeps/unix/sysv/linux/ioctl-types.h: Likewise.
* sysdeps/unix/sysv/linux/local_lim.h: Likewise.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
* sysdeps/unix/sysv/linux/resourcebits.h: Likewise.
* sysdeps/unix/sysv/linux/signum.h: Likewise.
* sysdeps/unix/sysv/linux/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/sys/klog.h: Likewise.
* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/syscall.h: Likewise.
* sysdeps/unix/sysv/linux/termbits.h: Likewise.
* sysdeps/unix/sysv/local_lim.h: Likewise.
* sysdeps/unix/sysv/sco3.2.4/syscall.h: Likewise.
* sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise.
* sysdeps/unix/sysv/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise.
* sysdeps/unix/sysv/sysv4/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/sigset.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise.
* sysdeps/unix/sysv/sysv4/waitflags.h: Likewise.
* sysdeps/vax/huge_val.h: Likewise.
* values.h: Likewise.
Thu Nov 14 04:22:41 1996 Ulrich Drepper <drepper@cygnus.com>
* malloc/obstack.h: Use memcpy instead of bcopy and define a macro
`memcpy' using bcopy if memcpy is not available.
* manual/stdio.texi: Correct description of printf customization.
The argument info function is not optional anymore and the
interface for `printf_function' also changed.
* manual/examples/rprintf.c: Define and use argument info function.
* stdio-common/printf.h (struct printf_info): Change type for field
`pad' to wchar_t.
Correct comment for `register_printf_function'.
* nss/getXXbyYY.c [NEED_H_ERRNO]: Don't pass pointer to h_errno
to reentrant function. Instead use temporary variable and set
h_errno if an error occured.
Reported by NIIBE Yutaka.
are no bits set in the masks. Reported by baldazzi@csr.unibo.it.
1996-11-17 04:15:52 +01:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 06:58:11 +02:00
|
|
|
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.
|
update from main archive 961116
Sun Nov 17 03:13:57 1996 Ulrich Drepper <drepper@cygnus.com>
* db/makedb.c: Update and reformat copyright.
* elf/Makefile: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-deps.c: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-fini.c: Likewise.
* elf/dl-init.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-minimal.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-symbol.c: Likewise.
* elf/dladdr.c: Likewise.
* elf/dlclose.c: Likewise.
* elf/dlerror.c: Likewise.
* elf/dlopen.c: Likewise.
* elf/dlsym.c: Likewise.
* elf/do-rel.h: Likewise.
* elf/dynamic-link.h: Likewise.
* elf/eval.c: Likewise.
* elf/rtld.c: Likewise.
* inet/ether_hton.c: Likewise.
* inet/ether_ntoh.c: Likewise.
* inet/ether_line.c: Likewise.
* inet/getnetgrent_r.c: Likewise.
* inet/Makefile (+gccwarn): Remove definition.
Instead set CFLAGS-rcmd.c, CFLAGS-rexec.c, and CFLAGS-ruserpass.c
to `-w'.
* inet/aliases.h: Add C++ protection.
* inet/ether_hton.c: Add prototype for __nss_ethers_lookup.
(ether_hostton): Remove unused variable result.
* inet/ether_ntoh.c: Likewise.
* inet/ether_line.c: Include <ctype.h> and <string.h>.
* inet/getnetgrent_r.c: Include <stdlib.h>.
Use casts to prevent warnings.
(innetgr): Initialize `known' and `needed'.
* inet/inet_net.c: Make local variable `i' of type u_int32_t.
* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)) [NEED__RES]: Don't
return NULL. Instead set *RESULT to NULL and return -1.
* nss/getXXent_r.c (INTERNAL (REENTRANT_GETNAME)): Likewise.
(SETFUNC_NAME, ENDFUNC_NAME) [NEED__RES]: Don't return anything.
* nss/nss_files/files-alias.c: Debug function. I didn't worked at
all before.
Sat Nov 16 15:25:34 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/readv.c: Don't use PTR anymore.
* sysdeps/posix/writev.c: Likewise.
* version.h (VERSION): Bump to 1.98.
* nss/db-Makefile: Generate lines for getXXXent iteration.
* sysdeps/alpha/Dist: Don't distribute removed files divlu.S,
divqu.S, remlu.S, and remqu.S.
Fri Nov 15 08:55:54 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* posix/unistd.h: Correct typo in documentation.
Thu Nov 14 18:08:14 1996 a sun <asun@zoology.washington.edu>
* inet/netinet/tcp.h: Use __ protected versions instead of
BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN directly.
Sat Nov 16 13:44:55 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Initialize so that
references in libc.so are not anymore undefined.
Sat Nov 16 18:17:36 1996 NIIBE Yutaka <gniibe@mri.co.jp>
* io/utime.h: Rename second parameter for utime to prevent warning
for -Wshadow.
* dirent/dirent.h: Same here for scandir prototype.
* math/mathcalls.h: Likewise for frexp and ldexp.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise for bindresvport.
Sat Nov 16 03:49:27 1996 Ulrich Drepper <drepper@cygnus.com>
* stdlib/tst-strtod.c: Add test for error case below.
Sat Nov 16 03:48:39 1996 Wolfram Gloger <Wolfram.Gloger@dent.med.uni-muenchen.de>
* stdlib/strtod.c: Recognize numbers like 0e-19.
Fri Nov 15 08:38:43 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* time/Makefile ($(installed-localtime-file)): Fix path to
rellns-sh.
* Makefile: Don't generate and install gnu/lib-names.h if
$(build-shared) is not `yes'.
Thu Nov 14 09:23:58 1996 H.J. Lu (hjl@gnu.ai.mit.edu)
* sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Depend
on $(..)posix/posix1_lim.h, not ../posix/posix1_lim.h.
* Makerules (REAL_MAKE_VERSION): New, use it instead of
MAKE_VERSION.
Thu Nov 14 22:10:43 1996 Ulrich Drepper <drepper@cygnus.com>
* nss/nss_files/files-XXX.x (_nss_files_get,ENTNAME_r): Fix typo.
* nss/getXXent_r.c: Fix typo. Set correct return value when
no further service is available.
Thu Nov 14 17:48:13 1996 Ulrich Drepper <drepper@cygnus.com>
* db/recno/rec_put.c: Add cast to avoid warning.
* db/recno/rec_close.c: Likewise.
* db/mpool/mpool.c: Likewise.
* db/hash/hash_bigkey.h: Likewise.
* db/hash/hash.c: Likewise.
* db/btree/bt_split.c: Likewise.
* db/btree/bt_put.c: Likewise.
Thu Nov 14 14:11:44 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/dirent.h: Update copyright.
* elf/elf.h: Likewise.
* elf/link.h: Likewise.
* gmon/sys/gmon_out.h: Likewise.
* gnu-versions.h: Likewise.
* intl/libintl.h: Likewise.
* io/fcntl.h: Likewise.
* io/ftw.h: Likewise.
* io/sys/statfs.h: Likewise.
* io/utime.h: Likewise.
* locale/langinfo.h: Likewise.
* malloc/malloc.h: Likewise.
* malloc/obstack.h: Likewise.
* misc/ar.h: Likewise.
* misc/error.h: Likewise.
* misc/mntent.h: Likewise.
* misc/sgtty.h: Likewise.
* misc/sys/cdefs.h: Likewise.
* misc/sys/dir.h: Likewise.
* misc/sys/file.h: Likewise.
* misc/sys/ioctl.h: Likewise.
* misc/sys/ustat.h: Likewise.
* posix/fnmatch.h: Likewise.
* posix/getopt.h: Likewise.
* posix/glob.h: Likewise.
* posix/posix2_lim.h: Likewise.
* posix/regex.h: Likewise.
* posix/sys/times.h: Likewise.
* posix/sys/types.h: Likewise.
* posix/sys/utsname.h: Likewise.
* posix/tar.h: Likewise.
* posix/wordexp.h: Likewise.
* resource/sys/resource.h: Likewise.
* resource/sys/vlimit.h: Likewise.
* resource/sys/vtimes.h: Likewise.
* socket/sys/socket.h: Likewise.
* socket/sys/un.h: Likewise.
* stdio-common/printf.h: Likewise.
* stdlib/alloca.h: Likewise.
* string/argz.h: Likewise.
* string/endian.h: Likewise.
* string/envz.h: Likewise.
* string/memory.h: Likewise.
* string/strings.h: Likewise.
* sysdeps/generic/crypt.h: Likewise.
* sysdeps/generic/direntry.h: Likewise.
* sysdeps/generic/gnu/types.h: Likewise.
* sysdeps/generic/ioctl-types.h: Likewise.
* sysdeps/generic/netinet/in.h: Likewise.
* sysdeps/generic/resourcebits.h: Likewise.
* sysdeps/generic/sigset.h: Likewise.
* sysdeps/generic/sockaddrcom.h: Likewise.
* sysdeps/generic/sys/mman.h: Likewise.
* sysdeps/generic/sys/ptrace.h: Likewise.
* sysdeps/generic/termbits.h: Likewise.
* sysdeps/generic/waitstatus.h: Likewise.
* sysdeps/ieee754/huge_val.h: Likewise.
* sysdeps/ieee754/nan.h: Likewise.
* sysdeps/mach/hurd/local_lim.h: Likewise.
* sysdeps/mach/hurd/statbuf.h: Likewise.
* sysdeps/stub/huge_val.h: Likewise.
* sysdeps/stub/libc-lock.h: Likewise.
* sysdeps/stub/signum.h: Likewise.
* sysdeps/stub/statbuf.h: Likewise.
* sysdeps/stub/waitflags.h: Likewise.
* sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise.
* sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise.
* sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
* sysdeps/unix/bsd/signum.h: Likewise.
* sysdeps/unix/bsd/statbuf.h: Likewise.
* sysdeps/unix/bsd/sun/signum.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise.
* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/waitflags.h: Likewise.
* sysdeps/unix/sysv/irix4/signum.h: Likewise.
* sysdeps/unix/sysv/irix4/statbuf.h: Likewise.
* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/direntry.h: Likewise.
* sysdeps/unix/sysv/linux/gnu/types.h: Likewise.
* sysdeps/unix/sysv/linux/ioctl-types.h: Likewise.
* sysdeps/unix/sysv/linux/local_lim.h: Likewise.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
* sysdeps/unix/sysv/linux/resourcebits.h: Likewise.
* sysdeps/unix/sysv/linux/signum.h: Likewise.
* sysdeps/unix/sysv/linux/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/sys/klog.h: Likewise.
* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/syscall.h: Likewise.
* sysdeps/unix/sysv/linux/termbits.h: Likewise.
* sysdeps/unix/sysv/local_lim.h: Likewise.
* sysdeps/unix/sysv/sco3.2.4/syscall.h: Likewise.
* sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise.
* sysdeps/unix/sysv/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise.
* sysdeps/unix/sysv/sysv4/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/sigset.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise.
* sysdeps/unix/sysv/sysv4/waitflags.h: Likewise.
* sysdeps/vax/huge_val.h: Likewise.
* values.h: Likewise.
Thu Nov 14 04:22:41 1996 Ulrich Drepper <drepper@cygnus.com>
* malloc/obstack.h: Use memcpy instead of bcopy and define a macro
`memcpy' using bcopy if memcpy is not available.
* manual/stdio.texi: Correct description of printf customization.
The argument info function is not optional anymore and the
interface for `printf_function' also changed.
* manual/examples/rprintf.c: Define and use argument info function.
* stdio-common/printf.h (struct printf_info): Change type for field
`pad' to wchar_t.
Correct comment for `register_printf_function'.
* nss/getXXbyYY.c [NEED_H_ERRNO]: Don't pass pointer to h_errno
to reentrant function. Instead use temporary variable and set
h_errno if an error occured.
Reported by NIIBE Yutaka.
are no bits set in the masks. Reported by baldazzi@csr.unibo.it.
1996-11-17 04:15:52 +01:00
|
|
|
|
|
|
|
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
|
2001-07-06 06:58:11 +02:00
|
|
|
Lesser General Public License for more details.
|
update from main archive 961116
Sun Nov 17 03:13:57 1996 Ulrich Drepper <drepper@cygnus.com>
* db/makedb.c: Update and reformat copyright.
* elf/Makefile: Likewise.
* elf/dl-close.c: Likewise.
* elf/dl-debug.c: Likewise.
* elf/dl-deps.c: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-fini.c: Likewise.
* elf/dl-init.c: Likewise.
* elf/dl-load.c: Likewise.
* elf/dl-lookup.c: Likewise.
* elf/dl-minimal.c: Likewise.
* elf/dl-object.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/dl-reloc.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/dl-support.c: Likewise.
* elf/dl-symbol.c: Likewise.
* elf/dladdr.c: Likewise.
* elf/dlclose.c: Likewise.
* elf/dlerror.c: Likewise.
* elf/dlopen.c: Likewise.
* elf/dlsym.c: Likewise.
* elf/do-rel.h: Likewise.
* elf/dynamic-link.h: Likewise.
* elf/eval.c: Likewise.
* elf/rtld.c: Likewise.
* inet/ether_hton.c: Likewise.
* inet/ether_ntoh.c: Likewise.
* inet/ether_line.c: Likewise.
* inet/getnetgrent_r.c: Likewise.
* inet/Makefile (+gccwarn): Remove definition.
Instead set CFLAGS-rcmd.c, CFLAGS-rexec.c, and CFLAGS-ruserpass.c
to `-w'.
* inet/aliases.h: Add C++ protection.
* inet/ether_hton.c: Add prototype for __nss_ethers_lookup.
(ether_hostton): Remove unused variable result.
* inet/ether_ntoh.c: Likewise.
* inet/ether_line.c: Include <ctype.h> and <string.h>.
* inet/getnetgrent_r.c: Include <stdlib.h>.
Use casts to prevent warnings.
(innetgr): Initialize `known' and `needed'.
* inet/inet_net.c: Make local variable `i' of type u_int32_t.
* nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)) [NEED__RES]: Don't
return NULL. Instead set *RESULT to NULL and return -1.
* nss/getXXent_r.c (INTERNAL (REENTRANT_GETNAME)): Likewise.
(SETFUNC_NAME, ENDFUNC_NAME) [NEED__RES]: Don't return anything.
* nss/nss_files/files-alias.c: Debug function. I didn't worked at
all before.
Sat Nov 16 15:25:34 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/posix/readv.c: Don't use PTR anymore.
* sysdeps/posix/writev.c: Likewise.
* version.h (VERSION): Bump to 1.98.
* nss/db-Makefile: Generate lines for getXXXent iteration.
* sysdeps/alpha/Dist: Don't distribute removed files divlu.S,
divqu.S, remlu.S, and remqu.S.
Fri Nov 15 08:55:54 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* posix/unistd.h: Correct typo in documentation.
Thu Nov 14 18:08:14 1996 a sun <asun@zoology.washington.edu>
* inet/netinet/tcp.h: Use __ protected versions instead of
BYTE_ORDER, LITTLE_ENDIAN, and BIG_ENDIAN directly.
Sat Nov 16 13:44:55 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/loadmsgcat.c (_nl_msg_cat_cntr): Initialize so that
references in libc.so are not anymore undefined.
Sat Nov 16 18:17:36 1996 NIIBE Yutaka <gniibe@mri.co.jp>
* io/utime.h: Rename second parameter for utime to prevent warning
for -Wshadow.
* dirent/dirent.h: Same here for scandir prototype.
* math/mathcalls.h: Likewise for frexp and ldexp.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise for bindresvport.
Sat Nov 16 03:49:27 1996 Ulrich Drepper <drepper@cygnus.com>
* stdlib/tst-strtod.c: Add test for error case below.
Sat Nov 16 03:48:39 1996 Wolfram Gloger <Wolfram.Gloger@dent.med.uni-muenchen.de>
* stdlib/strtod.c: Recognize numbers like 0e-19.
Fri Nov 15 08:38:43 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* time/Makefile ($(installed-localtime-file)): Fix path to
rellns-sh.
* Makefile: Don't generate and install gnu/lib-names.h if
$(build-shared) is not `yes'.
Thu Nov 14 09:23:58 1996 H.J. Lu (hjl@gnu.ai.mit.edu)
* sysdeps/posix/Makefile ($(common-objpfx)mk-stdiolim): Depend
on $(..)posix/posix1_lim.h, not ../posix/posix1_lim.h.
* Makerules (REAL_MAKE_VERSION): New, use it instead of
MAKE_VERSION.
Thu Nov 14 22:10:43 1996 Ulrich Drepper <drepper@cygnus.com>
* nss/nss_files/files-XXX.x (_nss_files_get,ENTNAME_r): Fix typo.
* nss/getXXent_r.c: Fix typo. Set correct return value when
no further service is available.
Thu Nov 14 17:48:13 1996 Ulrich Drepper <drepper@cygnus.com>
* db/recno/rec_put.c: Add cast to avoid warning.
* db/recno/rec_close.c: Likewise.
* db/mpool/mpool.c: Likewise.
* db/hash/hash_bigkey.h: Likewise.
* db/hash/hash.c: Likewise.
* db/btree/bt_split.c: Likewise.
* db/btree/bt_put.c: Likewise.
Thu Nov 14 14:11:44 1996 Ulrich Drepper <drepper@cygnus.com>
* dirent/dirent.h: Update copyright.
* elf/elf.h: Likewise.
* elf/link.h: Likewise.
* gmon/sys/gmon_out.h: Likewise.
* gnu-versions.h: Likewise.
* intl/libintl.h: Likewise.
* io/fcntl.h: Likewise.
* io/ftw.h: Likewise.
* io/sys/statfs.h: Likewise.
* io/utime.h: Likewise.
* locale/langinfo.h: Likewise.
* malloc/malloc.h: Likewise.
* malloc/obstack.h: Likewise.
* misc/ar.h: Likewise.
* misc/error.h: Likewise.
* misc/mntent.h: Likewise.
* misc/sgtty.h: Likewise.
* misc/sys/cdefs.h: Likewise.
* misc/sys/dir.h: Likewise.
* misc/sys/file.h: Likewise.
* misc/sys/ioctl.h: Likewise.
* misc/sys/ustat.h: Likewise.
* posix/fnmatch.h: Likewise.
* posix/getopt.h: Likewise.
* posix/glob.h: Likewise.
* posix/posix2_lim.h: Likewise.
* posix/regex.h: Likewise.
* posix/sys/times.h: Likewise.
* posix/sys/types.h: Likewise.
* posix/sys/utsname.h: Likewise.
* posix/tar.h: Likewise.
* posix/wordexp.h: Likewise.
* resource/sys/resource.h: Likewise.
* resource/sys/vlimit.h: Likewise.
* resource/sys/vtimes.h: Likewise.
* socket/sys/socket.h: Likewise.
* socket/sys/un.h: Likewise.
* stdio-common/printf.h: Likewise.
* stdlib/alloca.h: Likewise.
* string/argz.h: Likewise.
* string/endian.h: Likewise.
* string/envz.h: Likewise.
* string/memory.h: Likewise.
* string/strings.h: Likewise.
* sysdeps/generic/crypt.h: Likewise.
* sysdeps/generic/direntry.h: Likewise.
* sysdeps/generic/gnu/types.h: Likewise.
* sysdeps/generic/ioctl-types.h: Likewise.
* sysdeps/generic/netinet/in.h: Likewise.
* sysdeps/generic/resourcebits.h: Likewise.
* sysdeps/generic/sigset.h: Likewise.
* sysdeps/generic/sockaddrcom.h: Likewise.
* sysdeps/generic/sys/mman.h: Likewise.
* sysdeps/generic/sys/ptrace.h: Likewise.
* sysdeps/generic/termbits.h: Likewise.
* sysdeps/generic/waitstatus.h: Likewise.
* sysdeps/ieee754/huge_val.h: Likewise.
* sysdeps/ieee754/nan.h: Likewise.
* sysdeps/mach/hurd/local_lim.h: Likewise.
* sysdeps/mach/hurd/statbuf.h: Likewise.
* sysdeps/stub/huge_val.h: Likewise.
* sysdeps/stub/libc-lock.h: Likewise.
* sysdeps/stub/signum.h: Likewise.
* sysdeps/stub/statbuf.h: Likewise.
* sysdeps/stub/waitflags.h: Likewise.
* sysdeps/unix/bsd/bsd4.4/sockaddrcom.h: Likewise.
* sysdeps/unix/bsd/osf/alpha/statbuf.h: Likewise.
* sysdeps/unix/bsd/osf/sys/mman.h: Likewise.
* sysdeps/unix/bsd/signum.h: Likewise.
* sysdeps/unix/bsd/statbuf.h: Likewise.
* sysdeps/unix/bsd/sun/signum.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/sun/sunos4/termbits.h: Likewise.
* sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise.
* sysdeps/unix/bsd/waitflags.h: Likewise.
* sysdeps/unix/sysv/irix4/signum.h: Likewise.
* sysdeps/unix/sysv/irix4/statbuf.h: Likewise.
* sysdeps/unix/sysv/irix4/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/direntry.h: Likewise.
* sysdeps/unix/sysv/linux/gnu/types.h: Likewise.
* sysdeps/unix/sysv/linux/ioctl-types.h: Likewise.
* sysdeps/unix/sysv/linux/local_lim.h: Likewise.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
* sysdeps/unix/sysv/linux/resourcebits.h: Likewise.
* sysdeps/unix/sysv/linux/signum.h: Likewise.
* sysdeps/unix/sysv/linux/statbuf.h: Likewise.
* sysdeps/unix/sysv/linux/sys/io.h: Likewise.
* sysdeps/unix/sysv/linux/sys/klog.h: Likewise.
* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
* sysdeps/unix/sysv/linux/sys/ptrace.h: Likewise.
* sysdeps/unix/sysv/linux/syscall.h: Likewise.
* sysdeps/unix/sysv/linux/termbits.h: Likewise.
* sysdeps/unix/sysv/local_lim.h: Likewise.
* sysdeps/unix/sysv/sco3.2.4/syscall.h: Likewise.
* sysdeps/unix/sysv/sco3.2/local_lim.h: Likewise.
* sysdeps/unix/sysv/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/i386/statbuf.h: Likewise.
* sysdeps/unix/sysv/sysv4/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/sigset.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/signum.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/statbuf.h: Likewise.
* sysdeps/unix/sysv/sysv4/waitflags.h: Likewise.
* sysdeps/vax/huge_val.h: Likewise.
* values.h: Likewise.
Thu Nov 14 04:22:41 1996 Ulrich Drepper <drepper@cygnus.com>
* malloc/obstack.h: Use memcpy instead of bcopy and define a macro
`memcpy' using bcopy if memcpy is not available.
* manual/stdio.texi: Correct description of printf customization.
The argument info function is not optional anymore and the
interface for `printf_function' also changed.
* manual/examples/rprintf.c: Define and use argument info function.
* stdio-common/printf.h (struct printf_info): Change type for field
`pad' to wchar_t.
Correct comment for `register_printf_function'.
* nss/getXXbyYY.c [NEED_H_ERRNO]: Don't pass pointer to h_errno
to reentrant function. Instead use temporary variable and set
h_errno if an error occured.
Reported by NIIBE Yutaka.
are no bits set in the masks. Reported by baldazzi@csr.unibo.it.
1996-11-17 04:15:52 +01:00
|
|
|
|
2001-07-06 06:58:11 +02:00
|
|
|
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. */
|
1996-06-10 22:19:39 +02:00
|
|
|
|
1998-08-31 19:23:45 +02:00
|
|
|
#include <assert.h>
|
1996-06-10 22:19:39 +02:00
|
|
|
#include <dlfcn.h>
|
2000-06-10 06:01:36 +02:00
|
|
|
#include <libintl.h>
|
2002-02-16 01:21:33 +01:00
|
|
|
#include <stdio.h>
|
1996-06-10 22:19:39 +02:00
|
|
|
#include <stdlib.h>
|
1996-06-12 03:54:21 +02:00
|
|
|
#include <string.h>
|
1998-03-24 01:39:45 +01:00
|
|
|
#include <bits/libc-lock.h>
|
2000-03-23 23:46:19 +01:00
|
|
|
#include <ldsodefs.h>
|
1996-06-10 22:19:39 +02:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/mman.h>
|
|
|
|
|
|
|
|
|
2000-03-30 18:30:49 +02:00
|
|
|
/* Type of the constructor functions. */
|
|
|
|
typedef void (*fini_t) (void);
|
|
|
|
|
|
|
|
|
2002-02-14 08:57:19 +01:00
|
|
|
#ifdef USE_TLS
|
|
|
|
/* Returns true we an non-empty was found. */
|
|
|
|
static bool
|
2002-10-18 03:10:44 +02:00
|
|
|
remove_slotinfo (size_t idx, struct dtv_slotinfo_list *listp, size_t disp,
|
|
|
|
bool should_be_there)
|
2002-02-14 08:57:19 +01:00
|
|
|
{
|
|
|
|
if (idx - disp >= listp->len)
|
|
|
|
{
|
2002-10-18 03:10:44 +02:00
|
|
|
if (listp->next == NULL)
|
|
|
|
{
|
|
|
|
/* The index is not actually valid in the slotinfo list,
|
2002-10-22 08:22:53 +02:00
|
|
|
because this object was closed before it was fully set
|
|
|
|
up due to some error. */
|
2002-10-18 03:10:44 +02:00
|
|
|
assert (! should_be_there);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (remove_slotinfo (idx, listp->next, disp + listp->len,
|
|
|
|
should_be_there))
|
|
|
|
return true;
|
2002-02-14 08:57:19 +01:00
|
|
|
|
2002-10-18 03:10:44 +02:00
|
|
|
/* No non-empty entry. Search from the end of this element's
|
|
|
|
slotinfo array. */
|
|
|
|
idx = disp + listp->len;
|
|
|
|
}
|
2002-02-14 08:57:19 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
struct link_map *old_map = listp->slotinfo[idx - disp].map;
|
|
|
|
|
2002-10-17 14:10:17 +02:00
|
|
|
/* The entry might still be in its unused state if we are closing an
|
|
|
|
object that wasn't fully set up. */
|
|
|
|
if (__builtin_expect (old_map != NULL, 1))
|
|
|
|
{
|
|
|
|
assert (old_map->l_tls_modid == idx);
|
|
|
|
|
|
|
|
/* Mark the entry as unused. */
|
|
|
|
listp->slotinfo[idx - disp].gen = GL(dl_tls_generation) + 1;
|
|
|
|
listp->slotinfo[idx - disp].map = NULL;
|
|
|
|
}
|
2002-02-14 08:57:19 +01:00
|
|
|
|
|
|
|
/* If this is not the last currently used entry no need to look
|
|
|
|
further. */
|
2002-10-17 14:10:17 +02:00
|
|
|
if (idx != GL(dl_tls_max_dtv_idx))
|
2002-02-14 08:57:19 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (idx - disp > disp == 0 ? 1 + GL(dl_tls_static_nelem) : 0)
|
|
|
|
{
|
|
|
|
--idx;
|
|
|
|
|
|
|
|
if (listp->slotinfo[idx - disp].map != NULL)
|
|
|
|
{
|
|
|
|
/* Found a new last used index. */
|
|
|
|
GL(dl_tls_max_dtv_idx) = idx;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No non-entry in this list element. */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
void
|
1998-04-02 15:11:24 +02:00
|
|
|
internal_function
|
Update.
* sysdeps/gnu/Makefile (libdl-routines): Add eval.
1999-07-06 Zack Weinberg <zack@rabi.columbia.edu>
* dlfcn: New directory. Move the following files from elf:
dladdr.c, dlclose.c, dlerror.c, dlfcn.h, dlopen.c,
dlopenold.c, dlsym.c, dlvsym.c.
* dlfcn/Makefile: New file.
* dlfcn/Versions: New file.
* dlfcn/dlsym.c: All ELF-specific code split out to new
function _dl_sym.
* dlfcn/dlvsym.c: All ELF-specific code split out to new
function _dl_vsym.
* elf/dl-sym.c: New file. _dl_sym and _dl_vsym are
implemented here.
* dlfcn/dladdr.c: Remove all references to ELF data structures
or headers.
* dlfcn/dlclose.c: Likewise.
* dlfcn/dlerror.c: Likewise.
* dlfcn/dlopen.c: Likewise.
* dlfcn/dlopenold.c: Likewise.
* Makeconfig (dlfcn): New variable - set to `dlfcn' if elf is
yes, empty otherwise.
(libdl): Set to dlfcn/libdl.so or libdl.a if elf is yes,
depending on build-shared.
(subdirs): Add $(dlfcn).
(rpath-dirs): Add dlfcn.
* elf/Makefile: Remove all references to libdl or its
components, except the ones relating to the test cases.
(routines): Add dl-sym.
* elf/Versions (libc): Add _dl_sym and _dl_vsym for GLIBC_2.2.
(libdl): Delete.
* elf/dl-close.c (_dl_close): Change argument to void *.
* elf/dl-open.c (_dl_open): Change return type to void *.
* elf/eval.c: Removed.
* elf/ldsodefs.h: Move prototypes of _dl_catch_error,
_dlerror_run, _dl_open, _dl_close, _dl_addr, and
_dl_mcount_wrapper_check to include/dlfcn.h. Delete
_CALL_DL_FCT macro.
* include/dlfcn.h: Also prototype _dl_sym and _dl_vsym here.
Include real header from dlfcn directory.
* include/ldsodefs.h: Removed.
* grp/initgroups.c: Use DL_CALL_FCT not _CALL_DL_FCT.
* nss/getXXbyYY_r.c: Likewise.
* nss/getXXent_r.c: Likewise.
* iconv/gconv.c: Likewise. Don't include ldsodefs.h.
* iconv/gconv_db.c: Likewise. Don't include ldsodefs.h.
* iconv/skeleton.c: Don't include ldsodefs.h.
* nss/nsswitch.h: Don't include ldsodefs.h. Include dlfcn.h.
1999-07-07 Ulrich Drepper <drepper@cygnus.com>
1999-07-07 20:39:33 +02:00
|
|
|
_dl_close (void *_map)
|
1996-06-10 22:19:39 +02:00
|
|
|
{
|
2000-10-24 22:20:37 +02:00
|
|
|
struct reldep_list
|
|
|
|
{
|
|
|
|
struct link_map **rellist;
|
|
|
|
unsigned int nrellist;
|
2002-12-30 22:15:31 +01:00
|
|
|
unsigned int nhandled;
|
2000-10-24 22:20:37 +02:00
|
|
|
struct reldep_list *next;
|
2002-12-30 22:15:31 +01:00
|
|
|
bool handled[0];
|
2000-10-24 22:20:37 +02:00
|
|
|
} *reldeps = NULL;
|
1996-06-10 22:19:39 +02:00
|
|
|
struct link_map **list;
|
Update.
* sysdeps/gnu/Makefile (libdl-routines): Add eval.
1999-07-06 Zack Weinberg <zack@rabi.columbia.edu>
* dlfcn: New directory. Move the following files from elf:
dladdr.c, dlclose.c, dlerror.c, dlfcn.h, dlopen.c,
dlopenold.c, dlsym.c, dlvsym.c.
* dlfcn/Makefile: New file.
* dlfcn/Versions: New file.
* dlfcn/dlsym.c: All ELF-specific code split out to new
function _dl_sym.
* dlfcn/dlvsym.c: All ELF-specific code split out to new
function _dl_vsym.
* elf/dl-sym.c: New file. _dl_sym and _dl_vsym are
implemented here.
* dlfcn/dladdr.c: Remove all references to ELF data structures
or headers.
* dlfcn/dlclose.c: Likewise.
* dlfcn/dlerror.c: Likewise.
* dlfcn/dlopen.c: Likewise.
* dlfcn/dlopenold.c: Likewise.
* Makeconfig (dlfcn): New variable - set to `dlfcn' if elf is
yes, empty otherwise.
(libdl): Set to dlfcn/libdl.so or libdl.a if elf is yes,
depending on build-shared.
(subdirs): Add $(dlfcn).
(rpath-dirs): Add dlfcn.
* elf/Makefile: Remove all references to libdl or its
components, except the ones relating to the test cases.
(routines): Add dl-sym.
* elf/Versions (libc): Add _dl_sym and _dl_vsym for GLIBC_2.2.
(libdl): Delete.
* elf/dl-close.c (_dl_close): Change argument to void *.
* elf/dl-open.c (_dl_open): Change return type to void *.
* elf/eval.c: Removed.
* elf/ldsodefs.h: Move prototypes of _dl_catch_error,
_dlerror_run, _dl_open, _dl_close, _dl_addr, and
_dl_mcount_wrapper_check to include/dlfcn.h. Delete
_CALL_DL_FCT macro.
* include/dlfcn.h: Also prototype _dl_sym and _dl_vsym here.
Include real header from dlfcn directory.
* include/ldsodefs.h: Removed.
* grp/initgroups.c: Use DL_CALL_FCT not _CALL_DL_FCT.
* nss/getXXbyYY_r.c: Likewise.
* nss/getXXent_r.c: Likewise.
* iconv/gconv.c: Likewise. Don't include ldsodefs.h.
* iconv/gconv_db.c: Likewise. Don't include ldsodefs.h.
* iconv/skeleton.c: Don't include ldsodefs.h.
* nss/nsswitch.h: Don't include ldsodefs.h. Include dlfcn.h.
1999-07-07 Ulrich Drepper <drepper@cygnus.com>
1999-07-07 20:39:33 +02:00
|
|
|
struct link_map *map = _map;
|
1996-06-10 22:19:39 +02:00
|
|
|
unsigned int i;
|
2000-10-24 09:36:55 +02:00
|
|
|
unsigned int *new_opencount;
|
2002-02-13 10:38:39 +01:00
|
|
|
#ifdef USE_TLS
|
|
|
|
bool any_tls = false;
|
|
|
|
#endif
|
1996-06-10 22:19:39 +02:00
|
|
|
|
2000-07-21 00:53:54 +02:00
|
|
|
/* First see whether we can remove the object at all. */
|
2001-09-08 18:27:08 +02:00
|
|
|
if (__builtin_expect (map->l_flags_1 & DF_1_NODELETE, 0)
|
|
|
|
&& map->l_init_called)
|
2000-07-21 00:53:54 +02:00
|
|
|
/* Nope. Do nothing. */
|
|
|
|
return;
|
|
|
|
|
2000-10-24 02:03:37 +02:00
|
|
|
if (__builtin_expect (map->l_opencount, 1) == 0)
|
2001-09-05 05:42:43 +02:00
|
|
|
_dl_signal_error (0, map->l_name, NULL, N_("shared object not open"));
|
1996-06-10 22:19:39 +02:00
|
|
|
|
1997-09-05 03:43:20 +02:00
|
|
|
/* Acquire the lock. */
|
2002-12-06 12:49:42 +01:00
|
|
|
__rtld_lock_lock_recursive (GL(dl_load_lock));
|
1997-09-05 03:43:20 +02:00
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
/* Decrement the reference count. */
|
1998-05-20 12:50:03 +02:00
|
|
|
if (map->l_opencount > 1 || map->l_type != lt_loaded)
|
1997-09-05 03:43:20 +02:00
|
|
|
{
|
|
|
|
/* There are still references to this object. Do nothing more. */
|
2002-01-31 04:41:25 +01:00
|
|
|
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_FILES, 0))
|
2001-09-08 18:27:08 +02:00
|
|
|
_dl_debug_printf ("\nclosing file=%s; opencount == %u\n",
|
|
|
|
map->l_name, map->l_opencount);
|
2000-08-28 10:32:23 +02:00
|
|
|
|
2000-10-24 09:36:55 +02:00
|
|
|
/* One decrement the object itself, not the dependencies. */
|
|
|
|
--map->l_opencount;
|
2000-10-21 08:02:49 +02:00
|
|
|
|
2002-12-06 12:49:42 +01:00
|
|
|
__rtld_lock_unlock_recursive (GL(dl_load_lock));
|
1997-09-05 03:43:20 +02:00
|
|
|
return;
|
|
|
|
}
|
1996-06-10 22:19:39 +02:00
|
|
|
|
2000-10-24 21:18:25 +02:00
|
|
|
list = map->l_initfini;
|
2000-10-24 09:36:55 +02:00
|
|
|
|
|
|
|
/* Compute the new l_opencount values. */
|
2001-09-08 18:27:08 +02:00
|
|
|
i = map->l_searchlist.r_nlist;
|
|
|
|
if (__builtin_expect (i == 0, 0))
|
|
|
|
/* This can happen if we handle relocation dependencies for an
|
|
|
|
object which wasn't loaded directly. */
|
|
|
|
for (i = 1; list[i] != NULL; ++i)
|
|
|
|
;
|
|
|
|
|
2002-12-30 22:15:31 +01:00
|
|
|
unsigned int nopencount = i;
|
2001-09-08 18:27:08 +02:00
|
|
|
new_opencount = (unsigned int *) alloca (i * sizeof (unsigned int));
|
|
|
|
|
2000-10-25 09:06:03 +02:00
|
|
|
for (i = 0; list[i] != NULL; ++i)
|
2000-10-24 09:36:55 +02:00
|
|
|
{
|
2000-10-24 21:18:25 +02:00
|
|
|
list[i]->l_idx = i;
|
|
|
|
new_opencount[i] = list[i]->l_opencount;
|
2000-10-24 09:36:55 +02:00
|
|
|
}
|
|
|
|
--new_opencount[0];
|
2000-10-25 09:06:03 +02:00
|
|
|
for (i = 1; list[i] != NULL; ++i)
|
2000-12-31 07:09:08 +01:00
|
|
|
if ((! (list[i]->l_flags_1 & DF_1_NODELETE) || ! list[i]->l_init_called)
|
2000-10-24 09:36:55 +02:00
|
|
|
/* Decrement counter. */
|
2002-12-30 22:15:31 +01:00
|
|
|
&& --new_opencount[i] == 0)
|
2000-10-24 09:36:55 +02:00
|
|
|
{
|
2002-12-30 22:15:31 +01:00
|
|
|
void mark_removed (struct link_map *remmap)
|
|
|
|
{
|
|
|
|
/* Test whether this object was also loaded directly. */
|
|
|
|
if (remmap->l_searchlist.r_list != NULL)
|
|
|
|
{
|
|
|
|
/* In this case we have to decrement all the dependencies of
|
|
|
|
this object. They are all in MAP's dependency list. */
|
|
|
|
unsigned int j;
|
|
|
|
struct link_map **dep_list = remmap->l_searchlist.r_list;
|
|
|
|
|
|
|
|
for (j = 1; j < remmap->l_searchlist.r_nlist; ++j)
|
|
|
|
if (! (dep_list[j]->l_flags_1 & DF_1_NODELETE)
|
|
|
|
|| ! dep_list[j]->l_init_called)
|
|
|
|
{
|
|
|
|
assert (dep_list[j]->l_idx < map->l_searchlist.r_nlist);
|
|
|
|
if (--new_opencount[dep_list[j]->l_idx] == 0)
|
|
|
|
mark_removed (dep_list[j]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (remmap->l_reldeps != NULL)
|
|
|
|
{
|
|
|
|
unsigned int j;
|
|
|
|
for (j = 0; j < remmap->l_reldepsact; ++j)
|
|
|
|
{
|
|
|
|
/* Find out whether this object is in our list. */
|
|
|
|
if (remmap->l_reldeps[j]->l_idx < nopencount
|
|
|
|
&& (list[remmap->l_reldeps[j]->l_idx]
|
|
|
|
== remmap->l_reldeps[j]))
|
|
|
|
/* Yes, it is. */
|
|
|
|
if (--new_opencount[remmap->l_reldeps[j]->l_idx] == 0)
|
|
|
|
/* This one is now gone, too. */
|
|
|
|
mark_removed (remmap->l_reldeps[j]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mark_removed (list[i]);
|
2000-10-24 09:36:55 +02:00
|
|
|
}
|
|
|
|
assert (new_opencount[0] == 0);
|
|
|
|
|
1998-05-20 12:50:03 +02:00
|
|
|
/* Call all termination functions at once. */
|
2000-10-25 09:06:03 +02:00
|
|
|
for (i = 0; list[i] != NULL; ++i)
|
1998-05-20 12:50:03 +02:00
|
|
|
{
|
2000-10-24 21:18:25 +02:00
|
|
|
struct link_map *imap = list[i];
|
2000-10-24 09:36:55 +02:00
|
|
|
if (new_opencount[i] == 0 && imap->l_type == lt_loaded
|
2000-03-30 18:30:49 +02:00
|
|
|
&& (imap->l_info[DT_FINI] || imap->l_info[DT_FINI_ARRAY])
|
2000-12-31 07:09:08 +01:00
|
|
|
&& (! (imap->l_flags_1 & DF_1_NODELETE) || ! imap->l_init_called)
|
1998-07-13 14:29:13 +02:00
|
|
|
/* Skip any half-cooked objects that were never initialized. */
|
|
|
|
&& imap->l_init_called)
|
1998-05-20 12:50:03 +02:00
|
|
|
{
|
1998-05-25 12:01:47 +02:00
|
|
|
/* When debugging print a message first. */
|
2002-01-31 04:41:25 +01:00
|
|
|
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0))
|
2001-02-28 07:36:10 +01:00
|
|
|
_dl_debug_printf ("\ncalling fini: %s\n\n", imap->l_name);
|
2000-03-30 18:30:49 +02:00
|
|
|
|
1998-05-25 12:01:47 +02:00
|
|
|
/* Call its termination function. */
|
2000-03-30 18:30:49 +02:00
|
|
|
if (imap->l_info[DT_FINI_ARRAY] != NULL)
|
|
|
|
{
|
|
|
|
ElfW(Addr) *array =
|
|
|
|
(ElfW(Addr) *) (imap->l_addr
|
|
|
|
+ imap->l_info[DT_FINI_ARRAY]->d_un.d_ptr);
|
|
|
|
unsigned int sz = (imap->l_info[DT_FINI_ARRAYSZ]->d_un.d_val
|
|
|
|
/ sizeof (ElfW(Addr)));
|
|
|
|
unsigned int cnt;
|
|
|
|
|
|
|
|
for (cnt = 0; cnt < sz; ++cnt)
|
|
|
|
((fini_t) (imap->l_addr + array[cnt])) ();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Next try the old-style destructor. */
|
|
|
|
if (imap->l_info[DT_FINI] != NULL)
|
2000-11-16 19:15:26 +01:00
|
|
|
(*(void (*) (void)) DL_DT_FINI_ADDRESS
|
|
|
|
(imap, (void *) imap->l_addr
|
|
|
|
+ imap->l_info[DT_FINI]->d_un.d_ptr)) ();
|
1998-05-20 12:50:03 +02:00
|
|
|
}
|
2001-09-07 09:57:11 +02:00
|
|
|
else if (new_opencount[i] != 0 && imap->l_type == lt_loaded)
|
|
|
|
{
|
|
|
|
/* The object is still used. But the object we are unloading
|
|
|
|
right now is responsible for loading it and therefore we
|
|
|
|
have the search list of the current object in its scope.
|
|
|
|
Remove it. */
|
|
|
|
struct r_scope_elem **runp = imap->l_scope;
|
|
|
|
|
|
|
|
while (*runp != NULL)
|
|
|
|
if (*runp == &map->l_searchlist)
|
|
|
|
{
|
|
|
|
/* Copy all later elements. */
|
|
|
|
while ((runp[0] = runp[1]) != NULL)
|
|
|
|
++runp;
|
|
|
|
break;
|
|
|
|
}
|
2002-12-30 22:15:31 +01:00
|
|
|
else
|
|
|
|
++runp;
|
2001-09-07 09:57:11 +02:00
|
|
|
}
|
2000-10-24 09:36:55 +02:00
|
|
|
|
|
|
|
/* Store the new l_opencount value. */
|
|
|
|
imap->l_opencount = new_opencount[i];
|
|
|
|
/* Just a sanity check. */
|
|
|
|
assert (imap->l_type == lt_loaded || imap->l_opencount > 0);
|
1998-05-20 12:50:03 +02:00
|
|
|
}
|
|
|
|
|
1996-06-13 06:06:45 +02:00
|
|
|
/* Notify the debugger we are about to remove some loaded objects. */
|
|
|
|
_r_debug.r_state = RT_DELETE;
|
|
|
|
_dl_debug_state ();
|
|
|
|
|
2002-11-01 21:44:15 +01:00
|
|
|
#ifdef USE_TLS
|
|
|
|
size_t tls_free_start, tls_free_end;
|
|
|
|
tls_free_start = tls_free_end = GL(dl_tls_static_used);
|
|
|
|
#endif
|
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
/* Check each element of the search list to see if all references to
|
|
|
|
it are gone. */
|
2000-10-25 09:06:03 +02:00
|
|
|
for (i = 0; list[i] != NULL; ++i)
|
1996-06-10 22:19:39 +02:00
|
|
|
{
|
1998-01-25 18:01:47 +01:00
|
|
|
struct link_map *imap = list[i];
|
|
|
|
if (imap->l_opencount == 0 && imap->l_type == lt_loaded)
|
1996-06-10 22:19:39 +02:00
|
|
|
{
|
1998-09-01 19:19:00 +02:00
|
|
|
struct libname_list *lnp;
|
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
/* That was the last reference, and this was a dlopen-loaded
|
|
|
|
object. We can unmap it. */
|
2000-10-24 02:03:37 +02:00
|
|
|
if (__builtin_expect (imap->l_global, 0))
|
1996-06-10 22:19:39 +02:00
|
|
|
{
|
|
|
|
/* This object is in the global scope list. Remove it. */
|
2002-01-31 04:41:25 +01:00
|
|
|
unsigned int cnt = GL(dl_main_searchlist)->r_nlist;
|
1998-09-06 11:16:53 +02:00
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
do
|
1999-01-21 15:17:43 +01:00
|
|
|
--cnt;
|
2002-01-31 04:41:25 +01:00
|
|
|
while (GL(dl_main_searchlist)->r_list[cnt] != imap);
|
1999-01-16 18:09:04 +01:00
|
|
|
|
1999-01-21 15:17:43 +01:00
|
|
|
/* The object was already correctly registered. */
|
2002-01-31 04:41:25 +01:00
|
|
|
while (++cnt < GL(dl_main_searchlist)->r_nlist)
|
|
|
|
GL(dl_main_searchlist)->r_list[cnt - 1]
|
|
|
|
= GL(dl_main_searchlist)->r_list[cnt];
|
1999-01-21 15:17:43 +01:00
|
|
|
|
2002-01-31 04:41:25 +01:00
|
|
|
--GL(dl_main_searchlist)->r_nlist;
|
1996-06-10 22:19:39 +02:00
|
|
|
}
|
|
|
|
|
2002-02-13 10:38:39 +01:00
|
|
|
#ifdef USE_TLS
|
2002-10-18 03:10:44 +02:00
|
|
|
/* Remove the object from the dtv slotinfo array if it uses TLS. */
|
2002-02-13 10:38:39 +01:00
|
|
|
if (__builtin_expect (imap->l_tls_blocksize > 0, 0))
|
|
|
|
{
|
|
|
|
any_tls = true;
|
2002-02-14 04:54:02 +01:00
|
|
|
|
2002-02-14 08:57:19 +01:00
|
|
|
if (! remove_slotinfo (imap->l_tls_modid,
|
2002-10-18 03:10:44 +02:00
|
|
|
GL(dl_tls_dtv_slotinfo_list), 0,
|
|
|
|
imap->l_init_called))
|
2002-02-14 08:57:19 +01:00
|
|
|
/* All dynamically loaded modules with TLS are unloaded. */
|
|
|
|
GL(dl_tls_max_dtv_idx) = GL(dl_tls_static_nelem);
|
2002-11-01 21:44:15 +01:00
|
|
|
|
|
|
|
if (imap->l_tls_offset != 0)
|
|
|
|
{
|
|
|
|
/* Collect a contiguous chunk built from the objects in
|
|
|
|
this search list, going in either direction. When the
|
|
|
|
whole chunk is at the end of the used area then we can
|
|
|
|
reclaim it. */
|
|
|
|
if (imap->l_tls_offset == tls_free_end)
|
|
|
|
/* Extend the contiguous chunk being reclaimed. */
|
|
|
|
tls_free_end += imap->l_tls_blocksize;
|
|
|
|
else if (imap->l_tls_offset + imap->l_tls_blocksize
|
|
|
|
== tls_free_start)
|
|
|
|
/* Extend the chunk backwards. */
|
|
|
|
tls_free_start = imap->l_tls_offset;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* This isn't contiguous with the last chunk freed.
|
|
|
|
One of them will be leaked. */
|
|
|
|
if (tls_free_end == GL(dl_tls_static_used))
|
|
|
|
GL(dl_tls_static_used) = tls_free_start;
|
|
|
|
tls_free_start = imap->l_tls_offset;
|
|
|
|
tls_free_end = tls_free_start + imap->l_tls_blocksize;
|
|
|
|
}
|
|
|
|
}
|
2002-02-13 10:38:39 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-09-01 19:19:00 +02:00
|
|
|
/* We can unmap all the maps at once. We determined the
|
1998-09-02 01:08:36 +02:00
|
|
|
start address and length when we loaded the object and
|
|
|
|
the `munmap' call does the rest. */
|
2000-09-26 21:13:37 +02:00
|
|
|
DL_UNMAP (imap);
|
1998-03-16 19:30:44 +01:00
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
/* Finally, unlink the data structure and free it. */
|
2000-03-31 07:50:02 +02:00
|
|
|
#ifdef SHARED
|
1998-08-31 19:23:45 +02:00
|
|
|
/* We will unlink the first object only if this is a statically
|
|
|
|
linked program. */
|
|
|
|
assert (imap->l_prev != NULL);
|
1998-09-01 12:35:19 +02:00
|
|
|
imap->l_prev->l_next = imap->l_next;
|
1998-08-31 19:23:45 +02:00
|
|
|
#else
|
|
|
|
if (imap->l_prev != NULL)
|
1998-01-25 18:01:47 +01:00
|
|
|
imap->l_prev->l_next = imap->l_next;
|
1998-08-31 19:23:45 +02:00
|
|
|
else
|
2002-01-31 04:41:25 +01:00
|
|
|
GL(dl_loaded) = imap->l_next;
|
1998-08-31 19:23:45 +02:00
|
|
|
#endif
|
2002-01-31 04:41:25 +01:00
|
|
|
--GL(dl_nloaded);
|
1998-01-25 18:01:47 +01:00
|
|
|
if (imap->l_next)
|
|
|
|
imap->l_next->l_prev = imap->l_prev;
|
1998-09-01 19:19:00 +02:00
|
|
|
|
2002-12-30 22:15:31 +01:00
|
|
|
free (imap->l_versions);
|
|
|
|
if (imap->l_origin != (char *) -1)
|
1998-09-01 19:19:00 +02:00
|
|
|
free ((char *) imap->l_origin);
|
|
|
|
|
2000-10-24 22:20:37 +02:00
|
|
|
/* If the object has relocation dependencies save this
|
|
|
|
information for latter. */
|
|
|
|
if (__builtin_expect (imap->l_reldeps != NULL, 0))
|
|
|
|
{
|
|
|
|
struct reldep_list *newrel;
|
|
|
|
|
2002-12-30 22:15:31 +01:00
|
|
|
newrel = (struct reldep_list *) alloca (sizeof (*reldeps)
|
|
|
|
+ (imap->l_reldepsact
|
|
|
|
* sizeof (bool)));
|
2001-05-23 01:55:23 +02:00
|
|
|
newrel->rellist = imap->l_reldeps;
|
|
|
|
newrel->nrellist = imap->l_reldepsact;
|
2000-10-24 22:20:37 +02:00
|
|
|
newrel->next = reldeps;
|
|
|
|
|
2002-12-30 22:15:31 +01:00
|
|
|
newrel->nhandled = imap->l_reldepsact;
|
|
|
|
unsigned int j;
|
|
|
|
for (j = 0; j < imap->l_reldepsact; ++j)
|
|
|
|
{
|
|
|
|
/* Find out whether this object is in our list. */
|
|
|
|
if (imap->l_reldeps[j]->l_idx < nopencount
|
|
|
|
&& list[imap->l_reldeps[j]->l_idx] == imap->l_reldeps[j])
|
|
|
|
/* Yes, it is. */
|
|
|
|
newrel->handled[j] = true;
|
|
|
|
else
|
|
|
|
newrel->handled[j] = false;
|
|
|
|
}
|
|
|
|
|
2000-10-24 22:20:37 +02:00
|
|
|
reldeps = newrel;
|
|
|
|
}
|
|
|
|
|
1998-09-02 01:08:36 +02:00
|
|
|
/* This name always is allocated. */
|
1998-09-01 19:19:00 +02:00
|
|
|
free (imap->l_name);
|
1998-09-02 01:08:36 +02:00
|
|
|
/* Remove the list with all the names of the shared object. */
|
1998-09-01 19:19:00 +02:00
|
|
|
lnp = imap->l_libname;
|
|
|
|
do
|
|
|
|
{
|
1998-09-01 19:58:59 +02:00
|
|
|
struct libname_list *this = lnp;
|
1998-09-01 19:19:00 +02:00
|
|
|
lnp = lnp->next;
|
2001-09-08 22:03:14 +02:00
|
|
|
if (!this->dont_free)
|
|
|
|
free (this);
|
1998-09-01 19:19:00 +02:00
|
|
|
}
|
|
|
|
while (lnp != NULL);
|
|
|
|
|
1998-09-02 01:08:36 +02:00
|
|
|
/* Remove the searchlists. */
|
2000-03-30 18:30:49 +02:00
|
|
|
if (imap != map)
|
2002-12-30 22:15:31 +01:00
|
|
|
free (imap->l_initfini);
|
1998-09-02 01:08:36 +02:00
|
|
|
|
2001-09-07 09:57:11 +02:00
|
|
|
/* Remove the scope array if we allocated it. */
|
|
|
|
if (imap->l_scope != imap->l_scope_mem)
|
|
|
|
free (imap->l_scope);
|
|
|
|
|
1999-05-07 02:00:48 +02:00
|
|
|
if (imap->l_phdr_allocated)
|
1999-05-17 11:56:54 +02:00
|
|
|
free ((void *) imap->l_phdr);
|
1999-05-07 02:00:48 +02:00
|
|
|
|
2000-08-31 04:27:07 +02:00
|
|
|
if (imap->l_rpath_dirs.dirs != (void *) -1)
|
|
|
|
free (imap->l_rpath_dirs.dirs);
|
|
|
|
if (imap->l_runpath_dirs.dirs != (void *) -1)
|
|
|
|
free (imap->l_runpath_dirs.dirs);
|
|
|
|
|
1998-01-25 18:01:47 +01:00
|
|
|
free (imap);
|
1996-06-10 22:19:39 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-02-13 10:38:39 +01:00
|
|
|
#ifdef USE_TLS
|
2002-11-01 21:44:15 +01:00
|
|
|
/* If we removed any object which uses TLS bump the generation counter. */
|
2002-02-14 04:54:02 +01:00
|
|
|
if (any_tls)
|
2002-11-01 21:44:15 +01:00
|
|
|
{
|
|
|
|
if (__builtin_expect (++GL(dl_tls_generation) == 0, 0))
|
|
|
|
__libc_fatal (_("TLS generation counter wrapped! Please send report with the 'glibcbug' script."));
|
|
|
|
|
|
|
|
if (tls_free_end == GL(dl_tls_static_used))
|
|
|
|
GL(dl_tls_static_used) = tls_free_start;
|
|
|
|
}
|
2002-02-13 10:38:39 +01:00
|
|
|
#endif
|
|
|
|
|
2000-10-24 21:31:51 +02:00
|
|
|
/* Notify the debugger those objects are finalized and gone. */
|
|
|
|
_r_debug.r_state = RT_CONSISTENT;
|
|
|
|
_dl_debug_state ();
|
|
|
|
|
2000-04-03 05:51:04 +02:00
|
|
|
/* Now we can perhaps also remove the modules for which we had
|
|
|
|
dependencies because of symbol lookup. */
|
2000-10-24 22:20:37 +02:00
|
|
|
while (__builtin_expect (reldeps != NULL, 0))
|
2000-04-03 05:51:04 +02:00
|
|
|
{
|
2000-10-24 22:20:37 +02:00
|
|
|
while (reldeps->nrellist-- > 0)
|
2002-12-30 22:15:31 +01:00
|
|
|
/* Some of the relocation dependencies might be on the
|
|
|
|
dependency list of the object we are closing right now.
|
|
|
|
They were already handled. Do not close them again. */
|
|
|
|
if (reldeps->nrellist < reldeps->nhandled
|
|
|
|
&& ! reldeps->handled[reldeps->nrellist])
|
|
|
|
_dl_close (reldeps->rellist[reldeps->nrellist]);
|
2000-10-24 22:20:37 +02:00
|
|
|
|
|
|
|
free (reldeps->rellist);
|
2000-04-03 05:51:04 +02:00
|
|
|
|
2000-10-24 22:20:37 +02:00
|
|
|
reldeps = reldeps->next;
|
2000-04-03 05:51:04 +02:00
|
|
|
}
|
|
|
|
|
1996-06-10 22:19:39 +02:00
|
|
|
free (list);
|
1996-06-13 06:06:45 +02:00
|
|
|
|
2000-10-24 21:31:51 +02:00
|
|
|
/* Release the lock. */
|
2002-12-06 12:49:42 +01:00
|
|
|
__rtld_lock_unlock_recursive (GL(dl_load_lock));
|
2000-10-24 21:31:51 +02:00
|
|
|
}
|
2002-08-04 11:05:47 +02:00
|
|
|
libc_hidden_def (_dl_close)
|
2000-10-24 21:31:51 +02:00
|
|
|
|
|
|
|
|
2002-02-13 18:45:55 +01:00
|
|
|
#ifdef USE_TLS
|
2002-02-13 10:38:39 +01:00
|
|
|
static bool
|
2002-12-04 13:30:40 +01:00
|
|
|
free_slotinfo (struct dtv_slotinfo_list **elemp)
|
2002-02-13 10:38:39 +01:00
|
|
|
{
|
|
|
|
size_t cnt;
|
|
|
|
|
2002-12-04 13:30:40 +01:00
|
|
|
if (*elemp == NULL)
|
2002-02-24 08:10:08 +01:00
|
|
|
/* Nothing here, all is removed (or there never was anything). */
|
|
|
|
return true;
|
|
|
|
|
2002-12-04 13:30:40 +01:00
|
|
|
if (!free_slotinfo (&(*elemp)->next))
|
2002-02-13 10:38:39 +01:00
|
|
|
/* We cannot free the entry. */
|
|
|
|
return false;
|
|
|
|
|
2002-12-04 13:30:40 +01:00
|
|
|
/* That cleared our next pointer for us. */
|
2002-02-13 10:38:39 +01:00
|
|
|
|
2002-12-04 13:30:40 +01:00
|
|
|
for (cnt = 0; cnt < (*elemp)->len; ++cnt)
|
|
|
|
if ((*elemp)->slotinfo[cnt].map != NULL)
|
2002-02-13 10:38:39 +01:00
|
|
|
/* Still used. */
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* We can remove the list element. */
|
2002-12-04 13:30:40 +01:00
|
|
|
free (*elemp);
|
|
|
|
*elemp = NULL;
|
2002-02-13 10:38:39 +01:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
2002-02-13 18:45:55 +01:00
|
|
|
#endif
|
2002-02-13 10:38:39 +01:00
|
|
|
|
|
|
|
|
2002-11-01 21:44:15 +01:00
|
|
|
libc_freeres_fn (free_mem)
|
2000-10-24 21:31:51 +02:00
|
|
|
{
|
2002-01-31 04:41:25 +01:00
|
|
|
if (__builtin_expect (GL(dl_global_scope_alloc), 0) != 0
|
|
|
|
&& GL(dl_main_searchlist)->r_nlist == GL(dl_initial_searchlist).r_nlist)
|
1999-01-20 19:32:29 +01:00
|
|
|
{
|
|
|
|
/* All object dynamically loaded by the program are unloaded. Free
|
|
|
|
the memory allocated for the global scope variable. */
|
2002-01-31 04:41:25 +01:00
|
|
|
struct link_map **old = GL(dl_main_searchlist)->r_list;
|
1999-01-20 19:32:29 +01:00
|
|
|
|
|
|
|
/* Put the old map in. */
|
2002-01-31 04:41:25 +01:00
|
|
|
GL(dl_main_searchlist)->r_list = GL(dl_initial_searchlist).r_list;
|
1999-01-20 19:32:29 +01:00
|
|
|
/* Signal that the original map is used. */
|
2002-01-31 04:41:25 +01:00
|
|
|
GL(dl_global_scope_alloc) = 0;
|
1999-01-20 19:32:29 +01:00
|
|
|
|
|
|
|
/* Now free the old map. */
|
|
|
|
free (old);
|
|
|
|
}
|
2002-02-13 10:38:39 +01:00
|
|
|
|
|
|
|
#ifdef USE_TLS
|
2002-12-03 02:51:07 +01:00
|
|
|
if (USE___THREAD || GL(dl_tls_dtv_slotinfo_list) != NULL)
|
|
|
|
{
|
|
|
|
/* Free the memory allocated for the dtv slotinfo array. We can do
|
2002-12-04 13:30:40 +01:00
|
|
|
this only if all modules which used this memory are unloaded. */
|
|
|
|
# ifdef SHARED
|
|
|
|
if (GL(dl_initial_dtv) == NULL)
|
|
|
|
/* There was no initial TLS setup, it was set up later when
|
|
|
|
it used the normal malloc. */
|
|
|
|
free_slotinfo (&GL(dl_tls_dtv_slotinfo_list));
|
|
|
|
# endif
|
|
|
|
/* The first element of the list does not have to be deallocated.
|
|
|
|
It was allocated in the dynamic linker (i.e., with a different
|
|
|
|
malloc), and in the static library it's in .bss space. */
|
|
|
|
free_slotinfo (&GL(dl_tls_dtv_slotinfo_list)->next);
|
2002-12-03 02:51:07 +01:00
|
|
|
}
|
2002-02-13 10:38:39 +01:00
|
|
|
#endif
|
1996-06-10 22:19:39 +02:00
|
|
|
}
|