commit 38263dd91a4b68e2ad0afe458c9a20cb360dafeb
author Dmitriy Ivanov <dimitry@google.com> Wed Jun 10 19:46:19 2015 -0700
committer Dmitriy Ivanov <dimitry@google.com> Wed Jun 10 20:05:48 2015 -0700
tree a6ef17c5cd8583c09dc4d1a3c486607c1cec82eb
parent 25ac753f474492ffa3625ca6b5aae254bb205c33

Fix l_addr for the linker

Bug: http://b/21765603
Change-Id: I97710ef2436eac2160e29ba3e4521f6e63a1907c
(cherry picked from commit 175dae92d78cc6338125a49ea8dbabbd2f22ddf0)

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index b5ebc1e..c353290 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3020,7 +3020,7 @@
 static void init_linker_info_for_gdb(ElfW(Addr) linker_base) {
   linker_soinfo_for_gdb = new (linker_soinfo_for_gdb_buf) soinfo(LINKER_PATH, nullptr, 0, 0);
 
-  linker_soinfo_for_gdb->base = linker_base;
+  linker_soinfo_for_gdb->load_bias = linker_base;
 
   /*
    * Set the dynamic field in the link map otherwise gdb will complain with