diff --git a/llvm/tools/llvm-objdump/COFFDump.cpp b/llvm/tools/llvm-objdump/COFFDump.cpp --- a/llvm/tools/llvm-objdump/COFFDump.cpp +++ b/llvm/tools/llvm-objdump/COFFDump.cpp @@ -45,7 +45,7 @@ } template void printPEHeader(const PEHeader &Hdr) const; - void printPrivateHeaders(bool MachOOnlyFirst) override; + void printPrivateHeaders() override; private: template FormattedNumber formatAddr(T V) const { @@ -771,7 +771,7 @@ } } -void COFFDumper::printPrivateHeaders(bool MachOOnlyFirst) { +void COFFDumper::printPrivateHeaders() { COFFDumper CD(Obj); const uint16_t Cha = Obj.getCharacteristics(); outs() << "Characteristics 0x" << Twine::utohexstr(Cha) << '\n'; diff --git a/llvm/tools/llvm-objdump/ELFDump.cpp b/llvm/tools/llvm-objdump/ELFDump.cpp --- a/llvm/tools/llvm-objdump/ELFDump.cpp +++ b/llvm/tools/llvm-objdump/ELFDump.cpp @@ -28,7 +28,7 @@ template class ELFDumper : public Dumper { public: ELFDumper(const ELFObjectFile &O) : Dumper(O), Obj(O) {} - void printPrivateHeaders(bool MachOOnlyFirst) override; + void printPrivateHeaders() override; void printDynamicRelocations() override; private: @@ -426,7 +426,7 @@ } } -template void ELFDumper::printPrivateHeaders(bool) { +template void ELFDumper::printPrivateHeaders() { printProgramHeaders(); printDynamicSection(); printSymbolVersion(); diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -197,7 +197,7 @@ public: MachODumper(const object::MachOObjectFile &O) : Dumper(O), Obj(O) {} - void printPrivateHeaders(bool OnlyFirst) override; + void printPrivateHeaders() override; }; } // namespace @@ -10554,9 +10554,9 @@ PrintMachHeader(file, Verbose); } -void MachODumper::printPrivateHeaders(bool OnlyFirst) { +void MachODumper::printPrivateHeaders() { printMachOFileHeader(&Obj); - if (!OnlyFirst) + if (!FirstPrivateHeader) printMachOLoadCommands(&Obj); } diff --git a/llvm/tools/llvm-objdump/WasmDump.cpp b/llvm/tools/llvm-objdump/WasmDump.cpp --- a/llvm/tools/llvm-objdump/WasmDump.cpp +++ b/llvm/tools/llvm-objdump/WasmDump.cpp @@ -25,7 +25,7 @@ public: WasmDumper(const WasmObjectFile &O) : Dumper(O), Obj(O) {} - void printPrivateHeaders(bool MachOOnlyFirst) override; + void printPrivateHeaders() override; }; } // namespace @@ -34,7 +34,7 @@ return std::make_unique(Obj); } -void WasmDumper::printPrivateHeaders(bool) { +void WasmDumper::printPrivateHeaders() { outs() << "Program Header:\n"; outs() << "Version: 0x"; outs().write_hex(Obj.getHeader().Version); diff --git a/llvm/tools/llvm-objdump/XCOFFDump.cpp b/llvm/tools/llvm-objdump/XCOFFDump.cpp --- a/llvm/tools/llvm-objdump/XCOFFDump.cpp +++ b/llvm/tools/llvm-objdump/XCOFFDump.cpp @@ -32,7 +32,7 @@ class XCOFFDumper : public objdump::Dumper { public: XCOFFDumper(const object::XCOFFObjectFile &O) : Dumper(O) {} - void printPrivateHeaders(bool MachOOnlyFirst) override; + void printPrivateHeaders() override {} }; } // namespace @@ -41,8 +41,6 @@ return std::make_unique(Obj); } -void XCOFFDumper::printPrivateHeaders(bool) {} - Error objdump::getXCOFFRelocationValueString(const XCOFFObjectFile &Obj, const RelocationRef &Rel, SmallVectorImpl &Result) { diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h --- a/llvm/tools/llvm-objdump/llvm-objdump.h +++ b/llvm/tools/llvm-objdump/llvm-objdump.h @@ -83,7 +83,7 @@ void reportUniqueWarning(Error Err); void reportUniqueWarning(const Twine &Msg); - virtual void printPrivateHeaders(bool MachOOnlyFirst); + virtual void printPrivateHeaders(); virtual void printDynamicRelocations() {} void printSymbolTable(StringRef ArchiveName, StringRef ArchitectureName = StringRef(), diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -2720,7 +2720,7 @@ outs() << FMP; } -void Dumper::printPrivateHeaders(bool) { +void Dumper::printPrivateHeaders() { reportError(O.getFileName(), "Invalid/Unsupported object file format"); } @@ -2855,7 +2855,7 @@ if (FileHeaders) printFileHeaders(O); if (PrivateHeaders || FirstPrivateHeader) - D.printPrivateHeaders(FirstPrivateHeader); + D.printPrivateHeaders(); if (SectionHeaders) printSectionHeaders(*O); if (SymbolTable)