qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* elf/rtld.c (dl_main): Don't update _dl_loaded here.
This commit is contained in:
Ulrich Drepper 1998-09-08 14:05:33 +00:00
parent e4d509175a
commit 87c812c2ad
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* elf/dl-object.c (_dl_new_object): Store map address in * elf/dl-object.c (_dl_new_object): Store map address in
_dl_loaded if _dl_loaded is NULL. _dl_loaded if _dl_loaded is NULL.
* elf/rtld.c (dl_main): Don't update _dl_loaded here.
* sysdeps/generic/setrlimit64.c: Remove stub warning. * sysdeps/generic/setrlimit64.c: Remove stub warning.

5
elf/rtld.c
View File

@ -411,7 +411,6 @@ of this helper program; chances are you did not intend to run this program.\n\
args.str = _dl_argv[0]; args.str = _dl_argv[0];
(void) _dl_catch_error (&err_str, map_doit, &args); (void) _dl_catch_error (&err_str, map_doit, &args);
_dl_loaded = args.main_map;
if (err_str != NULL) if (err_str != NULL)
{ {
free (err_str); free (err_str);
@ -419,7 +418,7 @@ of this helper program; chances are you did not intend to run this program.\n\
} }
} }
else else
_dl_loaded = _dl_map_object (NULL, _dl_argv[0], 0, lt_library, 0); _dl_map_object (NULL, _dl_argv[0], 0, lt_library, 0);
phdr = _dl_loaded->l_phdr; phdr = _dl_loaded->l_phdr;
phent = _dl_loaded->l_phnum; phent = _dl_loaded->l_phnum;
@ -434,7 +433,7 @@ of this helper program; chances are you did not intend to run this program.\n\
{ {
/* Create a link_map for the executable itself. /* Create a link_map for the executable itself.
This will be what dlopen on "" returns. */ This will be what dlopen on "" returns. */
_dl_loaded = _dl_new_object ((char *) "", "", lt_executable, NULL); _dl_new_object ((char *) "", "", lt_executable, NULL);
if (_dl_loaded == NULL) if (_dl_loaded == NULL)
_dl_sysdep_fatal ("cannot allocate memory for link map\n", NULL); _dl_sysdep_fatal ("cannot allocate memory for link map\n", NULL);
_dl_loaded->l_phdr = phdr; _dl_loaded->l_phdr = phdr;