commit 6718125ac71cca5d1868c33017bbc29059491349
author Dmitriy Ivanov <dimitry@google.com> Wed Jan 07 15:48:25 2015 -0800
committer Dmitriy Ivanov <dimitry@google.com> Wed Jan 07 15:49:40 2015 -0800
tree dc9f51c524e408543e0fee2bc8d46ece36f525e6
parent d3de1ddef1427708581af4df02943486783f980d

Print error when prelink fails for main executable

Bug: 18931021
Change-Id: Ib6c39a409161b20a10c3485272c73bc2abd4ee4f
(cherry picked from commit d9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518)

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index babefeb..9b67fc2 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2717,7 +2717,10 @@
 
   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
   si->set_dt_flags_1(si->get_dt_flags_1() | DF_1_GLOBAL);