Commit | Line | Data |
---|---|---|
f27d3ffa VM |
1 | diff --git a/elf/rtld.c b/elf/rtld.c |
2 | index 9a560b3..201c9cf 100644 | |
3 | --- a/elf/rtld.c | |
4 | +++ b/elf/rtld.c | |
5 | @@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", | |
6 | we need it in the memory handling later. */ | |
7 | GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; | |
8 | ||
9 | + /* Remember the last search directory added at startup, now that | |
10 | + malloc will no longer be the one from dl-minimal.c. */ | |
11 | + GLRO(dl_init_all_dirs) = GL(dl_all_dirs); | |
12 | + | |
13 | if (prelinked) | |
14 | { | |
15 | if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) | |
16 | @@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", | |
17 | lossage); | |
18 | } | |
19 | ||
20 | - /* Remember the last search directory added at startup, now that | |
21 | - malloc will no longer be the one from dl-minimal.c. */ | |
22 | - GLRO(dl_init_all_dirs) = GL(dl_all_dirs); | |
23 | - | |
24 | if (! prelinked && rtld_multiple_ref) | |
25 | { | |
26 | /* There was an explicit ref to the dynamic linker as a shared lib. |