am b90e9b71: Merge "Fix l_addr for the linker"

* commit 'b90e9b71835957a5f816b9a6da1c23c3b6db4802':
  Fix l_addr for the linker
This commit is contained in:
Dmitriy Ivanov 2015-06-11 03:24:41 +00:00 committed by Android Git Automerger
commit 571b01186a

View File

@ -3084,7 +3084,7 @@ static soinfo* linker_soinfo_for_gdb = nullptr;
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