Skip to content

Commit b80ce05

Browse files
committed
Revert "Allow "[[FLAGS=<none>]]" value in the ELF Fileheader Flags field (#143845)"
This reverts commit 0b054e2. Breaks many tests, see comments on #143845.
1 parent 30705c5 commit b80ce05

File tree

5 files changed

+3
-64
lines changed

5 files changed

+3
-64
lines changed

llvm/include/llvm/ObjectYAML/ELFYAML.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ struct FileHeader {
117117
llvm::yaml::Hex8 ABIVersion;
118118
ELF_ET Type;
119119
std::optional<ELF_EM> Machine;
120-
std::optional<ELF_EF> Flags;
120+
ELF_EF Flags;
121121
llvm::yaml::Hex64 Entry;
122122
std::optional<StringRef> SectionHeaderStringTable;
123123

llvm/lib/ObjectYAML/ELFEmitter.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -481,11 +481,7 @@ void ELFState<ELFT>::writeELFHeader(raw_ostream &OS) {
481481

482482
Header.e_version = EV_CURRENT;
483483
Header.e_entry = Doc.Header.Entry;
484-
if (Doc.Header.Flags)
485-
Header.e_flags = *Doc.Header.Flags;
486-
else
487-
Header.e_flags = 0;
488-
484+
Header.e_flags = Doc.Header.Flags;
489485
Header.e_ehsize = sizeof(Elf_Ehdr);
490486

491487
if (Doc.Header.EPhOff)

llvm/test/tools/obj2yaml/ELF/eflags.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

llvm/test/tools/yaml2obj/file-header-flags.yaml

Lines changed: 0 additions & 25 deletions
This file was deleted.

llvm/tools/obj2yaml/elf2yaml.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,7 @@ template <class ELFT> Expected<ELFYAML::Object *> ELFDumper<ELFT>::dump() {
281281
Y->Header.Type = Obj.getHeader().e_type;
282282
if (Obj.getHeader().e_machine != 0)
283283
Y->Header.Machine = ELFYAML::ELF_EM(Obj.getHeader().e_machine);
284-
if (Obj.getHeader().e_flags != 0)
285-
Y->Header.Flags = Obj.getHeader().e_flags;
284+
Y->Header.Flags = Obj.getHeader().e_flags;
286285
Y->Header.Entry = Obj.getHeader().e_entry;
287286

288287
// Dump sections

0 commit comments

Comments
 (0)