diff options
author | Ulrich Drepper <drepper@redhat.com> | 1999-07-07 18:39:33 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-07 18:39:33 +0000 |
commit | 94e365c61202e2472c8aea42c7c95ce40f5b843c (patch) | |
tree | 15cf6a02604ab91d5aa1feeaeb338f0fc6b91f34 /elf/dlopenold.c | |
parent | 2556bfe6fdb5ccb4864e0249d5fdd475e4100c71 (diff) | |
download | glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.tar glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.tar.gz glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.tar.bz2 glibc-94e365c61202e2472c8aea42c7c95ce40f5b843c.zip |
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>
Diffstat (limited to 'elf/dlopenold.c')
-rw-r--r-- | elf/dlopenold.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/elf/dlopenold.c b/elf/dlopenold.c deleted file mode 100644 index 661a40579a..0000000000 --- a/elf/dlopenold.c +++ /dev/null @@ -1,64 +0,0 @@ -/* Load a shared object at run time. - Copyright (C) 1995, 1996, 1997, 1998, 1999 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <dlfcn.h> -#include <stddef.h> -#include <elf/ldsodefs.h> - -/* This file is for compatibility with glibc 2.0. Compile it only if - versioning is used. */ -#if defined PIC && DO_VERSIONING - -struct dlopen_args -{ - /* The arguments for dlopen_doit. */ - const char *file; - int mode; - /* The return value of dlopen_doit. */ - struct link_map *new; - /* Address of the caller. */ - const void *caller; -}; - - -static void -dlopen_doit (void *a) -{ - struct dlopen_args *args = (struct dlopen_args *) a; - - args->new = _dl_open (args->file ?: "", args->mode, args->caller); -} - - -void * -__dlopen_nocheck (const char *file, int mode) -{ - struct dlopen_args args; - args.file = file; - args.caller = __builtin_return_address (0); - - if ((mode & RTLD_BINDING_MASK) == 0) - /* By default assume RTLD_LAZY. */ - mode |= RTLD_LAZY; - args.mode = mode; - - return _dlerror_run (dlopen_doit, &args) ? NULL : args.new; -} -symbol_version (__dlopen_nocheck, dlopen, GLIBC_2.0); -#endif |