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

am 56ee4b95: am 8e3bdee3: am 3b2f4142: Merge "Improve dynamic linker diagnostics for internal errors."

Browse Source 
* commit '56ee4b955eaa7aaa9fc1f8867b5b4b19d5971c77':
  Improve dynamic linker diagnostics for internal errors.
This commit is contained in:
Elliott Hughes 2013-12-22 19:53:19 +00:00 committed by Android Git Automerger
commit e2c900cf98
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linker/linker.cpp
View File

@ -2212,6 +2212,7 @@ extern "C" Elf_Addr __linker_init(void* raw_args) {
soinfo linker_so;
memset(&linker_so, 0, sizeof(soinfo));
strcpy(linker_so.name, "[dynamic linker]");
linker_so.base = linker_addr;
linker_so.size = phdr_table_get_load_size(phdr, elf_hdr->e_phnum);
linker_so.load_bias = get_elf_exec_load_bias(elf_hdr);
@ -2223,11 +2224,13 @@ extern "C" Elf_Addr __linker_init(void* raw_args) {
if (!soinfo_link_image(&linker_so)) {
// It would be nice to print an error message, but if the linker
// can't link itself, there's no guarantee that we'll be able to
// call write() (because it involves a GOT reference).
//
// This situation should never occur unless the linker itself
// is corrupt.
exit(EXIT_FAILURE);
// call write() (because it involves a GOT reference). We may as
// well try though...
const char* msg = "CANNOT LINK EXECUTABLE: ";
write(2, msg, strlen(msg));
write(2, __linker_dl_err_buf, strlen(__linker_dl_err_buf));
write(2, "\n", 1);
_exit(EXIT_FAILURE);
}
// We have successfully fixed our own relocations. It's safe to run