From: George Rimar Date: Fri, 14 Apr 2017 09:37:00 +0000 (+0000) Subject: [ELF] - Linkerscript: make section with no content to be SHT_PROGBITS by default. X-Git-Tag: llvmorg-5.0.0-rc1~7689 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1022112d770f49b3697d2b7267f5f9915409de41;p=platform%2Fupstream%2Fllvm.git [ELF] - Linkerscript: make section with no content to be SHT_PROGBITS by default. Imagine next script: SECTIONS { BYTE(0x11); } Section content written to disk will be 0x11. Previous LLD behavior was to make this section SHT_NOBITS. What is not correct because section has content. ld.bfd makes such sections SHT_PROGBITS, this patch do the same. This fixes PR32537 Differential revision: https://reviews.llvm.org/D32016 llvm-svn: 300317 --- diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 5a9e465..ab2ca22 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -632,7 +632,7 @@ void LinkerScript::adjustSectionsBeforeSorting() { // '.' is assigned to, but creating these section should not have any bad // consequeces and gives us a section to put the symbol in. uint64_t Flags = SHF_ALLOC; - uint32_t Type = SHT_NOBITS; + uint32_t Type = SHT_PROGBITS; for (BaseCommand *Base : Opt.Commands) { auto *Cmd = dyn_cast(Base); if (!Cmd) diff --git a/lld/test/ELF/linkerscript/orphan-first-cmd.s b/lld/test/ELF/linkerscript/orphan-first-cmd.s index 3fb3b31..263cb30 100644 --- a/lld/test/ELF/linkerscript/orphan-first-cmd.s +++ b/lld/test/ELF/linkerscript/orphan-first-cmd.s @@ -4,7 +4,7 @@ # RUN: foo = 123; \ # RUN: . = 0x1000; \ # RUN: . = 0x2000; \ -# RUN: .bar : { . = . + 1; } \ +# RUN: .bar : { *(.bar) } \ # RUN: }" > %t.script # RUN: ld.lld -o %t -T %t.script %t.o -shared # RUN: llvm-readobj -s %t | FileCheck %s @@ -16,3 +16,5 @@ # CHECK-NEXT: SHF_EXECINSTR # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x1000 + +.section .bar, "aw" diff --git a/lld/test/ELF/linkerscript/symbol-only.s b/lld/test/ELF/linkerscript/symbol-only.s index 76d54f0..2fb5726 100644 --- a/lld/test/ELF/linkerscript/symbol-only.s +++ b/lld/test/ELF/linkerscript/symbol-only.s @@ -12,7 +12,7 @@ # CHECK: Sections: # CHECK-NEXT: Idx Name Size Address # CHECK-NEXT: 0 00000000 0000000000000000 -# CHECK: abc 00000000 [[ADDR:[0-9a-f]*]] BSS +# CHECK: abc 00000000 [[ADDR:[0-9a-f]*]] DATA # CHECK-NEXT: bar 00000000 0000000000001000 DATA # CHECK: SYMBOL TABLE: