tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move [vdso] after exe/linker in _r_debug"

Browse source
This commit is contained in:
Treehugger Robot 2018-08-22 00:13:00 +00:00 committed by Gerrit Code Review
commit 8f2298e73f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
linker/linker_main.cpp
View file

@ -289,8 +289,6 @@ static ElfW(Addr) linker_main(KernelArgumentBlock& args) {
}
}
add_vdso(args);
struct stat file_stat;
// Stat "/proc/self/exe" instead of executable_path because
// the executable could be unlinked by this point and it should
@ -320,6 +318,8 @@ static ElfW(Addr) linker_main(KernelArgumentBlock& args) {
insert_link_map_into_debug_map(map);
insert_link_map_into_debug_map(&linker_link_map);
add_vdso(args);
// Extract information passed from the kernel.
si->phdr = reinterpret_cast<ElfW(Phdr)*>(args.getauxval(AT_PHDR));
si->phnum = args.getauxval(AT_PHNUM);