diff options
Diffstat (limited to 'tools/yaml2obj/yaml2elf.cpp')
| -rw-r--r-- | tools/yaml2obj/yaml2elf.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp index d03986e9c88d5..c98093431a7ef 100644 --- a/tools/yaml2obj/yaml2elf.cpp +++ b/tools/yaml2obj/yaml2elf.cpp @@ -16,7 +16,7 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/MC/StringTableBuilder.h" #include "llvm/Object/ELFObjectFile.h" -#include "llvm/Object/ELFYAML.h" +#include "llvm/ObjectYAML/ELFYAML.h" #include "llvm/Support/ELF.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/YAMLTraits.h" @@ -38,7 +38,7 @@ class ContiguousBlobAccumulator { if (Align == 0) Align = 1; uint64_t CurrentOffset = InitialOffset + OS.tell(); - uint64_t AlignedOffset = RoundUpToAlignment(CurrentOffset, Align); + uint64_t AlignedOffset = alignTo(CurrentOffset, Align); for (; CurrentOffset != AlignedOffset; ++CurrentOffset) OS.write('\0'); return AlignedOffset; // == CurrentOffset; @@ -558,13 +558,7 @@ static bool isLittleEndian(const ELFYAML::Object &Doc) { return Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB); } -int yaml2elf(yaml::Input &YIn, raw_ostream &Out) { - ELFYAML::Object Doc; - YIn >> Doc; - if (YIn.error()) { - errs() << "yaml2obj: Failed to parse YAML file!\n"; - return 1; - } +int yaml2elf(llvm::ELFYAML::Object &Doc, raw_ostream &Out) { using object::ELFType; typedef ELFType<support::little, true> LE64; typedef ELFType<support::big, true> BE64; |