am c6b9b254: Merge "Fix mips relocation to use load_bias as intended"

* commit 'c6b9b254dc042c9c2b8be72430a9f59803eb0794':
  Fix mips relocation to use load_bias as intended
This commit is contained in:
Dmitriy Ivanov 2015-04-29 22:22:13 +00:00 committed by Android Git Automerger
commit 1f688c2c2a

View File

@ -128,7 +128,7 @@ bool soinfo::relocate(ElfRelIteratorT&& rel_iterator,
if (s != nullptr) {
*reinterpret_cast<ElfW(Addr)*>(reloc) += sym_addr;
} else {
*reinterpret_cast<ElfW(Addr)*>(reloc) += base;
*reinterpret_cast<ElfW(Addr)*>(reloc) += load_bias;
}
break;
default: