[lld] r301830 - Fix pr32816.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon May  1 15:32:39 2017
New Revision: 301830

URL: http://llvm.org/viewvc/llvm-project?rev=301830&view=rev
Log:
Fix pr32816.

When using linkerscripts we were trying to sort SHF_LINK_ORDER
sections too early. Instead of always doing two runs of
assignAddresses, record the section order in processCommands.

Added:
    lld/trunk/test/ELF/linkerscript/section-metadata.s
Modified:
    lld/trunk/ELF/LinkerScript.cpp

Modified: lld/trunk/ELF/LinkerScript.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=301830&r1=301829&r2=301830&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Mon May  1 15:32:39 2017
@@ -406,8 +406,15 @@ void LinkerScript::processCommands(Outpu
       }
 
       // 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;

Added: lld/trunk/test/ELF/linkerscript/section-metadata.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/section-metadata.s?rev=301830&view=auto
==============================================================================
--- lld/trunk/test/ELF/linkerscript/section-metadata.s (added)
+++ lld/trunk/test/ELF/linkerscript/section-metadata.s Mon May  1 15:32:39 2017
@@ -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", at progbits
+.quad 2
+.section .text.foo,"a", at progbits
+.quad 1
+.section .rodata.foo,"ao", at progbits,.text.foo
+.quad 1
+.section .rodata.bar,"ao", at progbits,.text.bar
+.quad 2