about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-02-18 17:59:16 +0000
committerUlrich Drepper <drepper@redhat.com>1998-02-18 17:59:16 +0000
commitfb5663ca863c5b970cdb521aa4570ef9f649745b (patch)
tree7878e40f9228929450d489a43308cd84e3d454b9 /elf
parentda8324650d7e867028d1d5e9bcaed962bc6b2322 (diff)
downloadglibc-fb5663ca863c5b970cdb521aa4570ef9f649745b.tar.gz
glibc-fb5663ca863c5b970cdb521aa4570ef9f649745b.tar.xz
glibc-fb5663ca863c5b970cdb521aa4570ef9f649745b.zip
Update.
1998-02-18 17:57  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/Makefile: Add rules to build and install iconv program.
	* iconv/iconv_prog.c: New file.

1998-02-18 16:34  H.J. Lu  <hjl@gnu.org>

	* elf/dlsym.c (dlsym_doit): Fix scope and skip maps for
	_dl_lookup_symbol_skip call.
	* elf/dlvsym.c (dlvsym_doit): Likewise.

1998-02-18  Ulrich Drepper  <drepper@cygnus.com>

	* libio/iovsscanf.c: Do not include errno.h.
Diffstat (limited to 'elf')
-rw-r--r--elf/dlsym.c9
-rw-r--r--elf/dlvsym.c8
2 files changed, 10 insertions, 7 deletions
diff --git a/elf/dlsym.c b/elf/dlsym.c
index 1072f16ce1..562df42b34 100644
--- a/elf/dlsym.c
+++ b/elf/dlsym.c
@@ -1,5 +1,5 @@
 /* Look up a symbol in a shared object loaded by `dlopen'.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 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
@@ -65,8 +65,11 @@ RTLD_NEXT used in code not dynamically loaded"));
       while (l->l_loader)
 	l = l->l_loader;
 
-      args->loadbase = _dl_lookup_symbol_skip (args->name, &args->ref,
-					       &_dl_loaded, NULL, l);
+      {
+	struct link_map *map = l;
+	struct link_map *mapscope[2] = { map, NULL };
+	args->loadbase = _dl_lookup_symbol_skip (args->name, &args->ref,
+						 mapscope, NULL, match);
     }
   else
     {
diff --git a/elf/dlvsym.c b/elf/dlvsym.c
index 18cb892a3f..b4c4f731e0 100644
--- a/elf/dlvsym.c
+++ b/elf/dlvsym.c
@@ -1,5 +1,5 @@
 /* Look up a versioned symbol in a shared object loaded by `dlopen'.
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 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
@@ -69,9 +69,9 @@ RTLD_NEXT used in code not dynamically loaded"));
 
       args->loadbase = _dl_lookup_versioned_symbol_skip	(args->name,
 							 &args->ref,
-							 &_dl_loaded,
-							 NULL, &args->version,
-							 l);
+							 mapscope,
+							 NULL,
+							 match);
     }
   else
     {