OSDN Git Service

Print error when prelink fails for main executable
authorDmitriy Ivanov <dimitry@google.com>
Wed, 7 Jan 2015 23:48:25 +0000 (15:48 -0800)
committerDmitriy Ivanov <dimitry@google.com>
Wed, 7 Jan 2015 23:49:40 +0000 (15:49 -0800)
Bug: 18931021
Change-Id: Ib6c39a409161b20a10c3485272c73bc2abd4ee4f
(cherry picked from commit d9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518)

linker/linker.cpp

index babefeb..9b67fc2 100644 (file)
@@ -2717,7 +2717,10 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args, ElfW(
 
   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);