diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2016-02-16 21:29:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-16 21:29:43 +0000 |
| commit | b244d21672b3bbb8bb4653d737a2d1bfd39ed877 (patch) | |
| tree | 4debe3f53371db977761d040c0b690f08f6dd1c5 | |
| parent | 85665af917c74ff88668c1c1bffe5455e9f779cc (diff) | |
| parent | e687d067c6ecea18327fd60cb63a11208d9adc24 (diff) | |
| download | bionic-b244d21672b3bbb8bb4653d737a2d1bfd39ed877.tar.gz | |
Merge "linker: remove soinfo::entry"
| -rw-r--r-- | linker/linker.cpp | 6 | ||||
| -rw-r--r-- | linker/linker.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp index a032068a6..16bb47cc6 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -4017,7 +4017,6 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW( // Extract information passed from the kernel. si->phdr = reinterpret_cast<ElfW(Phdr)*>(args.getauxval(AT_PHDR)); si->phnum = args.getauxval(AT_PHNUM); - si->entry = args.getauxval(AT_ENTRY); /* Compute the value of si->base. We can't rely on the fact that * the first entry is the PHDR because this will not be true @@ -4146,8 +4145,9 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW( fflush(stdout); #endif - TRACE("[ Ready to execute '%s' @ %p ]", si->get_realpath(), reinterpret_cast<void*>(si->entry)); - return si->entry; + ElfW(Addr) entry = args.getauxval(AT_ENTRY); + TRACE("[ Ready to execute '%s' @ %p ]", si->get_realpath(), reinterpret_cast<void*>(entry)); + return entry; } /* Compute the load-bias of an existing executable. This shall only diff --git a/linker/linker.h b/linker/linker.h index 389c5b362..c669c46a6 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -173,7 +173,9 @@ struct soinfo { public: const ElfW(Phdr)* phdr; size_t phnum; - ElfW(Addr) entry; +#if defined(__work_around_b_24465209__) + ElfW(Addr) unused0; // DO NOT USE, maintained for compatibility. +#endif ElfW(Addr) base; size_t size; |