2004-10-14  Jakub Jelinek  <jakub@redhat.com>

	* elf/rtld.c (_dl_start): Fix one last dl_loaded.
	* elf/dl-load.c (_dl_map_object_from_fd): Avoid definition of
	label when it is not needed.
	* elf/dl-close.c (_dl_close): Typo: & -> &&.
This commit is contained in:
Ulrich Drepper 2004-10-14 09:24:14 +00:00
parent c701ab9f0e
commit 7cb92a99fa
4 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2004-10-14 Jakub Jelinek <jakub@redhat.com>
* elf/rtld.c (_dl_start): Fix one last dl_loaded.
* elf/dl-load.c (_dl_map_object_from_fd): Avoid definition of
label when it is not needed.
* elf/dl-close.c (_dl_close): Typo: & -> &&.
2004-10-12 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/segfault.c: Include alloca.h and stdint.h.

View File

@ -237,7 +237,7 @@ _dl_close (void *_map)
struct link_map *rl = depmap->l_initfini[k];
if (rl->l_idx < nopencount
& list[rl->l_idx] == rl)
&& list[rl->l_idx] == rl)
{
assert (new_opencount[rl->l_idx] > 0);
if (--new_opencount[rl->l_idx] == 0)

View File

@ -909,7 +909,9 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
l = _dl_new_object (realname, name, l_type, loader, mode, nsid);
if (__builtin_expect (l == NULL, 0))
{
#ifdef SHARED
fail_new:
#endif
errstring = N_("cannot create shared object descriptor");
goto call_lose_errno;
}

View File

@ -537,7 +537,7 @@ _dl_start (void *arg)
# define ELF_MACHINE_START_ADDRESS(map, start) (start)
#endif
return ELF_MACHINE_START_ADDRESS (GL(dl_loaded), entry);
return ELF_MACHINE_START_ADDRESS (GL(dl_ns)[LM_ID_BASE]._ns_loaded, entry);
}
}