diff options
| -rw-r--r-- | lld/ELF/InputFiles.cpp | 6 | ||||
| -rw-r--r-- | lld/ELF/InputFiles.h | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp index 308ff381316..d94b48c2ec5 100644 --- a/lld/ELF/InputFiles.cpp +++ b/lld/ELF/InputFiles.cpp @@ -131,11 +131,11 @@ StringRef elf::ObjectFile<ELFT>::getShtGroupSignature(const Elf_Shdr &Sec) { } template <class ELFT> -ArrayRef<typename elf::ObjectFile<ELFT>::uint32_X> +ArrayRef<typename elf::ObjectFile<ELFT>::Elf_Word> elf::ObjectFile<ELFT>::getShtGroupEntries(const Elf_Shdr &Sec) { const ELFFile<ELFT> &Obj = this->ELFObj; - ArrayRef<uint32_X> Entries = - check(Obj.template getSectionContentsAsArray<uint32_X>(&Sec)); + ArrayRef<Elf_Word> Entries = + check(Obj.template getSectionContentsAsArray<Elf_Word>(&Sec)); if (Entries.empty() || Entries[0] != GRP_COMDAT) fatal("unsupported SHT_GROUP format"); return Entries.slice(1); diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h index 82c06b81ce5..46c35b1d415 100644 --- a/lld/ELF/InputFiles.h +++ b/lld/ELF/InputFiles.h @@ -98,13 +98,8 @@ template <class ELFT> class ObjectFile : public ELFFileBase<ELFT> { typedef typename llvm::object::ELFFile<ELFT>::Elf_Word Elf_Word; typedef typename llvm::object::ELFFile<ELFT>::uintX_t uintX_t; - // uint32 in ELFT's byte order - typedef llvm::support::detail::packed_endian_specific_integral< - uint32_t, ELFT::TargetEndianness, 2> - uint32_X; - StringRef getShtGroupSignature(const Elf_Shdr &Sec); - ArrayRef<uint32_X> getShtGroupEntries(const Elf_Shdr &Sec); + ArrayRef<Elf_Word> getShtGroupEntries(const Elf_Shdr &Sec); public: static bool classof(const InputFile *F) { |
