From d9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518 Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Wed, 7 Jan 2015 11:16:58 -0800
Subject: [PATCH] Print error when prelink fails for main executable

Bug: 18931021
Change-Id: Ieefdcf60f1506af522714300030754a4ed61c08e
---
 linker/linker.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;
-- 
2.11.0