diff --git a/llvm/include/llvm/ObjectYAML/ELFYAML.h b/llvm/include/llvm/ObjectYAML/ELFYAML.h --- a/llvm/include/llvm/ObjectYAML/ELFYAML.h +++ b/llvm/include/llvm/ObjectYAML/ELFYAML.h @@ -77,7 +77,7 @@ ELF_ELFOSABI OSABI; llvm::yaml::Hex8 ABIVersion; ELF_ET Type; - ELF_EM Machine; + Optional Machine; ELF_EF Flags; llvm::yaml::Hex64 Entry; @@ -553,6 +553,8 @@ Ret.push_back(S); return Ret; } + + unsigned getMachine() const; }; } // end namespace ELFYAML diff --git a/llvm/lib/ObjectYAML/ELFEmitter.cpp b/llvm/lib/ObjectYAML/ELFEmitter.cpp --- a/llvm/lib/ObjectYAML/ELFEmitter.cpp +++ b/llvm/lib/ObjectYAML/ELFEmitter.cpp @@ -390,7 +390,12 @@ Header.e_ident[EI_OSABI] = Doc.Header.OSABI; Header.e_ident[EI_ABIVERSION] = Doc.Header.ABIVersion; Header.e_type = Doc.Header.Type; - Header.e_machine = Doc.Header.Machine; + + if (Doc.Header.Machine) + Header.e_machine = *Doc.Header.Machine; + else + Header.e_machine = EM_NONE; + Header.e_version = EV_CURRENT; Header.e_entry = Doc.Header.Entry; Header.e_flags = Doc.Header.Flags; @@ -1137,10 +1142,10 @@ SHeader.sh_info = *Section.Info; } -static bool isMips64EL(const ELFYAML::Object &Doc) { - return Doc.Header.Machine == ELFYAML::ELF_EM(llvm::ELF::EM_MIPS) && - Doc.Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64) && - Doc.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB); +static bool isMips64EL(const ELFYAML::Object &Obj) { + return Obj.getMachine() == llvm::ELF::EM_MIPS && + Obj.Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64) && + Obj.Header.Data == ELFYAML::ELF_ELFDATA(ELF::ELFDATA2LSB); } template diff --git a/llvm/lib/ObjectYAML/ELFYAML.cpp b/llvm/lib/ObjectYAML/ELFYAML.cpp --- a/llvm/lib/ObjectYAML/ELFYAML.cpp +++ b/llvm/lib/ObjectYAML/ELFYAML.cpp @@ -26,6 +26,14 @@ ELFYAML::Chunk::~Chunk() = default; +namespace ELFYAML { +unsigned Object::getMachine() const { + if (Header.Machine) + return *Header.Machine; + return llvm::ELF::EM_NONE; +} +} // namespace ELFYAML + namespace yaml { void ScalarEnumerationTraits::enumeration( @@ -285,7 +293,7 @@ assert(Object && "The IO context is not initialized"); #define BCase(X) IO.bitSetCase(Value, #X, ELF::X) #define BCaseMask(X, M) IO.maskedBitSetCase(Value, #X, ELF::X, ELF::M) - switch (Object->Header.Machine) { + switch (Object->getMachine()) { case ELF::EM_ARM: BCase(EF_ARM_SOFT_FLOAT); BCase(EF_ARM_VFP_FLOAT); @@ -481,7 +489,7 @@ ECase(SHT_GNU_verdef); ECase(SHT_GNU_verneed); ECase(SHT_GNU_versym); - switch (Object->Header.Machine) { + switch (Object->getMachine()) { case ELF::EM_ARM: ECase(SHT_ARM_EXIDX); ECase(SHT_ARM_PREEMPTMAP); @@ -536,7 +544,7 @@ BCase(SHF_GROUP); BCase(SHF_TLS); BCase(SHF_COMPRESSED); - switch (Object->Header.Machine) { + switch (Object->getMachine()) { case ELF::EM_ARM: BCase(SHF_ARM_PURECODE); break; @@ -628,7 +636,7 @@ const auto *Object = static_cast(IO.getContext()); assert(Object && "The IO context is not initialized"); #define ELF_RELOC(X, Y) IO.enumCase(Value, #X, ELF::X); - switch (Object->Header.Machine) { + switch (Object->getMachine()) { case ELF::EM_X86_64: #include "llvm/BinaryFormat/ELFRelocs/x86_64.def" break; @@ -693,7 +701,7 @@ #define STRINGIFY(X) (#X) #define DYNAMIC_TAG(X, Y) IO.enumCase(Value, STRINGIFY(DT_##X), ELF::DT_##X); - switch (Object->Header.Machine) { + switch (Object->getMachine()) { case ELF::EM_AARCH64: #undef AARCH64_DYNAMIC_TAG #define AARCH64_DYNAMIC_TAG(name, value) DYNAMIC_TAG(name, value) @@ -863,7 +871,7 @@ IO.mapOptional("OSABI", FileHdr.OSABI, ELFYAML::ELF_ELFOSABI(0)); IO.mapOptional("ABIVersion", FileHdr.ABIVersion, Hex8(0)); IO.mapRequired("Type", FileHdr.Type); - IO.mapRequired("Machine", FileHdr.Machine); + IO.mapOptional("Machine", FileHdr.Machine); IO.mapOptional("Flags", FileHdr.Flags, ELFYAML::ELF_EF(0)); IO.mapOptional("Entry", FileHdr.Entry, Hex64(0)); @@ -936,7 +944,7 @@ std::vector Ret; const auto *Object = static_cast(YamlIO.getContext()); for (std::pair &P : - getFlags(Object->Header.Machine).takeVector()) { + getFlags(Object->getMachine()).takeVector()) { uint8_t FlagValue = P.second; if ((*Original & FlagValue) != FlagValue) continue; @@ -955,7 +963,7 @@ uint8_t toValue(StringRef Name) { const auto *Object = static_cast(YamlIO.getContext()); - MapVector Flags = getFlags(Object->Header.Machine); + MapVector Flags = getFlags(Object->getMachine()); auto It = Flags.find(Name); if (It != Flags.end()) @@ -1662,7 +1670,7 @@ IO.mapOptional("Offset", Rel.Offset, (Hex64)0); IO.mapOptional("Symbol", Rel.Symbol); - if (Object->Header.Machine == ELFYAML::ELF_EM(ELF::EM_MIPS) && + if (Object->getMachine() == ELFYAML::ELF_EM(ELF::EM_MIPS) && Object->Header.Class == ELFYAML::ELF_ELFCLASS(ELF::ELFCLASS64)) { MappingNormalization Key( IO, Rel.Type); diff --git a/llvm/test/tools/llvm-readobj/ELF/addrsig.test b/llvm/test/tools/llvm-readobj/ELF/addrsig.test --- a/llvm/test/tools/llvm-readobj/ELF/addrsig.test +++ b/llvm/test/tools/llvm-readobj/ELF/addrsig.test @@ -13,10 +13,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -41,10 +40,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -65,10 +63,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG diff --git a/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test b/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test --- a/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test +++ b/llvm/test/tools/llvm-readobj/ELF/broken-dynamic-reloc.test @@ -58,10 +58,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .relx.dyn Type: SHT_[[RELTYPE]] diff --git a/llvm/test/tools/llvm-readobj/ELF/broken-dynsym-link.test b/llvm/test/tools/llvm-readobj/ELF/broken-dynsym-link.test --- a/llvm/test/tools/llvm-readobj/ELF/broken-dynsym-link.test +++ b/llvm/test/tools/llvm-readobj/ELF/broken-dynsym-link.test @@ -25,10 +25,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM diff --git a/llvm/test/tools/llvm-readobj/ELF/call-graph-profile.test b/llvm/test/tools/llvm-readobj/ELF/call-graph-profile.test --- a/llvm/test/tools/llvm-readobj/ELF/call-graph-profile.test +++ b/llvm/test/tools/llvm-readobj/ELF/call-graph-profile.test @@ -23,10 +23,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -78,10 +77,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE diff --git a/llvm/test/tools/llvm-readobj/ELF/check-output-order.test b/llvm/test/tools/llvm-readobj/ELF/check-output-order.test --- a/llvm/test/tools/llvm-readobj/ELF/check-output-order.test +++ b/llvm/test/tools/llvm-readobj/ELF/check-output-order.test @@ -29,10 +29,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/dependent-libraries.test b/llvm/test/tools/llvm-readobj/ELF/dependent-libraries.test --- a/llvm/test/tools/llvm-readobj/ELF/dependent-libraries.test +++ b/llvm/test/tools/llvm-readobj/ELF/dependent-libraries.test @@ -23,10 +23,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .deplibs Type: SHT_LLVM_DEPENDENT_LIBRARIES @@ -78,10 +77,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: ## Case 1: test we report a warning for a non-null-terminated section. - Name: .deplibs.nonul diff --git a/llvm/test/tools/llvm-readobj/ELF/dyn-symbols-size-from-hash-table.test b/llvm/test/tools/llvm-readobj/ELF/dyn-symbols-size-from-hash-table.test --- a/llvm/test/tools/llvm-readobj/ELF/dyn-symbols-size-from-hash-table.test +++ b/llvm/test/tools/llvm-readobj/ELF/dyn-symbols-size-from-hash-table.test @@ -72,10 +72,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .text Type: SHT_PROGBITS @@ -233,10 +232,9 @@ ## to dump. --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test b/llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test --- a/llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test +++ b/llvm/test/tools/llvm-readobj/ELF/dyn-symbols.test @@ -45,10 +45,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -122,10 +121,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -161,10 +159,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_PROGBITS @@ -190,10 +187,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -222,10 +218,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -294,10 +289,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -366,17 +360,15 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -384,10 +376,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN DynamicSymbols: [] ## Case 9: Check what we print when: @@ -422,10 +413,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -433,10 +423,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -457,10 +446,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -521,10 +509,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynstr Type: SHT_STRTAB @@ -566,10 +553,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-empty.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-empty.test --- a/llvm/test/tools/llvm-readobj/ELF/dynamic-empty.test +++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-empty.test @@ -10,10 +10,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-malformed.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-malformed.test --- a/llvm/test/tools/llvm-readobj/ELF/dynamic-malformed.test +++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-malformed.test @@ -25,10 +25,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -63,10 +62,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -141,10 +139,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynstr Type: SHT_STRTAB @@ -209,10 +206,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -256,10 +252,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -325,10 +320,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynstr Type: SHT_STRTAB diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-not-in-pt-dynamic.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-not-in-pt-dynamic.test --- a/llvm/test/tools/llvm-readobj/ELF/dynamic-not-in-pt-dynamic.test +++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-not-in-pt-dynamic.test @@ -29,10 +29,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -84,10 +83,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -130,10 +128,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc.test --- a/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc.test +++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-reloc.test @@ -11,10 +11,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ## Check that we dump all possbile dynamic relocation sections. # RUN: yaml2obj --docnum=2 %s -o %t2.1 diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-table-dtnull.s b/llvm/test/tools/llvm-readobj/ELF/dynamic-table-dtnull.s --- a/llvm/test/tools/llvm-readobj/ELF/dynamic-table-dtnull.s +++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-table-dtnull.s @@ -15,10 +15,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -54,10 +53,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test b/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test --- a/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test +++ b/llvm/test/tools/llvm-readobj/ELF/dynamic-tags.test @@ -143,7 +143,6 @@ Class: ELFCLASS[[BITS=64]] Data: ELFDATA2LSB Type: ET_EXEC - Machine: EM_NONE EPhEntSize: [[PHENTSIZE=]] Sections: - Name: .dynstr @@ -460,10 +459,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS=64]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_NONE + Class: ELFCLASS[[BITS=64]] + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/file-header-abi-version.test b/llvm/test/tools/llvm-readobj/ELF/file-header-abi-version.test --- a/llvm/test/tools/llvm-readobj/ELF/file-header-abi-version.test +++ b/llvm/test/tools/llvm-readobj/ELF/file-header-abi-version.test @@ -29,5 +29,4 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 ABIVersion: [[ABIVERSION]] diff --git a/llvm/test/tools/llvm-readobj/ELF/file-header-os-abi.test b/llvm/test/tools/llvm-readobj/ELF/file-header-os-abi.test --- a/llvm/test/tools/llvm-readobj/ELF/file-header-os-abi.test +++ b/llvm/test/tools/llvm-readobj/ELF/file-header-os-abi.test @@ -10,11 +10,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: [[OSABI]] + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: [[OSABI]] ## EI_OSABI is set to ELFOSABI_HPUX. # RUN: yaml2obj %s -DOSABI=ELFOSABI_HPUX -o %t.osabi.hpux diff --git a/llvm/test/tools/llvm-readobj/ELF/file-name.test b/llvm/test/tools/llvm-readobj/ELF/file-name.test --- a/llvm/test/tools/llvm-readobj/ELF/file-name.test +++ b/llvm/test/tools/llvm-readobj/ELF/file-name.test @@ -36,7 +36,6 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL diff --git a/llvm/test/tools/llvm-readobj/ELF/file-types.test b/llvm/test/tools/llvm-readobj/ELF/file-types.test --- a/llvm/test/tools/llvm-readobj/ELF/file-types.test +++ b/llvm/test/tools/llvm-readobj/ELF/file-types.test @@ -12,10 +12,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: [[TYPE]] - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: [[TYPE]] # RUN: yaml2obj %s -DTYPE=ET_REL -o %t2 # RUN: llvm-readobj -h %t2 | FileCheck %s --match-full-lines --check-prefix LLVM-REL diff --git a/llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test b/llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test --- a/llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test +++ b/llvm/test/tools/llvm-readobj/ELF/gnu-note-size.test @@ -23,10 +23,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note.ABI-tag Type: SHT_NOTE diff --git a/llvm/test/tools/llvm-readobj/ELF/gnu-notes.test b/llvm/test/tools/llvm-readobj/ELF/gnu-notes.test --- a/llvm/test/tools/llvm-readobj/ELF/gnu-notes.test +++ b/llvm/test/tools/llvm-readobj/ELF/gnu-notes.test @@ -86,7 +86,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_EXEC - Machine: EM_X86_64 EPhEntSize: [[PHENTSIZE=]] EShNum: [[SHNUM=]] Sections: @@ -121,10 +120,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note Type: SHT_NOTE @@ -142,10 +140,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note Type: SHT_NOTE @@ -163,10 +160,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE ProgramHeaders: - Type: PT_NOTE Offset: 0xffff0000 @@ -182,10 +178,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note Type: SHT_NOTE diff --git a/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping-no-phdrs.test b/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping-no-phdrs.test --- a/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping-no-phdrs.test +++ b/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping-no-phdrs.test @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping.test b/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping.test --- a/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping.test +++ b/llvm/test/tools/llvm-readobj/ELF/gnu-section-mapping.test @@ -17,7 +17,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_EXEC - Machine: EM_X86_64 EPhEntSize: [[PHENTSIZE=]] Sections: - Name: .foo.begin diff --git a/llvm/test/tools/llvm-readobj/ELF/gnuhash.test b/llvm/test/tools/llvm-readobj/ELF/gnuhash.test --- a/llvm/test/tools/llvm-readobj/ELF/gnuhash.test +++ b/llvm/test/tools/llvm-readobj/ELF/gnuhash.test @@ -1,7 +1,7 @@ ## Check how the GNU Hash section is dumped with --gnu-hash-table. -# RUN: yaml2obj --docnum=1 -DBITS=64 -DMACHINE=EM_X86_64 %s -o %t.x64 -# RUN: yaml2obj --docnum=1 -DBITS=32 -DMACHINE=EM_386 %s -o %t.x32 +# RUN: yaml2obj --docnum=1 -DBITS=64 %s -o %t.x64 +# RUN: yaml2obj --docnum=1 -DBITS=32 %s -o %t.x32 # RUN: llvm-readobj --gnu-hash-table %t.x64 | FileCheck %s # RUN: llvm-readelf --gnu-hash-table %t.x64 | FileCheck %s @@ -21,10 +21,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_DYN - Machine: [[MACHINE]] + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -82,10 +81,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -132,10 +130,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -186,10 +183,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -257,10 +253,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH diff --git a/llvm/test/tools/llvm-readobj/ELF/groups.test b/llvm/test/tools/llvm-readobj/ELF/groups.test --- a/llvm/test/tools/llvm-readobj/ELF/groups.test +++ b/llvm/test/tools/llvm-readobj/ELF/groups.test @@ -42,10 +42,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP diff --git a/llvm/test/tools/llvm-readobj/ELF/hash-histogram.test b/llvm/test/tools/llvm-readobj/ELF/hash-histogram.test --- a/llvm/test/tools/llvm-readobj/ELF/hash-histogram.test +++ b/llvm/test/tools/llvm-readobj/ELF/hash-histogram.test @@ -28,10 +28,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -84,10 +83,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .hash Type: SHT_HASH @@ -123,10 +121,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -181,10 +178,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -226,10 +222,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -283,10 +278,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -349,10 +343,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -396,10 +389,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH diff --git a/llvm/test/tools/llvm-readobj/ELF/hash-symbols.test b/llvm/test/tools/llvm-readobj/ELF/hash-symbols.test --- a/llvm/test/tools/llvm-readobj/ELF/hash-symbols.test +++ b/llvm/test/tools/llvm-readobj/ELF/hash-symbols.test @@ -43,10 +43,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -124,10 +123,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -185,10 +183,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -249,10 +246,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynstr Type: SHT_STRTAB @@ -321,10 +317,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -358,10 +353,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -422,10 +416,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -467,10 +460,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -525,10 +517,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -596,10 +587,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH diff --git a/llvm/test/tools/llvm-readobj/ELF/hash-table.test b/llvm/test/tools/llvm-readobj/ELF/hash-table.test --- a/llvm/test/tools/llvm-readobj/ELF/hash-table.test +++ b/llvm/test/tools/llvm-readobj/ELF/hash-table.test @@ -58,14 +58,13 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ## We simulate no section header table by ## overriding the ELF header properties. - EShOff: 0x0 - EShNum: 0x0 + EShOff: 0x0 + EShNum: 0x0 Sections: - Name: .hash Type: SHT_HASH @@ -103,10 +102,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -197,10 +195,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH diff --git a/llvm/test/tools/llvm-readobj/ELF/headers.test b/llvm/test/tools/llvm-readobj/ELF/headers.test --- a/llvm/test/tools/llvm-readobj/ELF/headers.test +++ b/llvm/test/tools/llvm-readobj/ELF/headers.test @@ -37,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_NONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/hex-dump.test b/llvm/test/tools/llvm-readobj/ELF/hex-dump.test --- a/llvm/test/tools/llvm-readobj/ELF/hex-dump.test +++ b/llvm/test/tools/llvm-readobj/ELF/hex-dump.test @@ -44,10 +44,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN ## Test that llvm-readelf emits the correct number of spaces between the hex data ## and its ascii representation. @@ -81,10 +80,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .sec Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/hidden-versym.test b/llvm/test/tools/llvm-readobj/ELF/hidden-versym.test --- a/llvm/test/tools/llvm-readobj/ELF/hidden-versym.test +++ b/llvm/test/tools/llvm-readobj/ELF/hidden-versym.test @@ -7,10 +7,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/test/tools/llvm-readobj/ELF/invalid-shstrndx.test b/llvm/test/tools/llvm-readobj/ELF/invalid-shstrndx.test --- a/llvm/test/tools/llvm-readobj/ELF/invalid-shstrndx.test +++ b/llvm/test/tools/llvm-readobj/ELF/invalid-shstrndx.test @@ -47,5 +47,4 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 EShStrNdx: 0xFF diff --git a/llvm/test/tools/llvm-readobj/ELF/linker-options.test b/llvm/test/tools/llvm-readobj/ELF/linker-options.test --- a/llvm/test/tools/llvm-readobj/ELF/linker-options.test +++ b/llvm/test/tools/llvm-readobj/ELF/linker-options.test @@ -15,10 +15,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: ## Case 1: a correct case. - Name: .linker-options.valid1 diff --git a/llvm/test/tools/llvm-readobj/ELF/malformed-pt-dynamic.test b/llvm/test/tools/llvm-readobj/ELF/malformed-pt-dynamic.test --- a/llvm/test/tools/llvm-readobj/ELF/malformed-pt-dynamic.test +++ b/llvm/test/tools/llvm-readobj/ELF/malformed-pt-dynamic.test @@ -53,10 +53,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_NONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/many-sections.s b/llvm/test/tools/llvm-readobj/ELF/many-sections.s --- a/llvm/test/tools/llvm-readobj/ELF/many-sections.s +++ b/llvm/test/tools/llvm-readobj/ELF/many-sections.s @@ -21,7 +21,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 EShNum: 0 EShStrNdx: 0xffff ## SHN_XINDEX Sections: @@ -59,7 +58,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 EShOff: 0 EShNum: 0 EShStrNdx: 0xffff ## SHN_XINDEX diff --git a/llvm/test/tools/llvm-readobj/ELF/needed-libs.test b/llvm/test/tools/llvm-readobj/ELF/needed-libs.test --- a/llvm/test/tools/llvm-readobj/ELF/needed-libs.test +++ b/llvm/test/tools/llvm-readobj/ELF/needed-libs.test @@ -21,10 +21,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynstr Type: SHT_STRTAB @@ -74,10 +73,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynstr Type: SHT_STRTAB diff --git a/llvm/test/tools/llvm-readobj/ELF/no-phdrs.test b/llvm/test/tools/llvm-readobj/ELF/no-phdrs.test --- a/llvm/test/tools/llvm-readobj/ELF/no-phdrs.test +++ b/llvm/test/tools/llvm-readobj/ELF/no-phdrs.test @@ -18,7 +18,6 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL diff --git a/llvm/test/tools/llvm-readobj/ELF/no-relocs.test b/llvm/test/tools/llvm-readobj/ELF/no-relocs.test --- a/llvm/test/tools/llvm-readobj/ELF/no-relocs.test +++ b/llvm/test/tools/llvm-readobj/ELF/no-relocs.test @@ -31,10 +31,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/no-shdrs.test b/llvm/test/tools/llvm-readobj/ELF/no-shdrs.test --- a/llvm/test/tools/llvm-readobj/ELF/no-shdrs.test +++ b/llvm/test/tools/llvm-readobj/ELF/no-shdrs.test @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/non-dynamic-in-pt-dynamic.test b/llvm/test/tools/llvm-readobj/ELF/non-dynamic-in-pt-dynamic.test --- a/llvm/test/tools/llvm-readobj/ELF/non-dynamic-in-pt-dynamic.test +++ b/llvm/test/tools/llvm-readobj/ELF/non-dynamic-in-pt-dynamic.test @@ -28,10 +28,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -82,10 +81,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -138,10 +136,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test b/llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test --- a/llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test +++ b/llvm/test/tools/llvm-readobj/ELF/note-amdgpu.test @@ -76,10 +76,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE diff --git a/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile-bad.test b/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile-bad.test --- a/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile-bad.test +++ b/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile-bad.test @@ -24,10 +24,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note.foo Type: SHT_NOTE @@ -59,10 +58,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note.foo Type: SHT_NOTE @@ -94,10 +92,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note.foo Type: SHT_NOTE @@ -132,10 +129,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note.foo Type: SHT_NOTE diff --git a/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile.test b/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile.test --- a/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile.test +++ b/llvm/test/tools/llvm-readobj/ELF/note-core-ntfile.test @@ -37,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note.foo Type: SHT_NOTE diff --git a/llvm/test/tools/llvm-readobj/ELF/note-core.test b/llvm/test/tools/llvm-readobj/ELF/note-core.test --- a/llvm/test/tools/llvm-readobj/ELF/note-core.test +++ b/llvm/test/tools/llvm-readobj/ELF/note-core.test @@ -6,10 +6,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_CORE - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_CORE Sections: - Name: .note.foo Type: SHT_NOTE diff --git a/llvm/test/tools/llvm-readobj/ELF/program-headers.test b/llvm/test/tools/llvm-readobj/ELF/program-headers.test --- a/llvm/test/tools/llvm-readobj/ELF/program-headers.test +++ b/llvm/test/tools/llvm-readobj/ELF/program-headers.test @@ -650,10 +650,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC ProgramHeaders: ## Case 1: the offset points to the first additional byte. - Type: PT_INTERP @@ -697,7 +696,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_EXEC - Machine: EM_X86_64 EPhEntSize: [[PHENTSIZE=]] EPhOff: [[PHOFF=]] Sections: diff --git a/llvm/test/tools/llvm-readobj/ELF/section-flags-os-proc.test b/llvm/test/tools/llvm-readobj/ELF/section-flags-os-proc.test --- a/llvm/test/tools/llvm-readobj/ELF/section-flags-os-proc.test +++ b/llvm/test/tools/llvm-readobj/ELF/section-flags-os-proc.test @@ -86,10 +86,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_NONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .os.flags.low Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/section-flags.test b/llvm/test/tools/llvm-readobj/ELF/section-flags.test --- a/llvm/test/tools/llvm-readobj/ELF/section-flags.test +++ b/llvm/test/tools/llvm-readobj/ELF/section-flags.test @@ -122,11 +122,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - Flags: [] + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + Flags: [] Sections: - Name: allflags Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/section-symbols.test b/llvm/test/tools/llvm-readobj/ELF/section-symbols.test --- a/llvm/test/tools/llvm-readobj/ELF/section-symbols.test +++ b/llvm/test/tools/llvm-readobj/ELF/section-symbols.test @@ -27,10 +27,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -74,10 +73,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Symbols: # Section symbol via SHT_SYMTAB_SHNDX when SHT_SYMTAB_SHNDX is missing. - Name: "" diff --git a/llvm/test/tools/llvm-readobj/ELF/section-types.test b/llvm/test/tools/llvm-readobj/ELF/section-types.test --- a/llvm/test/tools/llvm-readobj/ELF/section-types.test +++ b/llvm/test/tools/llvm-readobj/ELF/section-types.test @@ -138,10 +138,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: progbits Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/sections-no-section-header-string-table.test b/llvm/test/tools/llvm-readobj/ELF/sections-no-section-header-string-table.test --- a/llvm/test/tools/llvm-readobj/ELF/sections-no-section-header-string-table.test +++ b/llvm/test/tools/llvm-readobj/ELF/sections-no-section-header-string-table.test @@ -95,7 +95,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_DYN - Machine: EM_X86_64 EShStrNdx: 0 Sections: - Name: .foo diff --git a/llvm/test/tools/llvm-readobj/ELF/sections.test b/llvm/test/tools/llvm-readobj/ELF/sections.test --- a/llvm/test/tools/llvm-readobj/ELF/sections.test +++ b/llvm/test/tools/llvm-readobj/ELF/sections.test @@ -89,10 +89,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS=64]] - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_NONE + Class: ELFCLASS[[BITS=64]] + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/stack-sizes.test b/llvm/test/tools/llvm-readobj/ELF/stack-sizes.test --- a/llvm/test/tools/llvm-readobj/ELF/stack-sizes.test +++ b/llvm/test/tools/llvm-readobj/ELF/stack-sizes.test @@ -125,10 +125,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -284,10 +283,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -315,10 +313,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -409,10 +406,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS @@ -631,10 +627,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -691,10 +686,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2MSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2MSB + Type: ET_REL Sections: - Name: .rela.stack_sizes Type: SHT_RELA diff --git a/llvm/test/tools/llvm-readobj/ELF/stackmap.test b/llvm/test/tools/llvm-readobj/ELF/stackmap.test --- a/llvm/test/tools/llvm-readobj/ELF/stackmap.test +++ b/llvm/test/tools/llvm-readobj/ELF/stackmap.test @@ -17,10 +17,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: [[NAME=.llvm_stackmaps]] Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/string-dump.test b/llvm/test/tools/llvm-readobj/ELF/string-dump.test --- a/llvm/test/tools/llvm-readobj/ELF/string-dump.test +++ b/llvm/test/tools/llvm-readobj/ELF/string-dump.test @@ -62,10 +62,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .strings Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/symbol-64bit.test b/llvm/test/tools/llvm-readobj/ELF/symbol-64bit.test --- a/llvm/test/tools/llvm-readobj/ELF/symbol-64bit.test +++ b/llvm/test/tools/llvm-readobj/ELF/symbol-64bit.test @@ -13,10 +13,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: a_sym Value: 0xfedcba9876543210 diff --git a/llvm/test/tools/llvm-readobj/ELF/symbol-binding.test b/llvm/test/tools/llvm-readobj/ELF/symbol-binding.test --- a/llvm/test/tools/llvm-readobj/ELF/symbol-binding.test +++ b/llvm/test/tools/llvm-readobj/ELF/symbol-binding.test @@ -32,10 +32,9 @@ # so use a custom dynamic symbol table section instead. --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .dynstr Type: SHT_STRTAB diff --git a/llvm/test/tools/llvm-readobj/ELF/symbol-shndx.test b/llvm/test/tools/llvm-readobj/ELF/symbol-shndx.test --- a/llvm/test/tools/llvm-readobj/ELF/symbol-shndx.test +++ b/llvm/test/tools/llvm-readobj/ELF/symbol-shndx.test @@ -46,10 +46,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS @@ -127,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab_shndx Type: SHT_SYMTAB_SHNDX @@ -176,10 +174,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: no_shndx Index: SHN_XINDEX diff --git a/llvm/test/tools/llvm-readobj/ELF/symbol-types.test b/llvm/test/tools/llvm-readobj/ELF/symbol-types.test --- a/llvm/test/tools/llvm-readobj/ELF/symbol-types.test +++ b/llvm/test/tools/llvm-readobj/ELF/symbol-types.test @@ -61,10 +61,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/llvm-readobj/ELF/symbol-visibility.test b/llvm/test/tools/llvm-readobj/ELF/symbol-visibility.test --- a/llvm/test/tools/llvm-readobj/ELF/symbol-visibility.test +++ b/llvm/test/tools/llvm-readobj/ELF/symbol-visibility.test @@ -32,10 +32,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: default Other: [ STV_DEFAULT ] @@ -70,10 +69,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: default Other: [ STV_DEFAULT ] diff --git a/llvm/test/tools/llvm-readobj/ELF/symbols.test b/llvm/test/tools/llvm-readobj/ELF/symbols.test --- a/llvm/test/tools/llvm-readobj/ELF/symbols.test +++ b/llvm/test/tools/llvm-readobj/ELF/symbols.test @@ -115,10 +115,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: [[TYPE]] - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: [[TYPE]] Symbols: - Name: foo Value: 0x1 @@ -170,7 +169,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 EShStrNdx: [[SHSTRTAB=2]] Sections: - Name: .symtab diff --git a/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test b/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test --- a/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test +++ b/llvm/test/tools/llvm-readobj/ELF/thin-archive-paths.test @@ -34,7 +34,6 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN diff --git a/llvm/test/tools/llvm-readobj/ELF/types.test b/llvm/test/tools/llvm-readobj/ELF/types.test --- a/llvm/test/tools/llvm-readobj/ELF/types.test +++ b/llvm/test/tools/llvm-readobj/ELF/types.test @@ -8,10 +8,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: [[TYPE]] - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: [[TYPE]] # RUN: yaml2obj %s -DTYPE=ET_REL -o %t.rel # RUN: llvm-readobj --file-headers %t.rel | FileCheck %s --check-prefix=LLVM-REL diff --git a/llvm/test/tools/llvm-readobj/ELF/unwind.test b/llvm/test/tools/llvm-readobj/ELF/unwind.test --- a/llvm/test/tools/llvm-readobj/ELF/unwind.test +++ b/llvm/test/tools/llvm-readobj/ELF/unwind.test @@ -291,10 +291,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .eh_frame Type: SHT_PROGBITS @@ -323,10 +322,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_NONE + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_EXEC ProgramHeaders: - Type: PT_GNU_EH_FRAME MemSize: [[SIZE]] diff --git a/llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test b/llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test --- a/llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test +++ b/llvm/test/tools/llvm-readobj/ELF/verdef-invalid.test @@ -14,10 +14,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -43,10 +42,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -68,10 +66,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -99,10 +96,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -144,10 +140,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -175,10 +170,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Size: 0x1 @@ -206,10 +200,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -232,10 +225,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -274,10 +266,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/test/tools/llvm-readobj/ELF/verneed-flags.yaml b/llvm/test/tools/llvm-readobj/ELF/verneed-flags.yaml --- a/llvm/test/tools/llvm-readobj/ELF/verneed-flags.yaml +++ b/llvm/test/tools/llvm-readobj/ELF/verneed-flags.yaml @@ -78,11 +78,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 - Entry: 0x0000000000201000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Entry: 0x0000000000201000 Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed diff --git a/llvm/test/tools/llvm-readobj/ELF/verneed-invalid.test b/llvm/test/tools/llvm-readobj/ELF/verneed-invalid.test --- a/llvm/test/tools/llvm-readobj/ELF/verneed-invalid.test +++ b/llvm/test/tools/llvm-readobj/ELF/verneed-invalid.test @@ -47,10 +47,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -124,10 +123,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -173,10 +171,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -237,10 +234,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .mystrtab Type: SHT_STRTAB @@ -293,10 +289,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .mystrtab Type: SHT_STRTAB @@ -350,10 +345,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -381,10 +375,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -407,10 +400,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -439,10 +431,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Type: Fill Size: 0x1 @@ -473,10 +464,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -505,10 +495,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -530,10 +519,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -580,10 +568,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/test/tools/llvm-readobj/ELF/versioninfo.test b/llvm/test/tools/llvm-readobj/ELF/versioninfo.test --- a/llvm/test/tools/llvm-readobj/ELF/versioninfo.test +++ b/llvm/test/tools/llvm-readobj/ELF/versioninfo.test @@ -8,11 +8,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - OSABI: ELFOSABI_FREEBSD - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + OSABI: ELFOSABI_FREEBSD + Type: ET_DYN Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/test/tools/llvm-readobj/ELF/versym-invalid.test b/llvm/test/tools/llvm-readobj/ELF/versym-invalid.test --- a/llvm/test/tools/llvm-readobj/ELF/versym-invalid.test +++ b/llvm/test/tools/llvm-readobj/ELF/versym-invalid.test @@ -16,10 +16,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -61,10 +60,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -90,10 +88,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -142,10 +139,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -171,10 +167,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -204,10 +199,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -252,10 +246,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/test/tools/llvm-readobj/ELF/wrong-shstrtab-type.test b/llvm/test/tools/llvm-readobj/ELF/wrong-shstrtab-type.test --- a/llvm/test/tools/llvm-readobj/ELF/wrong-shstrtab-type.test +++ b/llvm/test/tools/llvm-readobj/ELF/wrong-shstrtab-type.test @@ -36,10 +36,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .shstrtab Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml --- a/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml +++ b/llvm/test/tools/obj2yaml/ELF/DWARF/debug-aranges.yaml @@ -48,10 +48,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2[[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2[[ENDIAN]] + Type: ET_EXEC DWARF: debug_aranges: - Version: 2 @@ -99,10 +98,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: [[TYPE=SHT_PROGBITS]] @@ -138,10 +136,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS=64]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS[[BITS=64]] + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: - Version: 2 @@ -169,10 +166,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: - Length: 0x1234 @@ -189,10 +185,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: [] diff --git a/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml b/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/call-graph-profile-section.yaml @@ -27,10 +27,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2[[ENCODE]] - Type: ET_DYN - Machine: EM_NONE + Class: ELFCLASS[[BITS]] + Data: ELFDATA2[[ENCODE]] + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -55,7 +54,7 @@ # INVALID-NEXT: Class: ELFCLASS32 # INVALID-NEXT: Data: ELFDATA2MSB # INVALID-NEXT: Type: ET_DYN -# INVALID-NEXT: Machine: EM_386 +# INVALID-NEXT: Machine: EM_NONE # INVALID-NEXT: Sections: # INVALID-NEXT: - Name: .empty # INVALID-NEXT: Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -127,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2MSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2MSB + Type: ET_DYN Sections: ## Case 1: Content is empty. - Name: .empty diff --git a/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml b/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml --- a/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml +++ b/llvm/test/tools/obj2yaml/ELF/duplicate-symbol-and-section-names.yaml @@ -27,7 +27,7 @@ # CASE1-NEXT: Class: ELFCLASS64 # CASE1-NEXT: Data: ELFDATA2LSB # CASE1-NEXT: Type: ET_REL -# CASE1-NEXT: Machine: EM_X86_64 +# CASE1-NEXT: Machine: EM_NONE # CASE1-NEXT: Sections: # CASE1-NEXT: - Name: .foo # CASE1-NEXT: Type: SHT_PROGBITS @@ -52,10 +52,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -132,10 +131,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: - Name: foo Binding: STB_GLOBAL diff --git a/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml b/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/dynamic-section.yaml @@ -126,10 +126,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/obj2yaml/ELF/entsize.yaml b/llvm/test/tools/obj2yaml/ELF/entsize.yaml --- a/llvm/test/tools/obj2yaml/ELF/entsize.yaml +++ b/llvm/test/tools/obj2yaml/ELF/entsize.yaml @@ -10,10 +10,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .rodata.cst4 Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml b/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/gnu-hash-section.yaml @@ -18,10 +18,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -72,10 +71,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: ## Case 1: Content is less than 16 bytes. - Name: .gnu.hash.tooshort diff --git a/llvm/test/tools/obj2yaml/ELF/gnu-unique-symbols.yaml b/llvm/test/tools/obj2yaml/ELF/gnu-unique-symbols.yaml --- a/llvm/test/tools/obj2yaml/ELF/gnu-unique-symbols.yaml +++ b/llvm/test/tools/obj2yaml/ELF/gnu-unique-symbols.yaml @@ -9,7 +9,7 @@ # CHECK-NEXT: Data: ELFDATA2LSB # CHECK-NEXT: OSABI: ELFOSABI_GNU # CHECK-NEXT: Type: ET_REL -# CHECK-NEXT: Machine: EM_X86_64 +# CHECK-NEXT: Machine: EM_NONE # CHECK-NEXT: Symbols: # CHECK-NEXT: - Name: foo # CHECK-NEXT: Type: STT_OBJECT @@ -18,11 +18,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - OSABI: ELFOSABI_GNU - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + OSABI: ELFOSABI_GNU + Type: ET_REL Symbols: - Name: foo Type: STT_OBJECT diff --git a/llvm/test/tools/obj2yaml/ELF/hash-section.yaml b/llvm/test/tools/obj2yaml/ELF/hash-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/hash-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/hash-section.yaml @@ -18,10 +18,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: ## Case 1: A non-empty hash table: nbucket == 1, nchain == 2. - Name: .hash1 @@ -53,10 +52,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: ## Case 1: section has no data. - Name: .empty_hash diff --git a/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml b/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml --- a/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml +++ b/llvm/test/tools/obj2yaml/ELF/implicit-sections-order.yaml @@ -37,7 +37,7 @@ # OUTPUT-NEXT: Class: ELFCLASS64 # OUTPUT-NEXT: Data: ELFDATA2LSB # OUTPUT-NEXT: Type: ET_DYN -# OUTPUT-NEXT: Machine: EM_X86_64 +# OUTPUT-NEXT: Machine: EM_NONE # OUTPUT-NEXT: Sections: # OUTPUT-NEXT: - Name: .foo.1 # OUTPUT-NEXT: Type: SHT_PROGBITS @@ -69,10 +69,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo.1 Type: SHT_PROGBITS @@ -128,7 +127,7 @@ # OUTPUT2-NEXT: Class: ELFCLASS64 # OUTPUT2-NEXT: Data: ELFDATA2LSB # OUTPUT2-NEXT: Type: ET_DYN -# OUTPUT2-NEXT: Machine: EM_X86_64 +# OUTPUT2-NEXT: Machine: EM_NONE # OUTPUT2-NEXT: Sections: # OUTPUT2-NEXT: - Name: .foo.1 # OUTPUT2-NEXT: Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/invalid-section-name.yaml b/llvm/test/tools/obj2yaml/ELF/invalid-section-name.yaml --- a/llvm/test/tools/obj2yaml/ELF/invalid-section-name.yaml +++ b/llvm/test/tools/obj2yaml/ELF/invalid-section-name.yaml @@ -11,7 +11,7 @@ # CHECK-NEXT: Class: ELFCLASS64 # CHECK-NEXT: Data: ELFDATA2LSB # CHECK-NEXT: Type: ET_REL -# CHECK-NEXT: Machine: EM_X86_64 +# CHECK-NEXT: Machine: EM_NONE # CHECK-NEXT: Sections: # CHECK-NEXT: - Name: "{{.*}}" # CHECK-NEXT: Type: SHT_PROGBITS @@ -19,10 +19,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/linker-options.yaml b/llvm/test/tools/obj2yaml/ELF/linker-options.yaml --- a/llvm/test/tools/obj2yaml/ELF/linker-options.yaml +++ b/llvm/test/tools/obj2yaml/ELF/linker-options.yaml @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .linker-options-valid1 Type: SHT_LLVM_LINKER_OPTIONS @@ -49,10 +48,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: ## 1) Empty content. - Name: .linker-options-empty diff --git a/llvm/test/tools/obj2yaml/ELF/llvm-addrsig-section.yaml b/llvm/test/tools/obj2yaml/ELF/llvm-addrsig-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/llvm-addrsig-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/llvm-addrsig-section.yaml @@ -17,10 +17,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -50,10 +49,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -70,10 +68,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG diff --git a/llvm/test/tools/obj2yaml/ELF/llvm-deplibs-section.yaml b/llvm/test/tools/obj2yaml/ELF/llvm-deplibs-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/llvm-deplibs-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/llvm-deplibs-section.yaml @@ -19,10 +19,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: ## Case 1: test we use "Libraries" when dumping a valid section with a null-terminated string. - Name: .deplibs.single diff --git a/llvm/test/tools/obj2yaml/ELF/no-symtab.yaml b/llvm/test/tools/obj2yaml/ELF/no-symtab.yaml --- a/llvm/test/tools/obj2yaml/ELF/no-symtab.yaml +++ b/llvm/test/tools/obj2yaml/ELF/no-symtab.yaml @@ -9,15 +9,14 @@ # NOSYMTAB-NEXT: Class: ELFCLASS64 # NOSYMTAB-NEXT: Data: ELFDATA2LSB # NOSYMTAB-NEXT: Type: ET_DYN -# NOSYMTAB-NEXT: Machine: EM_X86_64 +# NOSYMTAB-NEXT: Machine: EM_NONE # NOSYMTAB-NEXT: ... --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ## Check that obj2yaml creates a "Symbols" tag for the objects ## that have a symbol table. @@ -30,14 +29,13 @@ # SYMTAB-NEXT: Class: ELFCLASS64 # SYMTAB-NEXT: Data: ELFDATA2LSB # SYMTAB-NEXT: Type: ET_DYN -# SYMTAB-NEXT: Machine: EM_X86_64 +# SYMTAB-NEXT: Machine: EM_NONE # SYMTAB-NEXT: Symbols: [] # SYMTAB-NEXT: ... --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: [] diff --git a/llvm/test/tools/obj2yaml/ELF/note-section.yaml b/llvm/test/tools/obj2yaml/ELF/note-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/note-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/note-section.yaml @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .note.foo Type: SHT_NOTE @@ -52,10 +51,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: ## Content is less than 12 bytes in size. ## (12 is the size of n_namesz, n_descsz and n_type 4-bytes fields that must always present). @@ -85,10 +83,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_DYN - Machine: EM_MIPS + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_DYN Sections: - Name: .note.tag Type: SHT_NOTE diff --git a/llvm/test/tools/obj2yaml/ELF/null-section.yaml b/llvm/test/tools/obj2yaml/ELF/null-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/null-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/null-section.yaml @@ -9,7 +9,7 @@ # FIRST-SEC-NEXT: Class: ELFCLASS64 # FIRST-SEC-NEXT: Data: ELFDATA2LSB # FIRST-SEC-NEXT: Type: ET_REL -# FIRST-SEC-NEXT: Machine: EM_X86_64 +# FIRST-SEC-NEXT: Machine: EM_NONE # FIRST-SEC-NEXT: Sections: # FIRST-SEC-NEXT: - Type: SHT_NULL # FIRST-SEC-NEXT: Flags: [ SHF_ALLOC ] @@ -25,10 +25,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Name: '' @@ -52,7 +51,7 @@ # SECOND-SEC-NEXT: Class: ELFCLASS64 # SECOND-SEC-NEXT: Data: ELFDATA2LSB # SECOND-SEC-NEXT: Type: ET_REL -# SECOND-SEC-NEXT: Machine: EM_X86_64 +# SECOND-SEC-NEXT: Machine: EM_NONE # SECOND-SEC-NEXT: Sections: # SECOND-SEC-NEXT: - Name: .foo # SECOND-SEC-NEXT: Type: SHT_PROGBITS @@ -68,10 +67,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_PROGBITS Name: .foo @@ -96,7 +94,7 @@ # NULL-SEC-NEXT: Class: ELFCLASS64 # NULL-SEC-NEXT: Data: ELFDATA2LSB # NULL-SEC-NEXT: Type: ET_REL -# NULL-SEC-NEXT: Machine: EM_X86_64 +# NULL-SEC-NEXT: Machine: EM_NONE # NULL-SEC-NEXT: Sections: # NULL-SEC-NEXT: - Name: .foo # NULL-SEC-NEXT: Type: SHT_PROGBITS @@ -104,10 +102,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL - Type: SHT_PROGBITS @@ -124,7 +121,7 @@ # NULL-SEC-MIDDLE-NEXT: Class: ELFCLASS64 # NULL-SEC-MIDDLE-NEXT: Data: ELFDATA2LSB # NULL-SEC-MIDDLE-NEXT: Type: ET_REL -# NULL-SEC-MIDDLE-NEXT: Machine: EM_X86_64 +# NULL-SEC-MIDDLE-NEXT: Machine: EM_NONE # NULL-SEC-MIDDLE-NEXT: Sections: # NULL-SEC-MIDDLE-NEXT: - Name: .foo # NULL-SEC-MIDDLE-NEXT: Type: SHT_PROGBITS @@ -133,10 +130,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_PROGBITS Name: .foo diff --git a/llvm/test/tools/obj2yaml/ELF/program-headers.yaml b/llvm/test/tools/obj2yaml/ELF/program-headers.yaml --- a/llvm/test/tools/obj2yaml/ELF/program-headers.yaml +++ b/llvm/test/tools/obj2yaml/ELF/program-headers.yaml @@ -94,10 +94,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ProgramHeaders: ## Check we can create a PT_LOAD with arbitrary (we used .hash, .gnu.hash) ## and implicit sections (we use .dynsym, .dynstr). It also checks that the @@ -270,10 +269,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ProgramHeaders: - Type: PT_LOAD Flags: [ PF_W, PF_R ] @@ -349,10 +347,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ProgramHeaders: - Type: PT_LOAD Flags: [ PF_R ] @@ -385,10 +382,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ProgramHeaders: - Type: PT_LOAD Flags: [ PF_R ] @@ -450,10 +446,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC ProgramHeaders: ## Case 1: the segment contains a single SHT_NOBITS section. - Type: PT_LOAD @@ -528,10 +523,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ProgramHeaders: ## Case 1: the .bar section is placed after the .foo section in the file. ## Check we report an error about the violation of the order. @@ -608,10 +602,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC ProgramHeaders: - Type: PT_LOAD Flags: [ PF_W, PF_R ] @@ -657,10 +650,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC ProgramHeaders: - Type: PT_LOAD Flags: [ PF_W, PF_R ] diff --git a/llvm/test/tools/obj2yaml/ELF/rel-rela-section.yaml b/llvm/test/tools/obj2yaml/ELF/rel-rela-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/rel-rela-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/rel-rela-section.yaml @@ -15,10 +15,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .rela.dyn Type: SHT_RELA @@ -39,10 +38,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: [[TYPE]] diff --git a/llvm/test/tools/obj2yaml/ELF/reladyn-section-shinfo.yaml b/llvm/test/tools/obj2yaml/ELF/reladyn-section-shinfo.yaml --- a/llvm/test/tools/obj2yaml/ELF/reladyn-section-shinfo.yaml +++ b/llvm/test/tools/obj2yaml/ELF/reladyn-section-shinfo.yaml @@ -27,11 +27,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 - Entry: 0x0000000000001000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN + Entry: 0x0000000000001000 Sections: - Name: .rela.dyn Type: SHT_RELA diff --git a/llvm/test/tools/obj2yaml/ELF/relr-section.yaml b/llvm/test/tools/obj2yaml/ELF/relr-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/relr-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/relr-section.yaml @@ -35,10 +35,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2[[ENCODE]] - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2[[ENCODE]] + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -55,10 +54,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -78,10 +76,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR diff --git a/llvm/test/tools/obj2yaml/ELF/section-group.yaml b/llvm/test/tools/obj2yaml/ELF/section-group.yaml --- a/llvm/test/tools/obj2yaml/ELF/section-group.yaml +++ b/llvm/test/tools/obj2yaml/ELF/section-group.yaml @@ -28,10 +28,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP @@ -55,10 +54,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP diff --git a/llvm/test/tools/obj2yaml/ELF/sections-info.yaml b/llvm/test/tools/obj2yaml/ELF/sections-info.yaml --- a/llvm/test/tools/obj2yaml/ELF/sections-info.yaml +++ b/llvm/test/tools/obj2yaml/ELF/sections-info.yaml @@ -13,10 +13,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/shinfo.yaml b/llvm/test/tools/obj2yaml/ELF/shinfo.yaml --- a/llvm/test/tools/obj2yaml/ELF/shinfo.yaml +++ b/llvm/test/tools/obj2yaml/ELF/shinfo.yaml @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .test Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/shlink.yaml b/llvm/test/tools/obj2yaml/ELF/shlink.yaml --- a/llvm/test/tools/obj2yaml/ELF/shlink.yaml +++ b/llvm/test/tools/obj2yaml/ELF/shlink.yaml @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .test Type: SHT_PROGBITS @@ -31,10 +30,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .test Type: SHT_PROGBITS @@ -48,10 +46,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .test Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml b/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml --- a/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml +++ b/llvm/test/tools/obj2yaml/ELF/sht-symtab-shndx.yaml @@ -10,7 +10,7 @@ # CASE1-NEXT: Class: ELFCLASS64 # CASE1-NEXT: Data: ELFDATA2LSB # CASE1-NEXT: Type: ET_REL -# CASE1-NEXT: Machine: EM_X86_64 +# CASE1-NEXT: Machine: EM_NONE # CASE1-NEXT: Sections: # CASE1-NEXT: - Name: bar # CASE1-NEXT: Type: SHT_PROGBITS @@ -30,10 +30,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: bar Type: SHT_PROGBITS @@ -57,10 +56,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Type: STT_SECTION Index: SHN_XINDEX @@ -76,10 +74,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: bar Type: SHT_PROGBITS @@ -102,10 +99,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: bar Type: SHT_PROGBITS @@ -127,10 +123,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab_shndx1 Type: SHT_SYMTAB_SHNDX @@ -153,10 +148,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab_shndx Type: SHT_SYMTAB_SHNDX @@ -175,10 +169,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab_shndx Type: SHT_SYMTAB_SHNDX diff --git a/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml b/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml --- a/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml +++ b/llvm/test/tools/obj2yaml/ELF/stack-sizes.yaml @@ -11,7 +11,7 @@ # VALID-NEXT: Class: ELFCLASS64 # VALID-NEXT: Data: ELFDATA2LSB # VALID-NEXT: Type: ET_EXEC -# VALID-NEXT: Machine: EM_X86_64 +# VALID-NEXT: Machine: EM_NONE # VALID-NEXT: Sections: # VALID-NEXT: - Name: .stack_sizes # VALID-NEXT: Type: SHT_PROGBITS @@ -23,10 +23,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -43,7 +42,7 @@ # INVALID-NEXT: Class: ELFCLASS64 # INVALID-NEXT: Data: ELFDATA2LSB # INVALID-NEXT: Type: ET_EXEC -# INVALID-NEXT: Machine: EM_X86_64 +# INVALID-NEXT: Machine: EM_NONE # INVALID-NEXT: Sections: # INVALID-NEXT: - Name: .stack_sizes # INVALID-NEXT: Type: SHT_PROGBITS @@ -51,10 +50,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -70,7 +68,7 @@ # EMPTY-NEXT: Class: ELFCLASS64 # EMPTY-NEXT: Data: ELFDATA2LSB # EMPTY-NEXT: Type: ET_EXEC -# EMPTY-NEXT: Machine: EM_X86_64 +# EMPTY-NEXT: Machine: EM_NONE # EMPTY-NEXT: Sections: # EMPTY-NEXT: - Name: .stack_sizes # EMPTY-NEXT: Type: SHT_PROGBITS @@ -78,10 +76,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS diff --git a/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml b/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml --- a/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml +++ b/llvm/test/tools/obj2yaml/ELF/symbol-type.yaml @@ -11,10 +11,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: a_known_type Type: STT_OBJECT diff --git a/llvm/test/tools/obj2yaml/ELF/symbol-visibility.yaml b/llvm/test/tools/obj2yaml/ELF/symbol-visibility.yaml --- a/llvm/test/tools/obj2yaml/ELF/symbol-visibility.yaml +++ b/llvm/test/tools/obj2yaml/ELF/symbol-visibility.yaml @@ -7,7 +7,7 @@ # CHECK-NEXT: Class: ELFCLASS64 # CHECK-NEXT: Data: ELFDATA2LSB # CHECK-NEXT: Type: ET_REL -# CHECK-NEXT: Machine: EM_X86_64 +# CHECK-NEXT: Machine: EM_NONE # CHECK-NEXT: Symbols: # CHECK-NEXT: - Name: default # CHECK-NEXT: - Name: internal @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: default Other: [ STV_DEFAULT ] diff --git a/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml b/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/verdef-section.yaml @@ -33,11 +33,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 - Entry: 0x0000000000001000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN + Entry: 0x0000000000001000 Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef diff --git a/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml b/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/verneed-section.yaml @@ -32,11 +32,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 - Entry: 0x0000000000201000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Entry: 0x0000000000201000 Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed diff --git a/llvm/test/tools/obj2yaml/ELF/versym-section.yaml b/llvm/test/tools/obj2yaml/ELF/versym-section.yaml --- a/llvm/test/tools/obj2yaml/ELF/versym-section.yaml +++ b/llvm/test/tools/obj2yaml/ELF/versym-section.yaml @@ -8,7 +8,7 @@ # CHECK-NEXT: Class: ELFCLASS64 # CHECK-NEXT: Data: ELFDATA2LSB # CHECK-NEXT: Type: ET_EXEC -# CHECK-NEXT: Machine: EM_X86_64 +# CHECK-NEXT: Machine: EM_NONE # CHECK-NEXT: Entry: 0x0000000000201000 # CHECK-NEXT: Sections: # CHECK-NEXT: - Name: .gnu.version @@ -28,11 +28,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 - Entry: 0x0000000000201000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Entry: 0x0000000000201000 Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-abbrev.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-abbrev.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-abbrev.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-abbrev.yaml @@ -49,10 +49,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_abbrev: - Code: 1 @@ -104,10 +103,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_abbrev Type: SHT_PROGBITS @@ -125,10 +123,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_abbrev Type: SHT_PROGBITS @@ -143,10 +140,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_abbrev Type: SHT_PROGBITS @@ -165,10 +161,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_abbrev Type: SHT_PROGBITS @@ -192,10 +187,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_abbrev Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -218,10 +212,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_abbrev Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -258,10 +251,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_abbrev: - Tag: DW_TAG_compile_unit diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-addr.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-addr.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-addr.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-addr.yaml @@ -140,10 +140,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_addr: ## 1) Only address (4-byte) exists. @@ -384,10 +383,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_addr: - Format: DWARF64 @@ -443,10 +441,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_addr: - Entries: [] @@ -463,10 +460,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_addr Type: SHT_PROGBITS @@ -483,10 +479,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_addr Type: SHT_PROGBITS @@ -501,10 +496,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_addr Type: SHT_PROGBITS @@ -521,10 +515,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_addr Type: SHT_PROGBITS @@ -546,10 +539,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_addr Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -572,10 +564,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_addr Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -609,10 +600,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_addr: - Version: 5 @@ -632,10 +622,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_addr: - Version: 5 diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-aranges.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-aranges.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-aranges.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-aranges.yaml @@ -63,10 +63,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_aranges: - Format: [[FORMAT]] @@ -259,10 +258,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: SHT_PROGBITS @@ -279,10 +277,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: SHT_PROGBITS @@ -297,10 +294,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: SHT_PROGBITS @@ -323,10 +319,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: SHT_PROGBITS @@ -354,10 +349,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: SHT_STRTAB # SHT_PROGBITS by default. @@ -380,10 +374,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_EXEC Sections: - Name: .debug_aranges Type: SHT_STRTAB # SHT_PROGBITS by default. @@ -421,10 +414,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: - Length: 0x2c @@ -444,10 +436,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: - Length: 0x2c @@ -498,10 +489,9 @@ --- !ELF FileHeader: - Class: [[CLASS]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: [[CLASS]] + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: - Length: 0x2c @@ -577,10 +567,9 @@ --- !ELF FileHeader: - Class: [[CLASS]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: [[CLASS]] + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: - Version: 2 @@ -608,9 +597,8 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_aranges: [] diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubnames.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubnames.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubnames.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubnames.yaml @@ -38,10 +38,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_gnu_pubnames: Length: 0x1234 @@ -90,10 +89,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubnames Type: SHT_PROGBITS @@ -111,10 +109,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubnames Type: SHT_PROGBITS @@ -129,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubnames Type: SHT_PROGBITS @@ -152,10 +148,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubnames Type: SHT_PROGBITS @@ -180,10 +175,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubnames Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -206,10 +200,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubnames Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -241,10 +234,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_gnu_pubnames: Length: 0x1234 diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubtypes.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubtypes.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubtypes.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-gnu-pubtypes.yaml @@ -38,10 +38,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_gnu_pubtypes: Length: 0x1234 @@ -90,10 +89,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubtypes Type: SHT_PROGBITS @@ -111,10 +109,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubtypes Type: SHT_PROGBITS @@ -129,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubtypes Type: SHT_PROGBITS @@ -152,10 +148,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubtypes Type: SHT_PROGBITS @@ -180,10 +175,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubtypes Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -206,10 +200,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_gnu_pubtypes Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -241,10 +234,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_gnu_pubtypes: Length: 0x1234 diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-info.yaml @@ -110,10 +110,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_abbrev: - Code: 1 @@ -395,10 +394,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_info Type: SHT_PROGBITS @@ -416,10 +414,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_info Type: SHT_PROGBITS @@ -434,10 +431,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_info Type: SHT_PROGBITS @@ -462,10 +458,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_info Type: SHT_PROGBITS @@ -495,10 +490,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_info Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -521,10 +515,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_info Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -565,10 +558,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_info: - Length: 0x1234 @@ -600,10 +592,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_abbrev: - Tag: DW_TAG_compile_unit @@ -652,10 +643,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_info: - Length: 0x1234 @@ -686,10 +676,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_info: - Format: DWARF64 @@ -716,10 +705,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_info: - Format: DWARF64 @@ -776,10 +764,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_str: - "clang version 10.0.0 " @@ -852,10 +839,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_info: - Version: 4 @@ -880,10 +866,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_info: - Version: 4 diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-line.yaml @@ -66,10 +66,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_line: - Length: 0x70 @@ -157,10 +156,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_line Type: SHT_PROGBITS @@ -178,10 +176,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_line Type: SHT_PROGBITS @@ -196,10 +193,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_line Type: SHT_PROGBITS @@ -226,10 +222,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_line Type: SHT_PROGBITS @@ -261,10 +256,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_line Type: SHT_STRTAB # SHT_PROGBITS by default. @@ -287,10 +281,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_line Type: SHT_STRTAB # SHT_PROGBITS by default. @@ -348,10 +341,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_line: - Length: 0x1234 @@ -432,10 +424,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_line: - Length: 0x1234 diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-loclists.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-loclists.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-loclists.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-loclists.yaml @@ -94,10 +94,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -257,10 +256,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_loclists: - Format: DWARF64 @@ -326,10 +324,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Length: 0x1234 @@ -387,10 +384,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -431,10 +427,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -455,10 +450,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - AddressSize: 4 @@ -487,10 +481,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - AddressSize: 3 @@ -533,10 +526,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -557,10 +549,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -587,10 +578,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: [] @@ -607,10 +597,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_loclists Type: SHT_PROGBITS @@ -628,10 +617,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_loclists Type: SHT_PROGBITS @@ -646,10 +634,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_loclists Type: SHT_PROGBITS @@ -665,10 +652,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_loclists Type: SHT_PROGBITS @@ -689,10 +675,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_loclists Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -715,10 +700,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_loclists Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -747,10 +731,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: [] @@ -768,10 +751,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -808,10 +790,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -832,10 +813,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - Lists: @@ -866,10 +846,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_loclists: - OffsetEntryCount: [[OFFSETENTRIES=]] diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubnames.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubnames.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubnames.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubnames.yaml @@ -37,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_pubnames: Length: 0x1234 @@ -86,10 +85,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubnames Type: SHT_PROGBITS @@ -107,10 +105,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubnames Type: SHT_PROGBITS @@ -125,10 +122,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubnames Type: SHT_PROGBITS @@ -148,10 +144,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubnames Type: SHT_PROGBITS @@ -176,10 +171,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubnames Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -202,10 +196,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubnames Type: SHT_STRTAB ## SHT_PROGBITS by default. diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubtypes.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubtypes.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubtypes.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-pubtypes.yaml @@ -37,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_pubtypes: Format: [[FORMAT=DWARF32]] @@ -87,10 +86,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubtypes Type: SHT_PROGBITS @@ -108,10 +106,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubtypes Type: SHT_PROGBITS @@ -126,10 +123,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubtypes Type: SHT_PROGBITS @@ -149,10 +145,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubtypes Type: SHT_PROGBITS @@ -177,10 +172,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubtypes Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -203,10 +197,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_pubtypes Type: SHT_STRTAB ## SHT_PROGBITS by default. diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-ranges.yaml @@ -68,10 +68,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_ranges: - AddrSize: 0x04 @@ -158,10 +157,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_ranges Type: SHT_PROGBITS @@ -178,10 +176,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_ranges Type: SHT_PROGBITS @@ -196,10 +193,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_ranges Type: SHT_PROGBITS @@ -217,10 +213,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_ranges Type: SHT_PROGBITS @@ -243,10 +238,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_ranges Type: SHT_STRTAB # SHT_PROGBITS by default. @@ -269,10 +263,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_ranges Type: SHT_STRTAB # SHT_PROGBITS by default. @@ -335,10 +328,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_ranges: - Entries: @@ -362,10 +354,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_ranges: - Entries: @@ -389,10 +380,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_ranges: - AddrSize: 0x07 @@ -408,10 +398,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_ranges: - AddrSize: 0x07 diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-rnglists.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-rnglists.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-rnglists.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-rnglists.yaml @@ -69,10 +69,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_rnglists: - Lists: @@ -179,10 +178,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_rnglists: - Format: DWARF64 @@ -233,10 +231,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - Length: 0x1234 @@ -274,10 +271,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - Lists: @@ -314,10 +310,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - AddressSize: 4 @@ -347,10 +342,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - AddressSize: 3 @@ -372,10 +366,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - AddressSize: 3 @@ -415,10 +408,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - AddressSize: 3 @@ -442,10 +434,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - Lists: [] @@ -462,10 +453,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_rnglists Type: SHT_PROGBITS @@ -483,10 +473,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_rnglists Type: SHT_PROGBITS @@ -501,10 +490,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_rnglists Type: SHT_PROGBITS @@ -520,10 +508,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_rnglists Type: SHT_PROGBITS @@ -544,10 +531,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_rnglists Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -570,10 +556,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_rnglists Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -602,10 +587,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: [] @@ -636,10 +620,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - Lists: @@ -660,10 +643,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - Lists: @@ -690,10 +672,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_rnglists: - OffsetEntryCount: [[ENTRYCOUNT=]] diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str-offsets.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str-offsets.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str-offsets.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str-offsets.yaml @@ -36,10 +36,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: [[ENDIAN]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: [[ENDIAN]] + Type: ET_EXEC DWARF: debug_str_offsets: - Offsets: @@ -86,10 +85,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_str_offsets: - Length: 0x1234 @@ -110,10 +108,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_str_offsets: - Offsets: [] @@ -129,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_str_offsets: [] @@ -148,10 +144,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str_offsets Type: SHT_PROGBITS @@ -169,10 +164,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str_offsets Type: SHT_PROGBITS @@ -187,10 +181,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str_offsets Type: SHT_PROGBITS @@ -206,10 +199,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str_offsets Type: SHT_PROGBITS @@ -230,10 +222,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str_offsets Type: SHT_STRTAB ## SHT_PROGBITS by default. @@ -256,10 +247,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str_offsets Type: SHT_STRTAB ## SHT_PROGBITS by default. diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/debug-str.yaml @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: debug_str: - a @@ -41,10 +40,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str Type: SHT_PROGBITS @@ -65,10 +63,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str Type: SHT_PROGBITS @@ -83,10 +80,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str Type: SHT_PROGBITS @@ -102,10 +98,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str Type: SHT_PROGBITS @@ -126,10 +121,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .sec # Linked by .debug_str. Type: SHT_STRTAB @@ -153,10 +147,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .sec # Linked by .debug_str. Type: SHT_STRTAB @@ -196,10 +189,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str Type: SHT_DYNAMIC @@ -209,10 +201,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_str Type: SHT_DYNAMIC diff --git a/llvm/test/tools/yaml2obj/ELF/DWARF/empty-dwarf-entry.yaml b/llvm/test/tools/yaml2obj/ELF/DWARF/empty-dwarf-entry.yaml --- a/llvm/test/tools/yaml2obj/ELF/DWARF/empty-dwarf-entry.yaml +++ b/llvm/test/tools/yaml2obj/ELF/DWARF/empty-dwarf-entry.yaml @@ -12,8 +12,7 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC DWARF: diff --git a/llvm/test/tools/yaml2obj/ELF/abiversion.yaml b/llvm/test/tools/yaml2obj/ELF/abiversion.yaml --- a/llvm/test/tools/yaml2obj/ELF/abiversion.yaml +++ b/llvm/test/tools/yaml2obj/ELF/abiversion.yaml @@ -9,8 +9,7 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - ABIVersion: 0x05 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + ABIVersion: 0x05 diff --git a/llvm/test/tools/yaml2obj/ELF/call-graph-profile-section.yaml b/llvm/test/tools/yaml2obj/ELF/call-graph-profile-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/call-graph-profile-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/call-graph-profile-section.yaml @@ -50,10 +50,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2[[ENCODE]] - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2[[ENCODE]] + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -79,10 +78,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.foo Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -99,10 +97,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.foo Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -128,10 +125,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -160,10 +156,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -176,10 +171,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -193,10 +187,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -219,10 +212,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm.call-graph-profile Type: SHT_LLVM_CALL_GRAPH_PROFILE diff --git a/llvm/test/tools/yaml2obj/ELF/class-endianness.yaml b/llvm/test/tools/yaml2obj/ELF/class-endianness.yaml --- a/llvm/test/tools/yaml2obj/ELF/class-endianness.yaml +++ b/llvm/test/tools/yaml2obj/ELF/class-endianness.yaml @@ -29,6 +29,5 @@ --- !ELF FileHeader: !FileHeader Class: ELFCLASS[[BITS]] - Data: ELFDATA2[[ENCODE]] - Type: ET_EXEC - Machine: EM_X86_64 + Data: ELFDATA2[[ENCODE]] + Type: ET_EXEC diff --git a/llvm/test/tools/yaml2obj/ELF/comdat-broken-info.yaml b/llvm/test/tools/yaml2obj/ELF/comdat-broken-info.yaml --- a/llvm/test/tools/yaml2obj/ELF/comdat-broken-info.yaml +++ b/llvm/test/tools/yaml2obj/ELF/comdat-broken-info.yaml @@ -5,10 +5,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP @@ -35,10 +34,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group1 Type: SHT_GROUP diff --git a/llvm/test/tools/yaml2obj/ELF/comdat-broken-members.yaml b/llvm/test/tools/yaml2obj/ELF/comdat-broken-members.yaml --- a/llvm/test/tools/yaml2obj/ELF/comdat-broken-members.yaml +++ b/llvm/test/tools/yaml2obj/ELF/comdat-broken-members.yaml @@ -7,10 +7,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP diff --git a/llvm/test/tools/yaml2obj/ELF/comdat-broken.yaml b/llvm/test/tools/yaml2obj/ELF/comdat-broken.yaml --- a/llvm/test/tools/yaml2obj/ELF/comdat-broken.yaml +++ b/llvm/test/tools/yaml2obj/ELF/comdat-broken.yaml @@ -3,10 +3,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP diff --git a/llvm/test/tools/yaml2obj/ELF/content-array.yaml b/llvm/test/tools/yaml2obj/ELF/content-array.yaml --- a/llvm/test/tools/yaml2obj/ELF/content-array.yaml +++ b/llvm/test/tools/yaml2obj/ELF/content-array.yaml @@ -26,10 +26,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -44,10 +43,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -62,10 +60,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/custom-fill.yaml b/llvm/test/tools/yaml2obj/ELF/custom-fill.yaml --- a/llvm/test/tools/yaml2obj/ELF/custom-fill.yaml +++ b/llvm/test/tools/yaml2obj/ELF/custom-fill.yaml @@ -27,10 +27,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Pattern: "AABB" @@ -71,10 +70,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Pattern: "AABBCCFF" @@ -103,10 +101,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Name: fill1 @@ -147,10 +144,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Size: 0x1 @@ -168,10 +164,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Pattern: "00" @@ -184,10 +179,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Name: foo @@ -210,10 +204,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: begin Type: SHT_PROGBITS @@ -243,10 +236,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Pattern: "AA" @@ -265,10 +257,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Pattern: "00" @@ -282,10 +273,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Type: Fill Pattern: "" @@ -320,10 +310,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/custom-null-section.yaml b/llvm/test/tools/yaml2obj/ELF/custom-null-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/custom-null-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/custom-null-section.yaml @@ -13,10 +13,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL ## Now define a SHT_NULL section with fields all zeroed. ## In this case it is equal to the section created by default. @@ -26,10 +25,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Name: '' @@ -52,10 +50,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Name: .foo @@ -80,10 +77,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Name: .foo @@ -109,10 +105,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Name: '' @@ -133,10 +128,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Link: .foo @@ -150,10 +144,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL @@ -169,10 +162,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL - Type: SHT_NULL @@ -195,10 +187,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Size: 0x2 @@ -222,10 +213,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Type: SHT_NULL Offset: [[OFFSET]] diff --git a/llvm/test/tools/yaml2obj/ELF/duplicate-section-names.yaml b/llvm/test/tools/yaml2obj/ELF/duplicate-section-names.yaml --- a/llvm/test/tools/yaml2obj/ELF/duplicate-section-names.yaml +++ b/llvm/test/tools/yaml2obj/ELF/duplicate-section-names.yaml @@ -15,10 +15,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo1 Type: SHT_PROGBITS @@ -44,10 +43,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: '.foo (1)' Type: SHT_PROGBITS @@ -65,10 +63,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -105,10 +102,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -153,10 +149,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP diff --git a/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml b/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml --- a/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml +++ b/llvm/test/tools/yaml2obj/ELF/duplicate-symbol-names.yaml @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: localfoo - Name: 'localfoo (1)' @@ -25,10 +24,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: 'localfoo (1)' - Name: 'localfoo (1)' @@ -44,10 +42,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: localfoo - Name: localfoo diff --git a/llvm/test/tools/yaml2obj/ELF/dynamic-section-i386.yaml b/llvm/test/tools/yaml2obj/ELF/dynamic-section-i386.yaml --- a/llvm/test/tools/yaml2obj/ELF/dynamic-section-i386.yaml +++ b/llvm/test/tools/yaml2obj/ELF/dynamic-section-i386.yaml @@ -11,10 +11,9 @@ !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynamic Type: SHT_DYNAMIC diff --git a/llvm/test/tools/yaml2obj/ELF/dynamic-section-raw-content.yaml b/llvm/test/tools/yaml2obj/ELF/dynamic-section-raw-content.yaml --- a/llvm/test/tools/yaml2obj/ELF/dynamic-section-raw-content.yaml +++ b/llvm/test/tools/yaml2obj/ELF/dynamic-section-raw-content.yaml @@ -17,10 +17,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic Type: SHT_DYNAMIC @@ -33,10 +32,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .dynamic1 Type: SHT_DYNAMIC diff --git a/llvm/test/tools/yaml2obj/ELF/dynamic-section.yaml b/llvm/test/tools/yaml2obj/ELF/dynamic-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/dynamic-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/dynamic-section.yaml @@ -7,10 +7,9 @@ !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_DYN Sections: ## Test default values set by yaml2obj. - Name: .dynamic diff --git a/llvm/test/tools/yaml2obj/ELF/dynamic-symbols.yaml b/llvm/test/tools/yaml2obj/ELF/dynamic-symbols.yaml --- a/llvm/test/tools/yaml2obj/ELF/dynamic-symbols.yaml +++ b/llvm/test/tools/yaml2obj/ELF/dynamic-symbols.yaml @@ -6,10 +6,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .data Type: SHT_PROGBITS @@ -61,10 +60,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .data Type: SHT_PROGBITS @@ -85,10 +83,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .data Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/dynsymtab-implicit-sections-size-content.yaml b/llvm/test/tools/yaml2obj/ELF/dynsymtab-implicit-sections-size-content.yaml --- a/llvm/test/tools/yaml2obj/ELF/dynsymtab-implicit-sections-size-content.yaml +++ b/llvm/test/tools/yaml2obj/ELF/dynsymtab-implicit-sections-size-content.yaml @@ -16,10 +16,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -36,10 +35,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -53,10 +51,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -75,10 +72,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -92,10 +88,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -127,10 +122,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -159,10 +153,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -193,10 +186,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -227,10 +219,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM diff --git a/llvm/test/tools/yaml2obj/ELF/dynsymtab-shlink.yaml b/llvm/test/tools/yaml2obj/ELF/dynsymtab-shlink.yaml --- a/llvm/test/tools/yaml2obj/ELF/dynsymtab-shlink.yaml +++ b/llvm/test/tools/yaml2obj/ELF/dynsymtab-shlink.yaml @@ -12,10 +12,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -35,10 +34,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -59,10 +57,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -85,10 +82,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM diff --git a/llvm/test/tools/yaml2obj/ELF/empty-symbols.yaml b/llvm/test/tools/yaml2obj/ELF/empty-symbols.yaml --- a/llvm/test/tools/yaml2obj/ELF/empty-symbols.yaml +++ b/llvm/test/tools/yaml2obj/ELF/empty-symbols.yaml @@ -3,10 +3,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ## We usually express this as `Symbols: []`, but here we show that the value ## can be omitted. Symbols: diff --git a/llvm/test/tools/yaml2obj/ELF/ent-size.yaml b/llvm/test/tools/yaml2obj/ELF/ent-size.yaml --- a/llvm/test/tools/yaml2obj/ELF/ent-size.yaml +++ b/llvm/test/tools/yaml2obj/ELF/ent-size.yaml @@ -3,11 +3,10 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - OSABI: ELFOSABI_FREEBSD - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + OSABI: ELFOSABI_FREEBSD + Type: ET_REL Sections: - Type: SHT_PROGBITS Name: .strings diff --git a/llvm/test/tools/yaml2obj/ELF/explicit-dynsym-no-dynstr.yaml b/llvm/test/tools/yaml2obj/ELF/explicit-dynsym-no-dynstr.yaml --- a/llvm/test/tools/yaml2obj/ELF/explicit-dynsym-no-dynstr.yaml +++ b/llvm/test/tools/yaml2obj/ELF/explicit-dynsym-no-dynstr.yaml @@ -13,10 +13,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM diff --git a/llvm/test/tools/yaml2obj/ELF/gnu-hash-section.yaml b/llvm/test/tools/yaml2obj/ELF/gnu-hash-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/gnu-hash-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/gnu-hash-section.yaml @@ -25,10 +25,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -84,10 +83,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -102,10 +100,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -129,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash.no.header Type: SHT_GNU_HASH @@ -142,10 +138,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash.no.bloomfilter Type: SHT_GNU_HASH @@ -157,10 +152,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash.no.nobuckets Type: SHT_GNU_HASH @@ -172,10 +166,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash.no.novalues Type: SHT_GNU_HASH @@ -195,10 +188,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -207,10 +199,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -226,10 +217,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -242,10 +232,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH @@ -270,11 +259,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 -Sections: + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.hash Type: SHT_GNU_HASH diff --git a/llvm/test/tools/yaml2obj/ELF/gnu-unique-symbols.yaml b/llvm/test/tools/yaml2obj/ELF/gnu-unique-symbols.yaml --- a/llvm/test/tools/yaml2obj/ELF/gnu-unique-symbols.yaml +++ b/llvm/test/tools/yaml2obj/ELF/gnu-unique-symbols.yaml @@ -10,11 +10,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - OSABI: ELFOSABI_GNU - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + OSABI: ELFOSABI_GNU + Type: ET_REL Symbols: - Name: foo Type: STT_OBJECT diff --git a/llvm/test/tools/yaml2obj/ELF/hash-section.yaml b/llvm/test/tools/yaml2obj/ELF/hash-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/hash-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/hash-section.yaml @@ -23,10 +23,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: ## SHT_HASH is linked to dynamic symbol table by default. - Name: .dynsym @@ -52,10 +51,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -70,10 +68,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -88,10 +85,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -106,10 +102,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -121,10 +116,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -138,10 +132,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -161,10 +154,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash1 Type: SHT_HASH @@ -193,10 +185,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .hash Type: SHT_HASH @@ -216,10 +207,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .hash Type: SHT_HASH @@ -235,10 +225,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .hash Type: SHT_HASH @@ -251,10 +240,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .hash Type: SHT_HASH @@ -267,10 +255,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .hash Type: SHT_HASH @@ -301,10 +288,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH diff --git a/llvm/test/tools/yaml2obj/ELF/header-elfdatanone.yaml b/llvm/test/tools/yaml2obj/ELF/header-elfdatanone.yaml --- a/llvm/test/tools/yaml2obj/ELF/header-elfdatanone.yaml +++ b/llvm/test/tools/yaml2obj/ELF/header-elfdatanone.yaml @@ -9,7 +9,6 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATANONE - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATANONE + Type: ET_REL diff --git a/llvm/test/tools/yaml2obj/ELF/header-osabi.yaml b/llvm/test/tools/yaml2obj/ELF/header-osabi.yaml --- a/llvm/test/tools/yaml2obj/ELF/header-osabi.yaml +++ b/llvm/test/tools/yaml2obj/ELF/header-osabi.yaml @@ -10,18 +10,16 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_NONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_NONE --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL # RUN: yaml2obj %s --docnum=3 -o %t.hpux # RUN: llvm-readobj --file-headers %t.hpux | FileCheck %s --check-prefix=OSABI-HPUX @@ -30,11 +28,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_HPUX + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_HPUX # RUN: yaml2obj %s --docnum=4 -o %t.netbsd # RUN: llvm-readobj --file-headers %t.netbsd | FileCheck %s --check-prefix=OSABI-NETBSD @@ -43,11 +40,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_NETBSD + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_NETBSD ## Test ELFOSABI_GNU and ELFOSABI_LINUX (historical alias for ELFOSABI_GNU). # RUN: yaml2obj %s --docnum=5 -o %t.gnu @@ -58,19 +54,17 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_GNU + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_GNU --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_LINUX + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_LINUX # RUN: yaml2obj %s --docnum=7 -o %t.hurd # RUN: llvm-readobj --file-headers %t.hurd | FileCheck %s --check-prefix=OSABI-HURD @@ -79,11 +73,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_HURD + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_HURD # RUN: yaml2obj %s --docnum=8 -o %t.solaris # RUN: llvm-readobj --file-headers %t.solaris | FileCheck %s --check-prefix=OSABI-SOLARIS @@ -92,11 +85,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_SOLARIS + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_SOLARIS # RUN: yaml2obj %s --docnum=9 -o %t.aix # RUN: llvm-readobj --file-headers %t.aix | FileCheck %s --check-prefix=OSABI-AIX @@ -105,11 +97,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_AIX + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_AIX # RUN: yaml2obj %s --docnum=10 -o %t.irix # RUN: llvm-readobj --file-headers %t.irix | FileCheck %s --check-prefix=OSABI-IRIX @@ -118,11 +109,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_IRIX + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_IRIX # RUN: yaml2obj %s --docnum=11 -o %t.freebsd # RUN: llvm-readobj --file-headers %t.freebsd | FileCheck %s --check-prefix=OSABI-FREEBSD @@ -131,11 +121,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_FREEBSD + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_FREEBSD # RUN: yaml2obj %s --docnum=12 -o %t.tru64 # RUN: llvm-readobj --file-headers %t.tru64 | FileCheck %s --check-prefix=OSABI-TRU64 @@ -144,11 +133,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_TRU64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_TRU64 # RUN: yaml2obj %s --docnum=13 -o %t.modesto # RUN: llvm-readobj --file-headers %t.modesto | FileCheck %s --check-prefix=OSABI-MODESTO @@ -157,11 +145,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_MODESTO + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_MODESTO # RUN: yaml2obj %s --docnum=14 -o %t.openbsd # RUN: llvm-readobj --file-headers %t.openbsd | FileCheck %s --check-prefix=OSABI-OPENBSD @@ -170,11 +157,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_OPENBSD + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_OPENBSD # RUN: yaml2obj %s --docnum=15 -o %t.openvms # RUN: llvm-readobj --file-headers %t.openvms | FileCheck %s --check-prefix=OSABI-OPENVMS @@ -183,11 +169,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_OPENVMS + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_OPENVMS # RUN: yaml2obj %s --docnum=16 -o %t.nsk # RUN: llvm-readobj --file-headers %t.nsk | FileCheck %s --check-prefix=OSABI-NSK @@ -196,11 +181,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_NSK + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_NSK # RUN: yaml2obj %s --docnum=17 -o %t.aros # RUN: llvm-readobj --file-headers %t.aros | FileCheck %s --check-prefix=OSABI-AROS @@ -209,11 +193,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_AROS + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_AROS # RUN: yaml2obj %s --docnum=18 -o %t.fenixos # RUN: llvm-readobj --file-headers %t.fenixos | FileCheck %s --check-prefix=OSABI-FENIXOS @@ -222,11 +205,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_FENIXOS + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_FENIXOS # RUN: yaml2obj %s --docnum=19 -o %t.cloudabi # RUN: llvm-readobj --file-headers %t.cloudabi | FileCheck %s --check-prefix=OSABI-CLOUDABI @@ -235,11 +217,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_CLOUDABI + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_CLOUDABI # RUN: yaml2obj %s --docnum=20 -o %t.amdhsa # RUN: llvm-readobj --file-headers %t.amdhsa | FileCheck %s --check-prefix=OSABI-ARCHSPEC40 @@ -250,19 +231,17 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_AMDGPU_HSA + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_AMDGPU_HSA --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_C6000_ELFABI + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_C6000_ELFABI # RUN: yaml2obj %s --docnum=22 -o %t.amdpal # RUN: llvm-readobj --file-headers %t.amdpal | FileCheck %s --check-prefix=OSABI-ARCHSPEC41 @@ -273,19 +252,17 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_AMDGPU_PAL + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_AMDGPU_PAL --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_C6000_LINUX + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_C6000_LINUX # RUN: yaml2obj %s --docnum=24 -o %t.amdmesa # RUN: llvm-readobj --file-headers %t.amdmesa | FileCheck %s --check-prefix=OSABI-AMD-MESA3D @@ -294,11 +271,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_AMDGPU_MESA3D + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_AMDGPU_MESA3D # RUN: yaml2obj %s --docnum=25 -o %t.arm # RUN: llvm-readobj --file-headers %t.arm | FileCheck %s --check-prefix=OSABI-ARM @@ -307,11 +283,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_ARM + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_ARM # RUN: yaml2obj %s --docnum=26 -o %t.standalone # RUN: llvm-readobj --file-headers %t.standalone | FileCheck %s --check-prefix=OSABI-STANDALONE @@ -320,11 +295,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: ELFOSABI_STANDALONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: ELFOSABI_STANDALONE ## Test we can use an arbitrary number for OSABI. # RUN: yaml2obj %s --docnum=27 -o %t.number @@ -333,8 +307,7 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 - OSABI: 0xFE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL + OSABI: 0xFE diff --git a/llvm/test/tools/yaml2obj/ELF/header-sh-fields.yaml b/llvm/test/tools/yaml2obj/ELF/header-sh-fields.yaml --- a/llvm/test/tools/yaml2obj/ELF/header-sh-fields.yaml +++ b/llvm/test/tools/yaml2obj/ELF/header-sh-fields.yaml @@ -16,10 +16,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL ProgramHeaders: - Type: PT_LOAD Sections: [] @@ -36,7 +35,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 EShEntSize: [[SHENTSIZE=64]] EShOff: [[SHOFF=200]] EShNum: [[SHNUM=3]] diff --git a/llvm/test/tools/yaml2obj/ELF/implicit-sections-addr.yaml b/llvm/test/tools/yaml2obj/ELF/implicit-sections-addr.yaml --- a/llvm/test/tools/yaml2obj/ELF/implicit-sections-addr.yaml +++ b/llvm/test/tools/yaml2obj/ELF/implicit-sections-addr.yaml @@ -33,10 +33,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynstr Type: SHT_STRTAB diff --git a/llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml b/llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml --- a/llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml +++ b/llvm/test/tools/yaml2obj/ELF/implicit-sections-info.yaml @@ -26,10 +26,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -68,10 +67,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: - Name: local - Name: global1 @@ -100,10 +98,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynstr Type: SHT_STRTAB diff --git a/llvm/test/tools/yaml2obj/ELF/implicit-sections-types.yaml b/llvm/test/tools/yaml2obj/ELF/implicit-sections-types.yaml --- a/llvm/test/tools/yaml2obj/ELF/implicit-sections-types.yaml +++ b/llvm/test/tools/yaml2obj/ELF/implicit-sections-types.yaml @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ## Needed to force the creation of the .symtab. Symbols: [] ## Needed to force the creation of the .dynsym and .dynstr. @@ -48,10 +47,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_DYNAMIC diff --git a/llvm/test/tools/yaml2obj/ELF/implicit-sections.yaml b/llvm/test/tools/yaml2obj/ELF/implicit-sections.yaml --- a/llvm/test/tools/yaml2obj/ELF/implicit-sections.yaml +++ b/llvm/test/tools/yaml2obj/ELF/implicit-sections.yaml @@ -20,10 +20,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynstr Type: SHT_STRTAB @@ -60,10 +59,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynstr Type: SHT_STRTAB @@ -88,10 +86,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN ## Check we add a symbol table when "Symbols" key is specified. @@ -102,8 +99,7 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: [] diff --git a/llvm/test/tools/yaml2obj/ELF/invalid-docnum.yaml b/llvm/test/tools/yaml2obj/ELF/invalid-docnum.yaml --- a/llvm/test/tools/yaml2obj/ELF/invalid-docnum.yaml +++ b/llvm/test/tools/yaml2obj/ELF/invalid-docnum.yaml @@ -9,14 +9,12 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN diff --git a/llvm/test/tools/yaml2obj/ELF/linker-options.yaml b/llvm/test/tools/yaml2obj/ELF/linker-options.yaml --- a/llvm/test/tools/yaml2obj/ELF/linker-options.yaml +++ b/llvm/test/tools/yaml2obj/ELF/linker-options.yaml @@ -33,10 +33,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .linker-options1 Type: SHT_LLVM_LINKER_OPTIONS @@ -59,10 +58,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .linker-options Type: SHT_LLVM_LINKER_OPTIONS @@ -71,10 +69,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .linker-options Type: SHT_LLVM_LINKER_OPTIONS @@ -89,10 +86,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .linker-options Type: SHT_LLVM_LINKER_OPTIONS @@ -111,10 +107,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .linker-options Type: SHT_LLVM_LINKER_OPTIONS diff --git a/llvm/test/tools/yaml2obj/ELF/llvm-addrsig-section.yaml b/llvm/test/tools/yaml2obj/ELF/llvm-addrsig-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/llvm-addrsig-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/llvm-addrsig-section.yaml @@ -26,10 +26,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -52,10 +51,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -73,10 +71,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -91,10 +88,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -114,10 +110,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -131,10 +126,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -147,10 +141,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -168,10 +161,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -193,10 +185,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -223,10 +214,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .llvm_addrsig_sizegr Type: SHT_LLVM_ADDRSIG @@ -246,10 +236,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG @@ -262,10 +251,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .llvm_addrsig Type: SHT_LLVM_ADDRSIG diff --git a/llvm/test/tools/yaml2obj/ELF/llvm-deplibs-section.yaml b/llvm/test/tools/yaml2obj/ELF/llvm-deplibs-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/llvm-deplibs-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/llvm-deplibs-section.yaml @@ -38,10 +38,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .deplibs.lib Type: SHT_LLVM_DEPENDENT_LIBRARIES @@ -58,10 +57,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .deplibs Type: SHT_LLVM_DEPENDENT_LIBRARIES @@ -78,10 +76,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .deplibs Type: SHT_LLVM_DEPENDENT_LIBRARIES diff --git a/llvm/test/tools/yaml2obj/ELF/local-symbols.yaml b/llvm/test/tools/yaml2obj/ELF/local-symbols.yaml --- a/llvm/test/tools/yaml2obj/ELF/local-symbols.yaml +++ b/llvm/test/tools/yaml2obj/ELF/local-symbols.yaml @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: - Name: local - Name: global @@ -25,10 +24,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: - Name: local1 - Name: local2 diff --git a/llvm/test/tools/yaml2obj/ELF/no-phdrs.yaml b/llvm/test/tools/yaml2obj/ELF/no-phdrs.yaml --- a/llvm/test/tools/yaml2obj/ELF/no-phdrs.yaml +++ b/llvm/test/tools/yaml2obj/ELF/no-phdrs.yaml @@ -9,7 +9,6 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL diff --git a/llvm/test/tools/yaml2obj/ELF/none-value.yaml b/llvm/test/tools/yaml2obj/ELF/none-value.yaml --- a/llvm/test/tools/yaml2obj/ELF/none-value.yaml +++ b/llvm/test/tools/yaml2obj/ELF/none-value.yaml @@ -14,10 +14,9 @@ ## demonstrate the expected use case for the word. --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .bar Type: SHT_PROGBITS @@ -37,10 +36,9 @@ ## The same document, but all fields that were set to are removed. --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .bar Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/note-section.yaml b/llvm/test/tools/yaml2obj/ELF/note-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/note-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/note-section.yaml @@ -37,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE @@ -60,10 +59,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE @@ -92,10 +90,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2MSB - Type: ET_REL - Machine: EM_MIPS + Class: ELFCLASS32 + Data: ELFDATA2MSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE @@ -106,10 +103,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2MSB - Type: ET_REL - Machine: EM_MIPS + Class: ELFCLASS64 + Data: ELFDATA2MSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE @@ -125,10 +121,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE @@ -148,10 +143,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .note.foo Type: SHT_NOTE @@ -170,10 +164,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .note.foo Type: SHT_NOTE @@ -187,10 +180,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .note.foo Type: SHT_NOTE @@ -203,10 +195,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .note.foo Type: SHT_NOTE @@ -219,10 +210,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .note.foo Type: SHT_NOTE @@ -242,10 +232,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note.foo Type: SHT_NOTE @@ -268,10 +257,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note.sizegr Type: SHT_NOTE @@ -290,10 +278,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note Type: SHT_NOTE @@ -306,10 +293,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .note Type: SHT_NOTE diff --git a/llvm/test/tools/yaml2obj/ELF/output-limit.yaml b/llvm/test/tools/yaml2obj/ELF/output-limit.yaml --- a/llvm/test/tools/yaml2obj/ELF/output-limit.yaml +++ b/llvm/test/tools/yaml2obj/ELF/output-limit.yaml @@ -18,10 +18,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .section Type: SHT_PROGBITS @@ -39,10 +38,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/override-shflags.yaml b/llvm/test/tools/yaml2obj/ELF/override-shflags.yaml --- a/llvm/test/tools/yaml2obj/ELF/override-shflags.yaml +++ b/llvm/test/tools/yaml2obj/ELF/override-shflags.yaml @@ -38,10 +38,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: ## Check we can override flags for implicit sections. - Name: .symtab @@ -79,10 +78,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab Type: SHT_SYMTAB diff --git a/llvm/test/tools/yaml2obj/ELF/override-shname.yaml b/llvm/test/tools/yaml2obj/ELF/override-shname.yaml --- a/llvm/test/tools/yaml2obj/ELF/override-shname.yaml +++ b/llvm/test/tools/yaml2obj/ELF/override-shname.yaml @@ -41,10 +41,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .dynsym Type: SHT_DYNSYM diff --git a/llvm/test/tools/yaml2obj/ELF/override-shoffset.yaml b/llvm/test/tools/yaml2obj/ELF/override-shoffset.yaml --- a/llvm/test/tools/yaml2obj/ELF/override-shoffset.yaml +++ b/llvm/test/tools/yaml2obj/ELF/override-shoffset.yaml @@ -21,10 +21,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -83,10 +82,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -94,10 +92,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/override-shsize.yaml b/llvm/test/tools/yaml2obj/ELF/override-shsize.yaml --- a/llvm/test/tools/yaml2obj/ELF/override-shsize.yaml +++ b/llvm/test/tools/yaml2obj/ELF/override-shsize.yaml @@ -21,10 +21,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -82,10 +81,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -93,10 +91,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -118,10 +115,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -141,10 +137,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/override-shtype.yaml b/llvm/test/tools/yaml2obj/ELF/override-shtype.yaml --- a/llvm/test/tools/yaml2obj/ELF/override-shtype.yaml +++ b/llvm/test/tools/yaml2obj/ELF/override-shtype.yaml @@ -23,10 +23,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed diff --git a/llvm/test/tools/yaml2obj/ELF/program-header-address.yaml b/llvm/test/tools/yaml2obj/ELF/program-header-address.yaml --- a/llvm/test/tools/yaml2obj/ELF/program-header-address.yaml +++ b/llvm/test/tools/yaml2obj/ELF/program-header-address.yaml @@ -16,10 +16,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/program-header-align.yaml b/llvm/test/tools/yaml2obj/ELF/program-header-align.yaml --- a/llvm/test/tools/yaml2obj/ELF/program-header-align.yaml +++ b/llvm/test/tools/yaml2obj/ELF/program-header-align.yaml @@ -12,10 +12,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_NONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .tdata Type: SHT_PROGBITS @@ -38,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_NONE + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/program-header-nobits.yaml b/llvm/test/tools/yaml2obj/ELF/program-header-nobits.yaml --- a/llvm/test/tools/yaml2obj/ELF/program-header-nobits.yaml +++ b/llvm/test/tools/yaml2obj/ELF/program-header-nobits.yaml @@ -54,10 +54,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .data.before Type: SHT_PROGBITS @@ -116,10 +115,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .nobits.1 Type: SHT_NOBITS diff --git a/llvm/test/tools/yaml2obj/ELF/program-header-size-offset.yaml b/llvm/test/tools/yaml2obj/ELF/program-header-size-offset.yaml --- a/llvm/test/tools/yaml2obj/ELF/program-header-size-offset.yaml +++ b/llvm/test/tools/yaml2obj/ELF/program-header-size-offset.yaml @@ -37,10 +37,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -124,10 +123,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .foo Type: SHT_PROGBITS @@ -165,10 +163,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .foo Type: SHT_PROGBITS @@ -198,10 +195,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/program-header.yaml b/llvm/test/tools/yaml2obj/ELF/program-header.yaml --- a/llvm/test/tools/yaml2obj/ELF/program-header.yaml +++ b/llvm/test/tools/yaml2obj/ELF/program-header.yaml @@ -3,10 +3,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS @@ -90,10 +89,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC ProgramHeaders: - Type: PT_LOAD Sections: diff --git a/llvm/test/tools/yaml2obj/ELF/reloc-sec-entry-size.yaml b/llvm/test/tools/yaml2obj/ELF/reloc-sec-entry-size.yaml --- a/llvm/test/tools/yaml2obj/ELF/reloc-sec-entry-size.yaml +++ b/llvm/test/tools/yaml2obj/ELF/reloc-sec-entry-size.yaml @@ -24,10 +24,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2LSB + Type: ET_REL Sections: ## Check default sh_entsize field values. - Name: .rela.default diff --git a/llvm/test/tools/yaml2obj/ELF/reloc-sec-info.yaml b/llvm/test/tools/yaml2obj/ELF/reloc-sec-info.yaml --- a/llvm/test/tools/yaml2obj/ELF/reloc-sec-info.yaml +++ b/llvm/test/tools/yaml2obj/ELF/reloc-sec-info.yaml @@ -13,10 +13,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .rela.text Type: SHT_RELA @@ -32,10 +31,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_RELA diff --git a/llvm/test/tools/yaml2obj/ELF/relr-section.yaml b/llvm/test/tools/yaml2obj/ELF/relr-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/relr-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/relr-section.yaml @@ -33,10 +33,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2[[ENCODE]] - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2[[ENCODE]] + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -76,10 +75,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2[[ENCODE]] - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2[[ENCODE]] + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -99,10 +97,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -117,10 +114,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -141,10 +137,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -152,10 +147,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR @@ -168,10 +162,9 @@ --- !ELF FileHeader: - Class: ELFCLASS32 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_386 + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .relr.dyn Type: SHT_RELR diff --git a/llvm/test/tools/yaml2obj/ELF/section-address-assign.yaml b/llvm/test/tools/yaml2obj/ELF/section-address-assign.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-address-assign.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-address-assign.yaml @@ -46,10 +46,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: [[TYPE]] - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: [[TYPE]] Sections: ## Show we can place a section at any address. - Name: .text.any.addr diff --git a/llvm/test/tools/yaml2obj/ELF/section-headers-exclude.yaml b/llvm/test/tools/yaml2obj/ELF/section-headers-exclude.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-headers-exclude.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-headers-exclude.yaml @@ -24,10 +24,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -64,10 +63,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL SectionHeaderTable: Sections: - Name: .strtab @@ -90,10 +88,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL SectionHeaderTable: Sections: [] Excluded: @@ -106,10 +103,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL SectionHeaderTable: Excluded: - Name: .strtab @@ -129,10 +125,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -156,10 +151,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: [[NAME]] Type: [[TYPE]] @@ -183,10 +177,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .dynsym Type: SHT_DYNSYM @@ -209,10 +202,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -232,10 +224,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .debug_unknown Type: SHT_PROGBITS @@ -254,10 +245,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .rela Type: SHT_RELA @@ -277,10 +267,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .rela Type: SHT_RELA @@ -304,10 +293,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -330,10 +318,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP @@ -353,10 +340,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP @@ -385,10 +371,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .cgp Type: SHT_LLVM_CALL_GRAPH_PROFILE @@ -426,10 +411,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .hash Type: SHT_HASH @@ -460,10 +444,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -489,10 +472,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL SectionHeaderTable: Sections: - Name: .strtab @@ -506,10 +488,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL SectionHeaderTable: NoHeaders: [[NOHEADERS]] Excluded: [] diff --git a/llvm/test/tools/yaml2obj/ELF/section-headers.yaml b/llvm/test/tools/yaml2obj/ELF/section-headers.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-headers.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-headers.yaml @@ -17,10 +17,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .section (1) Type: SHT_PROGBITS @@ -88,10 +87,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -109,10 +107,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -144,10 +141,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -162,10 +158,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -190,7 +185,6 @@ Class: ELFCLASS64 Data: ELFDATA2LSB Type: ET_REL - Machine: EM_X86_64 EShOff: 0x2 EShNum: 0x3 EShStrNdx: 0x4 @@ -228,10 +222,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/section-link.yaml b/llvm/test/tools/yaml2obj/ELF/section-link.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-link.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-link.yaml @@ -14,10 +14,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS @@ -35,10 +34,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -67,10 +65,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group1 Type: SHT_GROUP @@ -92,10 +89,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .group Type: SHT_GROUP diff --git a/llvm/test/tools/yaml2obj/ELF/section-offset.yaml b/llvm/test/tools/yaml2obj/ELF/section-offset.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-offset.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-offset.yaml @@ -14,10 +14,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -41,10 +40,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS @@ -119,10 +117,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .foo Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/section-ordering.yaml b/llvm/test/tools/yaml2obj/ELF/section-ordering.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-ordering.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-ordering.yaml @@ -5,10 +5,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/section-size-content.yaml b/llvm/test/tools/yaml2obj/ELF/section-size-content.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-size-content.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-size-content.yaml @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -43,10 +42,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -60,10 +58,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -91,10 +88,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -124,10 +120,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -149,10 +144,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .foo Type: SHT_PROGBITS @@ -162,9 +156,8 @@ --- !ELF FileHeader: Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .data Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/section-unnamed.yaml b/llvm/test/tools/yaml2obj/ELF/section-unnamed.yaml --- a/llvm/test/tools/yaml2obj/ELF/section-unnamed.yaml +++ b/llvm/test/tools/yaml2obj/ELF/section-unnamed.yaml @@ -5,10 +5,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Type: SHT_PROGBITS - Name: .text diff --git a/llvm/test/tools/yaml2obj/ELF/sh-addralign.yaml b/llvm/test/tools/yaml2obj/ELF/sh-addralign.yaml --- a/llvm/test/tools/yaml2obj/ELF/sh-addralign.yaml +++ b/llvm/test/tools/yaml2obj/ELF/sh-addralign.yaml @@ -20,10 +20,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .data Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/sht-symtab-shndx.yaml b/llvm/test/tools/yaml2obj/ELF/sht-symtab-shndx.yaml --- a/llvm/test/tools/yaml2obj/ELF/sht-symtab-shndx.yaml +++ b/llvm/test/tools/yaml2obj/ELF/sht-symtab-shndx.yaml @@ -9,10 +9,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: bar Type: SHT_PROGBITS @@ -51,10 +50,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: bar Type: SHT_PROGBITS @@ -77,10 +75,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: bar Type: SHT_PROGBITS @@ -100,10 +97,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Type: STT_SECTION Index: 65536 @@ -117,10 +113,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab_shndx Type: SHT_SYMTAB_SHNDX diff --git a/llvm/test/tools/yaml2obj/ELF/stack-sizes.yaml b/llvm/test/tools/yaml2obj/ELF/stack-sizes.yaml --- a/llvm/test/tools/yaml2obj/ELF/stack-sizes.yaml +++ b/llvm/test/tools/yaml2obj/ELF/stack-sizes.yaml @@ -44,10 +44,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: ## Valid. - Name: '.stack_sizes (1)' @@ -93,10 +92,9 @@ --- !ELF FileHeader: - Class: ELFCLASS[[BITS]] - Data: ELFDATA2[[ENCODE]] - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS[[BITS]] + Data: ELFDATA2[[ENCODE]] + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -118,10 +116,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -137,10 +134,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -155,10 +151,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -175,10 +170,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -191,10 +185,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -218,10 +211,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -241,10 +233,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -257,10 +248,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .stack_sizes Type: SHT_PROGBITS @@ -282,10 +272,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: '.stack_sizes (1)' Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-flags.yaml b/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-flags.yaml --- a/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-flags.yaml +++ b/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-flags.yaml @@ -19,10 +19,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB @@ -48,10 +47,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB @@ -73,7 +71,6 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN diff --git a/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-size-content.yaml b/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-size-content.yaml --- a/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-size-content.yaml +++ b/llvm/test/tools/yaml2obj/ELF/strtab-implicit-sections-size-content.yaml @@ -12,10 +12,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB @@ -46,10 +45,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB @@ -81,10 +79,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB @@ -117,10 +114,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB @@ -153,10 +149,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .strtab Type: SHT_STRTAB diff --git a/llvm/test/tools/yaml2obj/ELF/symbol-binding.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-binding.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbol-binding.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbol-binding.yaml @@ -4,10 +4,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: local_symbol Type: STT_OBJECT diff --git a/llvm/test/tools/yaml2obj/ELF/symbol-index-invalid.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-index-invalid.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbol-index-invalid.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbol-index-invalid.yaml @@ -4,10 +4,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/symbol-index.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-index.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbol-index.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbol-index.yaml @@ -3,10 +3,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbol-name.yaml @@ -11,10 +11,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: test - StName: 1 diff --git a/llvm/test/tools/yaml2obj/ELF/symbol-type.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-type.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbol-type.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbol-type.yaml @@ -20,10 +20,9 @@ !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .text Type: SHT_PROGBITS diff --git a/llvm/test/tools/yaml2obj/ELF/symbol-visibility.yaml b/llvm/test/tools/yaml2obj/ELF/symbol-visibility.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbol-visibility.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbol-visibility.yaml @@ -56,10 +56,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: default1 - Name: default2 diff --git a/llvm/test/tools/yaml2obj/ELF/symbols-binding-order.yaml b/llvm/test/tools/yaml2obj/ELF/symbols-binding-order.yaml --- a/llvm/test/tools/yaml2obj/ELF/symbols-binding-order.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symbols-binding-order.yaml @@ -18,10 +18,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Symbols: - Name: staticGlobal Binding: STB_GLOBAL diff --git a/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-flags.yaml b/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-flags.yaml --- a/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-flags.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-flags.yaml @@ -19,10 +19,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -48,10 +47,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -73,8 +71,7 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Symbols: [] diff --git a/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-size-content.yaml b/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-size-content.yaml --- a/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-size-content.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symtab-implicit-sections-size-content.yaml @@ -15,10 +15,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -33,10 +32,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -46,10 +44,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -64,10 +61,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -77,10 +73,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -108,10 +103,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -139,10 +133,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -172,10 +165,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -205,10 +197,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB diff --git a/llvm/test/tools/yaml2obj/ELF/symtab-shlink.yaml b/llvm/test/tools/yaml2obj/ELF/symtab-shlink.yaml --- a/llvm/test/tools/yaml2obj/ELF/symtab-shlink.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symtab-shlink.yaml @@ -12,10 +12,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -34,10 +33,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -56,10 +54,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB @@ -82,10 +79,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .symtab Type: SHT_SYMTAB diff --git a/llvm/test/tools/yaml2obj/ELF/symtab-shtype.yaml b/llvm/test/tools/yaml2obj/ELF/symtab-shtype.yaml --- a/llvm/test/tools/yaml2obj/ELF/symtab-shtype.yaml +++ b/llvm/test/tools/yaml2obj/ELF/symtab-shtype.yaml @@ -7,10 +7,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_REL Sections: - Name: .symtab Type: SHT_DYNAMIC diff --git a/llvm/test/tools/yaml2obj/ELF/verdef-section.yaml b/llvm/test/tools/yaml2obj/ELF/verdef-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/verdef-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/verdef-section.yaml @@ -39,11 +39,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 - Entry: 0x0000000000001000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN + Entry: 0x0000000000001000 Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -99,10 +98,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -120,10 +118,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef @@ -138,10 +135,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_DYN Sections: - Name: .gnu.version_d Type: SHT_GNU_verdef diff --git a/llvm/test/tools/yaml2obj/ELF/verneed-section.yaml b/llvm/test/tools/yaml2obj/ELF/verneed-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/verneed-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/verneed-section.yaml @@ -47,11 +47,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 - Entry: 0x0000000000201000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Entry: 0x0000000000201000 Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -106,10 +105,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -127,10 +125,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed @@ -145,10 +142,9 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC Sections: - Name: .gnu.version_r Type: SHT_GNU_verneed diff --git a/llvm/test/tools/yaml2obj/ELF/versym-section.yaml b/llvm/test/tools/yaml2obj/ELF/versym-section.yaml --- a/llvm/test/tools/yaml2obj/ELF/versym-section.yaml +++ b/llvm/test/tools/yaml2obj/ELF/versym-section.yaml @@ -46,11 +46,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_EXEC - Machine: EM_X86_64 - Entry: 0x0000000000201000 + Class: ELFCLASS64 + Data: ELFDATA2LSB + Type: ET_EXEC + Entry: 0x0000000000201000 Sections: - Name: .gnu.version Type: SHT_GNU_versym @@ -97,11 +96,10 @@ --- !ELF FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - OSABI: ELFOSABI_FREEBSD - Type: ET_DYN - Machine: EM_X86_64 + Class: ELFCLASS64 + Data: ELFDATA2LSB + OSABI: ELFOSABI_FREEBSD + Type: ET_DYN Sections: - Name: .gnu.version Type: SHT_GNU_versym diff --git a/llvm/tools/obj2yaml/elf2yaml.cpp b/llvm/tools/obj2yaml/elf2yaml.cpp --- a/llvm/tools/obj2yaml/elf2yaml.cpp +++ b/llvm/tools/obj2yaml/elf2yaml.cpp @@ -231,7 +231,7 @@ Y->Header.OSABI = Obj.getHeader()->e_ident[ELF::EI_OSABI]; Y->Header.ABIVersion = Obj.getHeader()->e_ident[ELF::EI_ABIVERSION]; Y->Header.Type = Obj.getHeader()->e_type; - Y->Header.Machine = Obj.getHeader()->e_machine; + Y->Header.Machine = ELFYAML::ELF_EM(Obj.getHeader()->e_machine); Y->Header.Flags = Obj.getHeader()->e_flags; Y->Header.Entry = Obj.getHeader()->e_entry;