commit 313632db574d101275206ca025d21a5a3cd62150
author Junichi Uekawa <uekawa@google.com> Thu Nov 19 12:44:19 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 19 12:44:19 2015 +0000
tree e505b927dd798a9eb353ed5b873dd9cc66a87edd
parent 2c09e5de299ca87a9e68807e2b4af41ba61710f3
parent ff35b1e659547644fb14f890eeec880cf4bafc4e

Merge "Do not depend on host bits to get the right size to write."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 8b678ff..9cc4aba 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2734,14 +2734,14 @@
         MARK(rel->r_offset);
         TRACE_TYPE(RELO, "RELO R_X86_64_32 %08zx <- +%08zx %s", static_cast<size_t>(reloc),
                    static_cast<size_t>(sym_addr), sym_name);
-        *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend;
+        *reinterpret_cast<Elf32_Addr*>(reloc) = sym_addr + addend;
         break;
       case R_X86_64_64:
         count_relocation(kRelocRelative);
         MARK(rel->r_offset);
         TRACE_TYPE(RELO, "RELO R_X86_64_64 %08zx <- +%08zx %s", static_cast<size_t>(reloc),
                    static_cast<size_t>(sym_addr), sym_name);
-        *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend;
+        *reinterpret_cast<Elf64_Addr*>(reloc) = sym_addr + addend;
         break;
       case R_X86_64_PC32:
         count_relocation(kRelocRelative);
@@ -2749,7 +2749,7 @@
         TRACE_TYPE(RELO, "RELO R_X86_64_PC32 %08zx <- +%08zx (%08zx - %08zx) %s",
                    static_cast<size_t>(reloc), static_cast<size_t>(sym_addr - reloc),
                    static_cast<size_t>(sym_addr), static_cast<size_t>(reloc), sym_name);
-        *reinterpret_cast<ElfW(Addr)*>(reloc) = sym_addr + addend - reloc;
+        *reinterpret_cast<Elf32_Addr*>(reloc) = sym_addr + addend - reloc;
         break;
 #elif defined(__arm__)
       case R_ARM_ABS32: