am 5811e3fc: am 5cd127d3: Merge "Fix mips build"

* commit '5811e3fce16d2394654447ae9ee504149b7e1000':
  Fix mips build
This commit is contained in:
Dmitriy Ivanov 2014-12-02 22:13:59 +00:00 committed by Android Git Automerger
commit 7ef5d8b845

View file

@ -1760,7 +1760,7 @@ bool soinfo::mips_relocate_got(const soinfo_list_t& global_group, const soinfo_l
// got[1] may be used for a GNU extension.
// Set it to a recognizable address in case someone calls it (should be _rtld_bind_start).
// FIXME: maybe this should be in a separate routine?
if ((flags & FLAG_LINKER) == 0) {
if ((flags_ & FLAG_LINKER) == 0) {
size_t g = 0;
got[g++] = reinterpret_cast<ElfW(Addr)*>(0xdeadbeef);
if (reinterpret_cast<intptr_t>(got[g]) < 0) {