commit 415dc5dd0c2b1c3ce3deb7f7932a6ed02e3bf3d8
author Jordan Rupprecht <rupprecht@google.com> Thu Jan 03 19:09:00 2019 +0000
committer Jordan Rupprecht <rupprecht@google.com> Thu Jan 03 19:09:00 2019 +0000
tree 240958637af7ab9a9441d5c6e04a7366f36698b2
parent e434280f3da761ffb1070fda879970037056fac8

[llvm-objcopy] Fix buildbots on older compilers

llvm-svn: 350343

llvm/tools/llvm-objcopy/ELF/Object.cpp

diff --git a/llvm/tools/llvm-objcopy/ELF/Object.cpp b/llvm/tools/llvm-objcopy/ELF/Object.cpp
index 6a85b95..3d3e029 100644
--- a/llvm/tools/llvm-objcopy/ELF/Object.cpp
+++ b/llvm/tools/llvm-objcopy/ELF/Object.cpp
@@ -87,7 +87,7 @@
   Sec.EntrySize = sizeof(Elf_Sym);
   Sec.Size = Sec.Symbols.size() * Sec.EntrySize;
   // Align to the largest field in Elf_Sym.
-  Sec.Align = sizeof(Elf_Sym::st_size);
+  Sec.Align = ELFT::Is64Bits ? sizeof(Elf_Xword) : sizeof(Elf_Word);
 }
 
 template <class ELFT>
@@ -95,8 +95,7 @@
   Sec.EntrySize = Sec.Type == SHT_REL ? sizeof(Elf_Rel) : sizeof(Elf_Rela);
   Sec.Size = Sec.Relocations.size() * Sec.EntrySize;
   // Align to the largest field in Elf_Rel(a).
-  Sec.Align =
-      Sec.Type == SHT_REL ? sizeof(Elf_Rel::r_info) : sizeof(Elf_Rela::r_info);
+  Sec.Align = ELFT::Is64Bits ? sizeof(Elf_Xword) : sizeof(Elf_Word);
 }
 
 template <class ELFT>