--- a/build/unix/elfhack/elfhack.cpp
+++ b/build/unix/elfhack/elfhack.cpp
@@ -191,22 +191,32 @@ public:
                         apply_relocations((ElfRel_Section<Elf_Rela> *)rel, *c);
                 }
             }
 
         ElfSection::serialize(file, ei_class, ei_data);
     }
 
     bool isRelocatable() {
-        return true;
+        return false;
     }
 
     unsigned int getEntryPoint() {
         return entry_point;
     }
+
+    void insertBefore(ElfSection *section, bool dirty = true) override {
+        // Adjust the address so that this section is adjacent to the one it's
+        // being inserted before. This avoids creating holes which subsequently
+        // might lead the PHDR-adjusting code to create unnecessary additional
+        // PT_LOADs.
+        shdr.sh_addr = (section->getAddr() - shdr.sh_size) & ~(shdr.sh_addralign - 1);
+        ElfSection::insertBefore(section, dirty);
+    }
+
 private:
     void add_code_section(ElfSection *section)
     {
         if (section) {
             /* Don't add section if it's already been added in the past */
             for (auto s = code.begin(); s != code.end(); ++s) {
                 if (section == *s)
                     return;

--- a/build/unix/elfhack/elfxx.h
+++ b/build/unix/elfhack/elfxx.h
@@ -378,17 +378,17 @@ public:
             next = nullptr;
         if (next != nullptr)
             next->previous = this;
         if (dirty)
             markDirty();
         insertInSegments(section->segments);
     }
 
-    void insertBefore(ElfSection *section, bool dirty = true) {
+    virtual void insertBefore(ElfSection *section, bool dirty = true) {
         if (previous != nullptr)
             previous->next = next;
         if (next != nullptr)
             next->previous = previous;
         next = section;
         if (section != nullptr) {
             previous = section->previous;
             section->previous = this;