[ELF] Don't add input sections twice when linker script is used
authorEugene Leviant <evgeny.leviant@gmail.com>
Thu, 18 Aug 2016 07:27:37 +0000 (07:27 +0000)
committerEugene Leviant <evgeny.leviant@gmail.com>
Thu, 18 Aug 2016 07:27:37 +0000 (07:27 +0000)
llvm-svn: 279036

lld/ELF/LinkerScript.cpp
lld/test/ELF/linkerscript/linkerscript-input-sec-dup.s [new file with mode: 0644]

index 922c7da..35a1a61 100644 (file)
@@ -284,7 +284,8 @@ void LinkerScript<ELFT>::createSections(OutputSectionFactory<ELFT> &Factory) {
       if (IsNew)
         OutputSections->push_back(OutSec);
       for (InputSectionBase<ELFT> *Sec : V)
-        OutSec->addSection(Sec);
+        if (!Sec->OutSec)
+          OutSec->addSection(Sec);
     }
   }
 
diff --git a/lld/test/ELF/linkerscript/linkerscript-input-sec-dup.s b/lld/test/ELF/linkerscript/linkerscript-input-sec-dup.s
new file mode 100644 (file)
index 0000000..f6f8c9c
--- /dev/null
@@ -0,0 +1,18 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
+
+# RUN: echo "SECTIONS {.foo : { *(.foo) *(.foo) } }" > %t.script
+# RUN: ld.lld -o %t1 --script %t.script %t
+# RUN: llvm-objdump -section-headers %t1 | FileCheck %s
+# CHECK:      Sections:
+# CHECK-NEXT: Idx Name          Size      Address          Type
+# CHECK-NEXT:   0               00000000 0000000000000000
+# CHECK-NEXT:   1 .foo          00000004 0000000000000120 DATA
+# CHECK-NEXT:   2 .text         00000001 0000000000000124 TEXT DATA
+
+.global _start
+_start:
+ nop
+
+.section .foo,"a"
+ .long 0