From 6718125ac71cca5d1868c33017bbc29059491349 Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Wed, 7 Jan 2015 15:48:25 -0800 Subject: [PATCH] Print error when prelink fails for main executable Bug: 18931021 Change-Id: Ib6c39a409161b20a10c3485272c73bc2abd4ee4f (cherry picked from commit d9e211ca1fcf8bb78a1e1de9e54fe7c8d0a01518) --- linker/linker.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/linker/linker.cpp b/linker/linker.cpp index babefeb3c..9b67fc2eb 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -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);