generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 880aed0b: am 1d548dc9: Merge "Print error when prelink fails for main executable"

Browse Source 
* commit '880aed0b4defd7e30afcf29d4bcdf0bdd7a0bc64':
  Print error when prelink fails for main executable
This commit is contained in:
Dmitriy Ivanov
2015-01-08 00:21:33 +00:00
committed by Android Git Automerger
parent 382f4adbb7 880aed0b4d
commit 7c16f56566
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
linker/linker.cpp
View File

@@ -2717,7 +2717,10 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW(
somain = si; somain = si;
si->prelink_image(); if (!si->prelink_image()) {
__libc_format_fd(2, "CANNOT LINK EXECUTABLE: %s\n", linker_get_error_buffer());
exit(EXIT_FAILURE);
}
// add somain to global group // add somain to global group
si->set_dt_flags_1(si->get_dt_flags_1() | DF_1_GLOBAL); si->set_dt_flags_1(si->get_dt_flags_1() | DF_1_GLOBAL);