Commit 6c50ad6e9f0223059d2ef62159e184ac829fc864 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2023-09-29 22:36:58+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2023-09-29 22:37:59+02:00
log	6c50ad6e9f0223059d2ef62159e184ac829fc864
tree	6eb9007a7dec81363dc509acb721a8eefc56bc58
parent	e5e69846527d429208462f4c1d278d9899899fd8

`SHT_NOBITS` sections take no file space after all.

1 files changed, 6 insertions(+), 4 deletions(-)

src/link/Elf.zig+6-4

 @@ -367,10 +367,12 @@ fn detectAllocCollision(self: *Elf, start: u64, size: u64) ?u64 {
         }
     }
-    for (self.shdrs.items) |section| {
+    for (self.shdrs.items) |shdr| {
-        const increased_size = padToIdeal(section.sh_size);
+        // SHT_NOBITS takes no physical space in the output file so set its size to 0.
-        const test_end = section.sh_offset + increased_size;
+        const sh_size = if (shdr.sh_type == elf.SHT_NOBITS) 0 else shdr.sh_size;
-        if (end > section.sh_offset and start < test_end) {
+        const increased_size = padToIdeal(sh_size);
+        const test_end = shdr.sh_offset + increased_size;
+        if (end > shdr.sh_offset and start < test_end) {
             return test_end;
         }
     }