aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-01-07 11:16:58 -0800
committerDmitriy Ivanov <dimitry@google.com>2015-01-07 11:23:34 -0800
commitd9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518 (patch)
tree4bab62bf0ca7a5591109284a4a69c3725b884675
parentc7450f7738b0d1edf832fc881ef63546d45428cb (diff)
downloadbionic-d9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518.tar.gz
Print error when prelink fails for main executable
Bug: 18931021 Change-Id: Ieefdcf60f1506af522714300030754a4ed61c08e
-rw-r--r--linker/linker.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 35c8cbdc8..54867dce2 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2413,7 +2413,10 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW(
somain = si;
- si->PrelinkImage();
+ if (!si->PrelinkImage()) {
+ __libc_format_fd(2, "CANNOT LINK EXECUTABLE: %s\n", linker_get_error_buffer());
+ exit(EXIT_FAILURE);
+ }
// Load ld_preloads and dependencies.
StringLinkedList needed_library_name_list;