Merge branch amd-master into amd-common

Author: jenkins

ELF/LinkerScript.cpp

@@ -464,11 +464,6 @@ void LinkerScript::fabricateDefaultCommands() {
     OSCmd->Sec = Sec;
     SecToCommand[Sec] = OSCmd;
 
-    // Prefer user supplied address over additional alignment constraint
-    auto I = Config->SectionStartMap.find(Sec->Name);
-    if (I != Config->SectionStartMap.end())
-      OSCmd->AddrExpr = [=] { return I->second; };
-
     Commands.push_back(OSCmd);
     if (Sec->Sections.size()) {
       auto *ISD = make<InputSectionDescription>("");

ELF/Writer.cpp

@@ -1231,6 +1231,13 @@ template <class ELFT> void Writer<ELFT>::finalizeSections() {
     if (auto *Cmd = dyn_cast<OutputSectionCommand>(Base))
       OutputSectionCommands.push_back(Cmd);
 
+  // Prefer command line supplied address over other constraints.
+  for (OutputSectionCommand *Cmd : OutputSectionCommands) {
+    auto I = Config->SectionStartMap.find(Cmd->Name);
+    if (I != Config->SectionStartMap.end())
+      Cmd->AddrExpr = [=] { return I->second; };
+  }
+
   // This is a bit of a hack. A value of 0 means undef, so we set it
   // to 1 t make __ehdr_start defined. The section number is not
   // particularly relevant.

test/ELF/linkerscript/ttext-script.s

@@ -0,0 +1,11 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+# RUN: echo "SECTIONS { .text 0x200000 : { *(.text) } }" > %t.script
+# RUN: ld.lld -T %t.script -Ttext 0x100000 %t.o -o %t
+# RUN: llvm-readobj --elf-output-style=GNU -s  %t | FileCheck %s
+
+# CHECK: .text             PROGBITS        0000000000100000
+
+.global _start
+_start:
+nop

test/mach-o/executable-exports.yaml

@@ -42,5 +42,5 @@ global-symbols:
 ...
 
 # CHECK-NOT:  _myHidden
-# CHECK:      0x00000FFD  _myRegular
-# CHECK:      0x00000FFE  _myWeak [weak_def]
+# CHECK:      0x100000FFD  _myRegular
+# CHECK:      0x100000FFE  _myWeak [weak_def]