summaryrefslogtreecommitdiffstats
path: root/llvm/tools
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/tools')
-rw-r--r--llvm/tools/llvm-objcopy/Object.cpp45
-rw-r--r--llvm/tools/llvm-objcopy/Object.h1
-rw-r--r--llvm/tools/llvm-objcopy/llvm-objcopy.cpp22
3 files changed, 20 insertions, 48 deletions
diff --git a/llvm/tools/llvm-objcopy/Object.cpp b/llvm/tools/llvm-objcopy/Object.cpp
index 797d8f961e4..2bd3aa16f0b 100644
--- a/llvm/tools/llvm-objcopy/Object.cpp
+++ b/llvm/tools/llvm-objcopy/Object.cpp
@@ -575,20 +575,14 @@ void Object<ELFT>::writeHeader(FileOutputBuffer &Out) const {
Ehdr.e_version = Version;
Ehdr.e_entry = Entry;
Ehdr.e_phoff = sizeof(Elf_Ehdr);
+ Ehdr.e_shoff = SHOffset;
Ehdr.e_flags = Flags;
Ehdr.e_ehsize = sizeof(Elf_Ehdr);
Ehdr.e_phentsize = sizeof(Elf_Phdr);
Ehdr.e_phnum = Segments.size();
Ehdr.e_shentsize = sizeof(Elf_Shdr);
- if (WriteSectionHeaders) {
- Ehdr.e_shoff = SHOffset;
- Ehdr.e_shnum = Sections.size() + 1;
- Ehdr.e_shstrndx = SectionNames->Index;
- } else {
- Ehdr.e_shoff = 0;
- Ehdr.e_shnum = 0;
- Ehdr.e_shstrndx = 0;
- }
+ Ehdr.e_shnum = Sections.size() + 1;
+ Ehdr.e_shstrndx = SectionNames->Index;
}
template <class ELFT>
@@ -639,10 +633,12 @@ void Object<ELFT>::removeSections(
if (SymbolTable != nullptr && ToRemove(*SymbolTable))
SymbolTable = nullptr;
if (ToRemove(*SectionNames)) {
- if (WriteSectionHeaders)
- error("Cannot remove " + SectionNames->Name +
- " because it is the section header string table.");
- SectionNames = nullptr;
+ // Right now llvm-objcopy always outputs section headers. This will not
+ // always be the case. Eventully the section header table will become
+ // optional and if no section header is output then there dosn't need to be
+ // a section header string table.
+ error("Cannot remove " + SectionNames->Name +
+ " because it is the section header string table.");
}
// Now make sure there are no remaining references to the sections that will
// be removed. Sometimes it is impossible to remove a reference so we emit
@@ -736,34 +732,29 @@ template <class ELFT> void ELFObject<ELFT>::assignOffsets() {
}
}
- if (this->WriteSectionHeaders) {
- Offset = alignTo(Offset, sizeof(typename ELFT::Addr));
- }
+ Offset = alignTo(Offset, sizeof(typename ELFT::Addr));
this->SHOffset = Offset;
}
template <class ELFT> size_t ELFObject<ELFT>::totalSize() const {
// We already have the section header offset so we can calculate the total
// size by just adding up the size of each section header.
- auto NullSectionSize = this->WriteSectionHeaders ? sizeof(Elf_Shdr) : 0;
return this->SHOffset + this->Sections.size() * sizeof(Elf_Shdr) +
- NullSectionSize;
+ sizeof(Elf_Shdr);
}
template <class ELFT> void ELFObject<ELFT>::write(FileOutputBuffer &Out) const {
this->writeHeader(Out);
this->writeProgramHeaders(Out);
this->writeSectionData(Out);
- if (this->WriteSectionHeaders)
- this->writeSectionHeaders(Out);
+ this->writeSectionHeaders(Out);
}
template <class ELFT> void ELFObject<ELFT>::finalize() {
// Make sure we add the names of all the sections.
- if (this->SectionNames != nullptr)
- for (const auto &Section : this->Sections) {
- this->SectionNames->addString(Section->Name);
- }
+ for (const auto &Section : this->Sections) {
+ this->SectionNames->addString(Section->Name);
+ }
// Make sure we add the names of all the symbols.
if (this->SymbolTable != nullptr)
this->SymbolTable->addSymbolNames();
@@ -772,16 +763,14 @@ template <class ELFT> void ELFObject<ELFT>::finalize() {
assignOffsets();
// Finalize SectionNames first so that we can assign name indexes.
- if (this->SectionNames != nullptr)
- this->SectionNames->finalize();
+ this->SectionNames->finalize();
// Finally now that all offsets and indexes have been set we can finalize any
// remaining issues.
uint64_t Offset = this->SHOffset + sizeof(Elf_Shdr);
for (auto &Section : this->Sections) {
Section->HeaderOffset = Offset;
Offset += sizeof(Elf_Shdr);
- if (this->WriteSectionHeaders)
- Section->NameIndex = this->SectionNames->findIndex(Section->Name);
+ Section->NameIndex = this->SectionNames->findIndex(Section->Name);
Section->finalize();
}
}
diff --git a/llvm/tools/llvm-objcopy/Object.h b/llvm/tools/llvm-objcopy/Object.h
index f6088434805..391465db65e 100644
--- a/llvm/tools/llvm-objcopy/Object.h
+++ b/llvm/tools/llvm-objcopy/Object.h
@@ -346,7 +346,6 @@ public:
uint32_t Machine;
uint32_t Version;
uint32_t Flags;
- bool WriteSectionHeaders = true;
Object(const llvm::object::ELFObjectFile<ELFT> &Obj);
void removeSections(std::function<bool(const SectionBase &)> ToRemove);
diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
index 7f55a434b33..d76735482d6 100644
--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -56,14 +56,11 @@ cl::opt<std::string> OutputFilename(cl::Positional, cl::desc("<output>"),
cl::opt<std::string>
OutputFormat("O", cl::desc("set output format to one of the following:"
"\n\tbinary"));
+
cl::list<std::string> ToRemove("remove-section",
cl::desc("Remove a specific section"));
cl::alias ToRemoveA("R", cl::desc("Alias for remove-section"),
cl::aliasopt(ToRemove));
-cl::opt<bool> StripSections("strip-sections",
- cl::desc("Remove all section headers"));
-
-typedef std::function<bool(const SectionBase &Sec)> SectionPred;
void CopyBinary(const ELFObjectFile<ELF64LE> &ObjFile) {
std::unique_ptr<FileOutputBuffer> Buffer;
@@ -74,25 +71,12 @@ void CopyBinary(const ELFObjectFile<ELF64LE> &ObjFile) {
Obj = llvm::make_unique<BinaryObject<ELF64LE>>(ObjFile);
else
Obj = llvm::make_unique<ELFObject<ELF64LE>>(ObjFile);
-
- SectionPred RemovePred = [](const SectionBase &) { return false; };
-
if (!ToRemove.empty()) {
- RemovePred = [&](const SectionBase &Sec) {
+ Obj->removeSections([&](const SectionBase &Sec) {
return std::find(std::begin(ToRemove), std::end(ToRemove), Sec.Name) !=
std::end(ToRemove);
- };
+ });
}
-
- if (StripSections) {
- RemovePred = [RemovePred](const SectionBase &Sec) {
- return RemovePred(Sec) || (Sec.Flags & SHF_ALLOC) == 0;
- };
- Obj->WriteSectionHeaders = false;
- }
-
- Obj->removeSections(RemovePred);
-
Obj->finalize();
ErrorOr<std::unique_ptr<FileOutputBuffer>> BufferOrErr =
FileOutputBuffer::create(OutputFilename, Obj->totalSize(),
OpenPOWER on IntegriCloud