Roll to android/platform/ndk/681f1b744aec1b0888f4c7a68165720db9670300

third_party/android_crazy_linker/src/src/crazy_linker_elf_symbols.cpp

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crazy_linker_elf_symbols.h"
 
 #include "crazy_linker_debug.h"
 #include "crazy_linker_elf_view.h"
 
 namespace crazy {
@@ skipping 17 matching lines @@
 
 bool ElfSymbols::Init(const ElfView* view) {
   LOG("%s: Parsing dynamic table\n", __FUNCTION__);
   ElfView::DynamicIterator dyn(view);
   for (; dyn.HasNext(); dyn.GetNext()) {
     uintptr_t dyn_addr = dyn.GetAddress(view->load_bias());
     switch (dyn.GetTag()) {
       case DT_HASH:
         LOG("  DT_HASH addr=%p\n", dyn_addr);
         {
-          ELF::Addr* data = reinterpret_cast<uintptr_t*>(dyn_addr);
+          ELF::Word* data = reinterpret_cast<ELF::Word*>(dyn_addr);
           hash_bucket_size_ = data[0];
           hash_chain_size_ = data[1];
           hash_bucket_ = data + 2;
           hash_chain_ = data + 2 + hash_bucket_size_;
         }
         break;
       case DT_STRTAB:
         LOG("  DT_STRTAB addr=%p\n", dyn_addr);
         string_table_ = reinterpret_cast<const char*>(dyn_addr);
         break;
@@ skipping 88 matching lines @@
       case STB_WEAK:
         return symbol;
       default:
         ;
     }
   }
   return NULL;
 }
 
 }  // namespace crazy