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>

2 files changed, 46 insertions, 17 deletions

diff --git a/include/dlfcn.h b/include/dlfcn.h
index f875a636ae..72b9b0e83d 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,5 +1,5 @@
 #ifndef _DLFCN_H
-#include <elf/dlfcn.h>
+#include <dlfcn/dlfcn.h>
 
 /* Now define the internal interfaces.  */
 extern void *__dlvsym __P ((void *__handle, __const char *__name,
@@ -8,7 +8,51 @@ extern void *__dlvsym __P ((void *__handle, __const char *__name,
 extern void *__libc_dlopen  __P ((__const char *__name));
 extern void *__libc_dlsym   __P ((void *__map, __const char *__name));
 extern int   __libc_dlclose __P ((void *__map));
-extern int   _dl_addr __P ((const void *address, Dl_info *info))
+
+/* Locate shared object containing the given address.  */
+extern int _dl_addr (const void *address, Dl_info *info)
+     internal_function;
+
+/* Open the shared object NAME, relocate it, and run its initializer if it
+   hasn't already been run.  MODE is as for `dlopen' (see <dlfcn.h>).  If
+   the object is already opened, returns its existing map.  */
+extern void *_dl_open (const char *name, int mode, const void *caller)
+     internal_function;
+
+/* Close an object previously opened by _dl_open.  */
+extern void _dl_close (void *map)
+     internal_function;
+
+/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or
+   RTLD_NEXT).  WHO is the calling function, for RTLD_NEXT.  Returns
+   the symbol value, which may be NULL.  */
+extern void *_dl_sym (void *handle, const char *name, void *who)
     internal_function;
 
+/* Look up version VERSION of symbol NAME in shared object HANDLE
+   (which may be RTLD_DEFAULT or RTLD_NEXT).  WHO is the calling
+   function, for RTLD_NEXT.  Returns the symbol value, which may be
+   NULL.  */
+extern void *_dl_vsym (void *handle, const char *name, const char *version,
+		       void *who)
+    internal_function;
+     
+/* Call OPERATE, catching errors from `dl_signal_error'.  If there is no
+   error, *ERRSTRING is set to null.  If there is an error, *ERRSTRING is
+   set to a string constructed from the strings passed to _dl_signal_error,
+   and the error code passed is the return value.  ERRSTRING if nonzero
+   points to a malloc'ed string which the caller has to free after use.
+   ARGS is passed as argument to OPERATE.  */
+extern int _dl_catch_error (char **errstring,
+			    void (*operate) (void *),
+			    void *args)
+     internal_function;
+
+/* Helper function for <dlfcn.h> functions.  Runs the OPERATE function via
+   _dl_catch_error.  Returns zero for success, nonzero for failure; and
+   arranges for `dlerror' to return the error details.
+   ARGS is passed as argument to OPERATE.  */
+extern int _dlerror_run (void (*operate) (void *), void *args)
+     internal_function;
+
 #endif
diff --git a/include/ldsodefs.h b/include/ldsodefs.h
deleted file mode 100644
index f171d4c7ea..0000000000
--- a/include/ldsodefs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* We must use the appropriate version for the system.  */
-#ifdef HAVE_ELF
-# include <elf/ldsodefs.h>
-#else
-/* We have no dynamic loading.  Define the macros we need here as dummy
-   versions.  */
-# ifndef _LDSODEFS_H
-# define _LDSODEFS_H	1
-
-/* Call a function through a pointer.  */
-# define _CALL_DL_FCT(fctp, args) (*fctp) args
-# define DL_CALL_FCT(fctp, args) (*fctp) args
-
-# endif	/* ldsodefs.h */
-#endif