[llvm][llvm-objcopy] When outputting to binary don't output segments that cover no...

Sometimes LLD will produce a PT_LOAD segment that only covers the
headers (and covers no sections). GNU objcopy does not output the
segment contents for these sections. In particular this is an issue in
building magenta because the final link step for the kernel would
produce just such a PT_LOAD segment. This change is to support this case
and to match what GNU objcopy does in this case.

Patch by Jake Ehrlich

Differential Revision: https://reviews.llvm.org/D36196

llvm-svn: 310149

diff --git a/llvm/test/tools/llvm-objcopy/Inputs/pt-phdr.elf b/llvm/test/tools/llvm-objcopy/Inputs/pt-phdr.elf
new file mode 100644 (file)
index 0000000..cede0e7
Binary files /dev/null and b/llvm/test/tools/llvm-objcopy/Inputs/pt-phdr.elf differ

diff --git a/llvm/test/tools/llvm-objcopy/sectionless-segment.test b/llvm/test/tools/llvm-objcopy/sectionless-segment.test
new file mode 100644 (file)
index 0000000..054e84f
--- /dev/null
+++ b/llvm/test/tools/llvm-objcopy/sectionless-segment.test
@@ -0,0 +1,4 @@
+# RUN: llvm-objcopy -O binary %p/Inputs/pt-phdr.elf %t
+# RUN: wc -c < %t | FileCheck %s
+
+# CHECK: 4110

diff --git a/llvm/tools/llvm-objcopy/Object.cpp b/llvm/tools/llvm-objcopy/Object.cpp
index 576f660bd989fb6f18e34f23c7352c3cd7b3a0a4..adb25435a5b43ca04c59fd1fbd5a5267ac1c99ae 100644 (file)
--- a/llvm/tools/llvm-objcopy/Object.cpp
+++ b/llvm/tools/llvm-objcopy/Object.cpp
@@ -354,7 +354,10 @@ template <class ELFT> size_t BinaryObject<ELFT>::totalSize() const {
 template <class ELFT>
 void BinaryObject<ELFT>::write(FileOutputBuffer &Out) const {
   for (auto &Segment : this->Segments) {
-    if (Segment->Type == llvm::ELF::PT_LOAD) {
+    // GNU objcopy does not output segments that do not cover a section. Such
+    // segments can sometimes be produced by LLD due to how LLD handles PT_PHDR.
+    if (Segment->Type == llvm::ELF::PT_LOAD &&
+        Segment->firstSection() != nullptr) {
       Segment->writeSegment(Out);
     }
   }
@@ -373,7 +376,8 @@ template <class ELFT> void BinaryObject<ELFT>::finalize() {
 
   uint64_t Offset = 0;
   for (auto &Segment : this->Segments) {
-    if (Segment->Type == llvm::ELF::PT_LOAD) {
+    if (Segment->Type == llvm::ELF::PT_LOAD &&
+        Segment->firstSection() != nullptr) {
       Offset = alignTo(Offset, Segment->Align);
       Segment->Offset = Offset;
       Offset += Segment->FileSize;