Index: ELF/SyntheticSections.cpp =================================================================== --- ELF/SyntheticSections.cpp +++ ELF/SyntheticSections.cpp @@ -497,10 +497,10 @@ } // The LSB standard does not allow a .eh_frame section with zero - // Call Frame Information records. Therefore add a CIE record length - // 0 as a terminator if this .eh_frame section is empty. - if (Off == 0) - Off = 4; + // Call Frame Information records. glibc unwind-dw2-fde.c + // classify_object_over_fdes expects there is a CIE record length 0 as a + // terminator. Thus we add one unconditionally. + Off += 4; this->Size = Off; } Index: test/ELF/eh-frame-hdr-icf-fde.s =================================================================== --- test/ELF/eh-frame-hdr-icf-fde.s +++ test/ELF/eh-frame-hdr-icf-fde.s @@ -52,7 +52,7 @@ # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x200178 # CHECK-NEXT: Offset: 0x178 -# CHECK-NEXT: Size: 72 +# CHECK-NEXT: Size: 76 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 # CHECK-NEXT: AddressAlignment: 8 @@ -62,7 +62,7 @@ # CHECK-NEXT: 0010: 1B0C0708 90010000 14000000 1C000000 # CHECK-NEXT: 0020: 680E0000 01000000 00000000 00000000 # CHECK-NEXT: 0030: 14000000 34000000 520E0000 01000000 -# CHECK-NEXT: 0040: 00000000 00000000 +# CHECK-NEXT: 0040: 00000000 00000000 00000000 # CHECK-NEXT: ) # CHECK-NEXT: } Index: test/ELF/eh-frame-hdr.s =================================================================== --- test/ELF/eh-frame-hdr.s +++ test/ELF/eh-frame-hdr.s @@ -92,7 +92,7 @@ // HDR-NEXT: ] // HDR-NEXT: Address: 0x200180 // HDR-NEXT: Offset: 0x180 -// HDR-NEXT: Size: 96 +// HDR-NEXT: Size: 100 // HDR-NEXT: Link: 0 // HDR-NEXT: Info: 0 // HDR-NEXT: AddressAlignment: 8 @@ -104,6 +104,7 @@ // HDR-NEXT: 0030: 14000000 34000000 490E0000 01000000 // HDR-NEXT: 0040: 00000000 00000000 14000000 4C000000 // HDR-NEXT: 0050: 320E0000 01000000 00000000 00000000 +// HDR-NEXT: 0060: 00000000 // HDR-NEXT: ) // CIE: 14000000 00000000 017A5200 01781001 1B0C0708 90010000 // FDE(1): 14000000 1C000000 600E0000 01000000 00000000 00000000 Index: test/ELF/eh-frame-merge.s =================================================================== --- test/ELF/eh-frame-merge.s +++ test/ELF/eh-frame-merge.s @@ -27,7 +27,7 @@ // CHECK-NEXT: ] // CHECK-NEXT: Address: // CHECK-NEXT: Offset: -// CHECK-NEXT: Size: 96 +// CHECK-NEXT: Size: 100 // CHECK-NEXT: Link: 0 // CHECK-NEXT: Info: 0 // CHECK-NEXT: AddressAlignment: 8 @@ -39,6 +39,7 @@ // CHECK-NEXT: 0030: 14000000 34000000 D20D0000 02000000 | // CHECK-NEXT: 0040: 00000000 00000000 14000000 4C000000 | // CHECK-NEXT: 0050: B90D0000 01000000 00000000 00000000 | +// CHECK-NEXT: 0060: 00000000 // CHECK-NEXT: ) // CHECK: Name: foo Index: test/ELF/ehframe-relocation.s =================================================================== --- test/ELF/ehframe-relocation.s +++ test/ELF/ehframe-relocation.s @@ -12,7 +12,7 @@ // CHECK-NEXT: ] // CHECK-NEXT: Address: 0x200120 // CHECK-NEXT: Offset: -// CHECK-NEXT: Size: 48 +// CHECK-NEXT: Size: 52 // CHECK-NOT: .eh_frame // 0x200120 = 2097440 Index: test/ELF/invalid-fde-rel.s =================================================================== --- test/ELF/invalid-fde-rel.s +++ test/ELF/invalid-fde-rel.s @@ -33,4 +33,4 @@ .long 0x0 .long 0x0 -// CHECK: 1 .eh_frame 00000018 +// CHECK: 1 .eh_frame 0000001c Index: test/ELF/linkerscript/eh-frame-hdr.s =================================================================== --- test/ELF/linkerscript/eh-frame-hdr.s +++ test/ELF/linkerscript/eh-frame-hdr.s @@ -4,7 +4,7 @@ # RUN: ld.lld -o %t1 --eh-frame-hdr --script %t.script %t # RUN: llvm-objdump -s -section=".eh_frame_hdr" %t1 | FileCheck %s -# CHECK: 011b033b 14000000 01000000 49000000 +# CHECK: 011b033b 14000000 01000000 4d000000 # CHECK-NEXT: 30000000 .global _start Index: test/ELF/linkerscript/map-file2.test =================================================================== --- test/ELF/linkerscript/map-file2.test +++ test/ELF/linkerscript/map-file2.test @@ -32,7 +32,7 @@ # CHECK-NEXT: 1124 3114 1 4 {{.*}}{{/|\\}}map-file2.test.tmp.o:(.text) # CHECK-NEXT: 1124 3114 0 1 f(int) # CHECK-NEXT: 1124 3114 0 1 _start -# CHECK-NEXT: 1128 3118 30 8 .eh_frame +# CHECK-NEXT: 1128 3118 34 8 .eh_frame # CHECK-NEXT: 1128 3118 30 1 {{.*}}{{/|\\}}map-file2.test.tmp.o:(.eh_frame+0x0) # CHECK-NEXT: 0 0 8 1 .comment # CHECK-NEXT: 0 0 8 1 :(.comment) Index: test/ELF/linkerscript/synthetic-symbols1.test =================================================================== --- test/ELF/linkerscript/synthetic-symbols1.test +++ test/ELF/linkerscript/synthetic-symbols1.test @@ -41,7 +41,7 @@ # CHECK: 0000000000000128 .foo 00000000 .hidden _end_sec # CHECK-NEXT: 0000000000000120 .foo 00000000 _begin_sec # CHECK-NEXT: 0000000000000128 *ABS* 00000000 _end_sec_abs -# CHECK-NEXT: 0000000000001048 .text 00000000 _start +# CHECK-NEXT: 000000000000104c .text 00000000 _start # CHECK-NEXT: 0000000000000120 .foo 00000000 begin_foo # CHECK-NEXT: 0000000000000128 .foo 00000000 end_foo # CHECK-NEXT: 0000000000000008 *ABS* 00000000 size_foo_1 Index: test/ELF/map-file.s =================================================================== --- test/ELF/map-file.s +++ test/ELF/map-file.s @@ -53,7 +53,7 @@ // CHECK-NEXT: 2002d0 2002d0 30 8 :(.rela.dyn) // CHECK-NEXT: 200300 200300 30 8 .rela.plt // CHECK-NEXT: 200300 200300 30 8 :(.rela.plt) -// CHECK-NEXT: 200330 200330 60 8 .eh_frame +// CHECK-NEXT: 200330 200330 64 8 .eh_frame // CHECK-NEXT: 200330 200330 2c 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x0) // CHECK-NEXT: 200360 200360 14 1 {{.*}}{{/|\\}}map-file.s.tmp1.o:(.eh_frame+0x2c) // CHECK-NEXT: 200378 200378 18 1 {{.*}}{{/|\\}}map-file.s.tmp2.o:(.eh_frame+0x18) Index: test/ELF/relocatable-eh-frame.s =================================================================== --- test/ELF/relocatable-eh-frame.s +++ test/ELF/relocatable-eh-frame.s @@ -5,7 +5,7 @@ # RUN: ld.lld %t -o %t.so -shared # RUN: llvm-objdump -h %t.so | FileCheck --check-prefix=DSO %s -# DSO: .eh_frame 00000030 +# DSO: .eh_frame 00000034 # CHECK: Relocations [ # CHECK-NEXT: Section ({{.*}}) .rela.eh_frame {