summaryrefslogtreecommitdiffstats
path: root/linker
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2015-04-29 14:41:06 -0700
committerDmitriy Ivanov <dimitry@google.com>2015-04-29 15:02:50 -0700
commite97d519a6b5d5f3272a0c851dff7bcf1f8ac0157 (patch)
tree834752d7f5a956c9b22c6d9a4308d35301fb8bb8 /linker
parent53ba6636178b7fb5d837b52aa6b2983263e3df4e (diff)
downloadbionic-e97d519a6b5d5f3272a0c851dff7bcf1f8ac0157.zip
bionic-e97d519a6b5d5f3272a0c851dff7bcf1f8ac0157.tar.gz
bionic-e97d519a6b5d5f3272a0c851dff7bcf1f8ac0157.tar.bz2
Fix mips relocation to use load_bias as intended
Bug: http://b/20658994 Change-Id: I5a15605fe34db359e26d563e13841ae993083c4a (cherry picked from commit 0373d4f47342e0a6f146af9023a146b0b707442b)
Diffstat (limited to 'linker')
-rw-r--r--linker/linker_mips.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker_mips.cpp b/linker/linker_mips.cpp
index 0769f82..87b811f 100644
--- a/linker/linker_mips.cpp
+++ b/linker/linker_mips.cpp
@@ -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: