diff options
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 9 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/section-metadata.s | 33 |
2 files changed, 41 insertions, 1 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index f7bc2370ba4..22a5b639469 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -406,8 +406,15 @@ void LinkerScript::processCommands(OutputSectionFactory &Factory) { } // Add input sections to an output section. - for (InputSectionBase *S : V) + unsigned Pos = 0; + for (InputSectionBase *S : V) { + // The actual offset will be computed during + // assignAddresses. For now, use the index as a very crude + // approximation so that it is at least easy for other code to + // know the section order. + cast<InputSection>(S)->OutSecOff = Pos++; Factory.addInputSec(S, Cmd->Name, Cmd->Sec); + } } } CurOutSec = nullptr; diff --git a/lld/test/ELF/linkerscript/section-metadata.s b/lld/test/ELF/linkerscript/section-metadata.s new file mode 100644 index 00000000000..f447240ac3a --- /dev/null +++ b/lld/test/ELF/linkerscript/section-metadata.s @@ -0,0 +1,33 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o + +# RUN: echo "SECTIONS { .text : { *(.text.bar) *(.text.foo) } }" > %t.script +# RUN: ld.lld -o %t --script %t.script %t.o +# RUN: llvm-objdump -s %t | FileCheck %s + +# RUN: echo "SECTIONS { .text : { *(.text.foo) *(.text.bar) } }" > %t.script +# RUN: ld.lld -o %t --script %t.script %t.o +# RUN: llvm-objdump -s %t | FileCheck --check-prefix=INV %s + + +# CHECK: Contents of section .text: +# CHECK-NEXT: 02000000 00000000 01000000 00000000 +# CHECK: Contents of section .rodata: +# CHECK-NEXT: 02000000 00000000 01000000 00000000 + +# INV: Contents of section .text: +# INV-NEXT: 01000000 00000000 02000000 00000000 +# INV: Contents of section .rodata: +# INV-NEXT: 01000000 00000000 02000000 00000000 + +.global _start +_start: + +.section .text.bar,"a",@progbits +.quad 2 +.section .text.foo,"a",@progbits +.quad 1 +.section .rodata.foo,"ao",@progbits,.text.foo +.quad 1 +.section .rodata.bar,"ao",@progbits,.text.bar +.quad 2 |
