Recalculate the size of the program header table

LucasSte · LucasSte · commit e5f2dd901e62 · 2026-01-09T14:20:59.000-03:00
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
@@ -338,6 +338,8 @@ template <class ELFT> void Writer<ELFT>::run() {
   // we know the size of the sections.
   for (Partition &part : ctx.partitions)
     removeEmptyPTLoad(ctx, part.phdrs);
+  ctx.out.programHeaders->size =
+        sizeof(Elf_Phdr) * ctx.mainPart->phdrs.size();
 
   if (!ctx.arg.oFormatBinary)
     assignFileOffsets();
diff --git a/lld/test/ELF/fill-trap-ppc.s b/lld/test/ELF/fill-trap-ppc.s
@@ -18,8 +18,8 @@
 # CHECK-NEXT: [ 3] .comment          PROGBITS        0000000000000000 020000 000008 01  MS  0   0  1
 
 # CHECK:      Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
-# CHECK-NEXT: PHDR           0x000040 0x0000000010000040 0x0000000010000040 0x000118 0x000118 R   0x8
-# CHECK-NEXT: LOAD           0x000000 0x0000000010000000 0x0000000010000000 0x000158 0x000158 R   0x10000
+# CHECK-NEXT: PHDR           0x000040 0x0000000010000040 0x0000000010000040 0x0000e0 0x0000e0 R   0x8
+# CHECK-NEXT: LOAD           0x000000 0x0000000010000000 0x0000000010000000 0x000120 0x000120 R   0x10000
 # CHECK-NEXT: LOAD           0x010000 0x0000000010010000 0x0000000010010000 0x010000 0x010000 R E 0x10000
 
 ## Check that executable page is filled with traps at its end.
diff --git a/lld/test/ELF/linkerscript/at8.test b/lld/test/ELF/linkerscript/at8.test
@@ -20,7 +20,7 @@ SECTIONS {
 # PT_LOAD header.
 
 # CHECK: Name              Type            Address          Off
-# CHECK: .text             PROGBITS        0000000008000000 000158
+# CHECK: .text             PROGBITS        0000000008000000 0000b0
 # CHECK: .sec1             PROGBITS        0000000020000000 001000
 # CHECK: .sec2             PROGBITS        0000000020000008 001008
 # CHECK: .sec3             PROGBITS        0000000020000010 001010
diff --git a/lld/test/ELF/linkerscript/empty-sections-expressions.test b/lld/test/ELF/linkerscript/empty-sections-expressions.test
@@ -9,7 +9,7 @@
 
 # CHECK:      Name   Type     Address          Off    Size
 # CHECK-NEXT:        NULL     0000000000000000 000000 000000
-# CHECK-NEXT: .empty PROGBITS 0000000000080000 000158 000000
+# CHECK-NEXT: .empty PROGBITS 0000000000080000 0000e8 000000
 # CHECK-NEXT: .text  PROGBITS 0000000000080000 001000 000001
 # CHECK-NEXT: .data  PROGBITS 0000000000080001 001001 000001
 
diff --git a/lld/test/ELF/linkerscript/enable-non-contiguous-regions.test b/lld/test/ELF/linkerscript/enable-non-contiguous-regions.test
@@ -72,7 +72,7 @@
 # RUN: llvm-readelf -S spill-merge | FileCheck %s --check-prefix=SPILL-MERGE
 
 # SPILL-MERGE:      Name          Type     Address          Off    Size
-# SPILL-MERGE:      .first  PROGBITS 0000000000000000 000190 000000
+# SPILL-MERGE:      .first  PROGBITS 0000000000000000 0000b0 000000
 # SPILL-MERGE-NEXT: .second PROGBITS 0000000000000001 001001 000002
 # SPILL-MERGE-NEXT: .third  PROGBITS 0000000000000003 001003 000000
 
diff --git a/lld/test/ELF/linkerscript/nobits-offset.s b/lld/test/ELF/linkerscript/nobits-offset.s
@@ -14,7 +14,7 @@
 
 # CHECK:      Name  Type     Address          Off     Size
 # CHECK-NEXT:       NULL     0000000000000000 000000  000000
-# CHECK-NEXT: .text PROGBITS 0000000000000000 000190  000000
+# CHECK-NEXT: .text PROGBITS 0000000000000000 0000e8  000000
 # CHECK-NEXT: .sec1 NOBITS   0000000000000000 001000  000001
 # CHECK-NEXT: .bss  NOBITS   0000000000000400 001400  000001
 
diff --git a/lld/test/ELF/linkerscript/section-class.test b/lld/test/ELF/linkerscript/section-class.test
@@ -301,7 +301,7 @@ SECTIONS {
 # RUN: llvm-readelf -S enable-non-contiguous-regions | FileCheck %s --check-prefix=ENABLE-NON-CONTIGUOUS-REGIONS
 
 # ENABLE-NON-CONTIGUOUS-REGIONS:      Name          Type     Address          Off    Size
-# ENABLE-NON-CONTIGUOUS-REGIONS:      .first_chance     PROGBITS 0000000000000000 000190 000000
+# ENABLE-NON-CONTIGUOUS-REGIONS:      .first_chance     PROGBITS 0000000000000000 0000e8 000000
 # ENABLE-NON-CONTIGUOUS-REGIONS-NEXT: .last_chance      PROGBITS 0000000000000001 001001 000002
 # ENABLE-NON-CONTIGUOUS-REGIONS-NEXT: .one_byte_section PROGBITS 0000000000000003 001003 000001
 
@@ -337,7 +337,7 @@ SECTIONS {
 # RUN: llvm-readelf -S -x .second spill-merge | FileCheck %s --check-prefix=SPILL-MERGE
 
 # SPILL-MERGE:      Name    Type     Address          Off    Size
-# SPILL-MERGE:      .first  PROGBITS 0000000000000000 000190 000000
+# SPILL-MERGE:      .first  PROGBITS 0000000000000000 0000b0 000000
 # SPILL-MERGE-NEXT: .second PROGBITS 0000000000000008 001008 000009
 # SPILL-MERGE-NEXT: .third  PROGBITS 0000000000000018 001018 000000
 # SPILL-MERGE:      Hex dump of section '.second':
diff --git a/lld/test/ELF/linkerscript/tls-nobits-offset.s b/lld/test/ELF/linkerscript/tls-nobits-offset.s
@@ -14,7 +14,7 @@
 
 # CHECK:      Name  Type     Address          Off     Size
 # CHECK-NEXT:       NULL     0000000000000000 000000  000000
-# CHECK-NEXT: .text PROGBITS 0000000000000000 000190  000000
+# CHECK-NEXT: .text PROGBITS 0000000000000000 0000e8  000000
 # CHECK-NEXT: .sec1 PROGBITS 0000000000000000 001000  000001
 # CHECK-NEXT: .tbss NOBITS   0000000000000400 001400  000001
 
diff --git a/lld/test/ELF/partition-notes.s b/lld/test/ELF/partition-notes.s
@@ -40,7 +40,7 @@
 // CHECK-NEXT:       Owner: GNU
 // CHECK-NEXT:       Data size:
 // CHECK-NEXT:       Type: NT_GNU_BUILD_ID (unique build ID bitstring)
-// CHECK-NEXT:       Build ID: d5101cb9d03b7e836ba9b64f5768a0b31980920f{{$}}
+// CHECK-NEXT:       Build ID: 3f73ca205e4241e96506d2175ee0134476175f85{{$}}
 // CHECK-NEXT:     }
 // CHECK-NEXT:	  ]
 // CHECK-NEXT:   }
diff --git a/lld/test/ELF/program-header-layout.s b/lld/test/ELF/program-header-layout.s
@@ -37,8 +37,8 @@ _start:
 # CHECK-NEXT:     Offset: 0x40
 # CHECK-NEXT:     VirtualAddress: 0x200040
 # CHECK-NEXT:     PhysicalAddress: 0x200040
-# CHECK-NEXT:     FileSize: 280
-# CHECK-NEXT:     MemSize: 280
+# CHECK-NEXT:     FileSize: 224
+# CHECK-NEXT:     MemSize: 224
 # CHECK-NEXT:     Flags [ (0x4)
 # CHECK-NEXT:       PF_R (0x4)
 # CHECK-NEXT:     ]
diff --git a/lld/test/ELF/riscv-attributes.s b/lld/test/ELF/riscv-attributes.s
@@ -104,12 +104,12 @@
 # UNKNOWN22:         warning: unknown22a.o:(.riscv.attributes): invalid tag 0x16 at offset 0x10
 
 # HDR:      Name              Type             Address          Off    Size   ES Flg Lk Inf Al
-# HDR:      .riscv.attributes RISCV_ATTRIBUTES 0000000000000000 000158 00005a 00      0   0  1{{$}}
+# HDR:      .riscv.attributes RISCV_ATTRIBUTES 0000000000000000 000120 00005a 00      0   0  1{{$}}
 
 # HDR:      Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
-# HDR:      LOAD           0x000000 0x0000000000010000 0x0000000000010000 0x000158 0x000158 R   0x1000
+# HDR:      LOAD           0x000000 0x0000000000010000 0x0000000000010000 0x000120 0x000120 R   0x1000
 # HDR-NEXT: GNU_STACK      0x000000 0x0000000000000000 0x0000000000000000 0x000000 0x000000 RW  0
-# HDR-NEXT: ATTRIBUTES     0x000158 0x0000000000000000 0x0000000000000000 0x00005a 0x00005a R   0x1{{$}}
+# HDR-NEXT: ATTRIBUTES     0x000120 0x0000000000000000 0x0000000000000000 0x00005a 0x00005a R   0x1{{$}}
 
 # CHECK:      BuildAttributes {
 # CHECK-NEXT:   FormatVersion: 0x41
diff --git a/lld/test/ELF/systemz-pie.s b/lld/test/ELF/systemz-pie.s
@@ -18,7 +18,7 @@
 
 # CHECK: Program Headers:
 # CHECK-NEXT:  Type           Offset   VirtAddr           PhysAddr           FileSiz  MemSiz   Flg Align
-# CHECK-NEXT:  PHDR           0x000040 0x0000000000000040 0x0000000000000040 0x000188 0x000188 R   0x8
+# CHECK-NEXT:  PHDR           0x000040 0x0000000000000040 0x0000000000000040 0x000150 0x000150 R   0x8
 # CHECK-NEXT:  LOAD           0x000000 0x0000000000000000 0x0000000000000000 0x00020d 0x00020d R   0x1000
 # CHECK-NEXT:  LOAD           0x000210 0x0000000000002210 0x0000000000002210 0x000090 0x000df0 RW  0x1000
 # CHECK-NEXT:  DYNAMIC        0x000210 0x0000000000002210 0x0000000000002210 0x000090 0x000090 RW  0x8
