diff options
| author | Sean Silva <silvas@purdue.edu> | 2013-06-17 20:14:59 +0000 |
|---|---|---|
| committer | Sean Silva <silvas@purdue.edu> | 2013-06-17 20:14:59 +0000 |
| commit | 4b548ecb012ce27feff9f58aad27775df679b159 (patch) | |
| tree | d388892dc0f5945a86b4a7cd8f7c2ee540c6265b /tools/yaml2obj | |
| parent | 338d8592b0bd80a58e462caa2fa9a6a69dd2500e (diff) | |
| download | external_llvm-4b548ecb012ce27feff9f58aad27775df679b159.zip external_llvm-4b548ecb012ce27feff9f58aad27775df679b159.tar.gz external_llvm-4b548ecb012ce27feff9f58aad27775df679b159.tar.bz2 | |
[yaml2obj][ELF] Exit with error status on error.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184115 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/yaml2obj')
| -rw-r--r-- | tools/yaml2obj/yaml2elf.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp index 2f4774f..bf1eec6 100644 --- a/tools/yaml2obj/yaml2elf.cpp +++ b/tools/yaml2obj/yaml2elf.cpp @@ -121,7 +121,7 @@ static void zero(T &Obj) { } template <class ELFT> -static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { +static int writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { using namespace llvm::ELF; using namespace llvm::object; typedef typename ELFObjectFile<ELFT>::Elf_Ehdr Elf_Ehdr; @@ -175,7 +175,7 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { if (SN2I.addName(Name, i)) { errs() << "error: Repeated section name: '" << Name << "' at YAML section number " << i << ".\n"; - return; + return 1; } } @@ -205,7 +205,7 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { if (SN2I.lookupSection(Sec.Link, Index)) { errs() << "error: Unknown section referenced: '" << Sec.Link << "' at YAML section number " << i << ".\n"; - return; + return 1; } SHeader.sh_link = Index; } @@ -234,6 +234,7 @@ static void writeELF(raw_ostream &OS, const ELFYAML::Object &Doc) { writeVectorData(OS, SHeaders); OS.write((const char *)&StrTabSHeader, sizeof(StrTabSHeader)); CBA.writeBlobToStream(OS); + return 0; } int yaml2elf(llvm::raw_ostream &Out, llvm::MemoryBuffer *Buf) { @@ -246,15 +247,13 @@ int yaml2elf(llvm::raw_ostream &Out, llvm::MemoryBuffer *Buf) { } if (Doc.Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64)) { if (Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB)) - writeELF<object::ELFType<support::little, 8, true> >(outs(), Doc); + return writeELF<object::ELFType<support::little, 8, true> >(outs(), Doc); else - writeELF<object::ELFType<support::big, 8, true> >(outs(), Doc); + return writeELF<object::ELFType<support::big, 8, true> >(outs(), Doc); } else { if (Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB)) - writeELF<object::ELFType<support::little, 4, false> >(outs(), Doc); + return writeELF<object::ELFType<support::little, 4, false> >(outs(), Doc); else - writeELF<object::ELFType<support::big, 4, false> >(outs(), Doc); + return writeELF<object::ELFType<support::big, 4, false> >(outs(), Doc); } - - return 0; } |