Update.
2001-11-09 Ulrich Drepper <drepper@redhat.com> * elf/dl-load.c (_dl_map_object_from_fd): Delete code to remove from object list when DF_1_NOOPEN is seen. This is done in lose.
This commit is contained in:
parent
7bccbc05af
commit
d32059507b
|
@ -1,3 +1,8 @@
|
||||||
|
2001-11-09 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* elf/dl-load.c (_dl_map_object_from_fd): Delete code to remove
|
||||||
|
from object list when DF_1_NOOPEN is seen. This is done in lose.
|
||||||
|
|
||||||
2001-11-08 Ulrich Drepper <drepper@redhat.com>
|
2001-11-08 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
* elf/dl-object.c (_dl_new_object): Various small optimizations.
|
* elf/dl-object.c (_dl_new_object): Various small optimizations.
|
||||||
|
|
|
@ -1136,17 +1136,6 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
|
||||||
if (__builtin_expect (l->l_flags_1 & DF_1_NOOPEN, 0)
|
if (__builtin_expect (l->l_flags_1 & DF_1_NOOPEN, 0)
|
||||||
&& (mode & __RTLD_DLOPEN))
|
&& (mode & __RTLD_DLOPEN))
|
||||||
{
|
{
|
||||||
/* Remove from the module list. */
|
|
||||||
assert (l->l_next == NULL);
|
|
||||||
#ifndef SHARED
|
|
||||||
if (l->l_prev == NULL)
|
|
||||||
/* No other module loaded. */
|
|
||||||
_dl_loaded = NULL;
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
l->l_prev->l_next = NULL;
|
|
||||||
--_dl_nloaded;
|
|
||||||
|
|
||||||
/* We are not supposed to load this object. Free all resources. */
|
/* We are not supposed to load this object. Free all resources. */
|
||||||
__munmap ((void *) l->l_map_start, l->l_map_end - l->l_map_start);
|
__munmap ((void *) l->l_map_start, l->l_map_end - l->l_map_start);
|
||||||
|
|
||||||
|
@ -1156,8 +1145,6 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
|
||||||
if (l->l_phdr_allocated)
|
if (l->l_phdr_allocated)
|
||||||
free ((void *) l->l_phdr);
|
free ((void *) l->l_phdr);
|
||||||
|
|
||||||
free (l);
|
|
||||||
|
|
||||||
errstring = N_("shared object cannot be dlopen()ed");
|
errstring = N_("shared object cannot be dlopen()ed");
|
||||||
goto call_lose;
|
goto call_lose;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue