Merge pull request #18266 from keith/ks/linker-order

Unify linker argument order across platforms

Author: jrose-apple

lib/Driver/DarwinToolChains.cpp

@@ -339,8 +339,6 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
     }
   }
 
-  context.Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
-  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
   for (const Arg *arg :
        context.Args.filtered(options::OPT_F, options::OPT_Fsystem)) {
     Arguments.push_back("-F");
@@ -477,6 +475,10 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job,
 
   Arguments.push_back("-no_objc_category_merging");
 
+  // These custom arguments should be right before the object file at the end.
+  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  context.Args.AddAllArgValues(Arguments, options::OPT_Xlinker);
+
   // This should be the last option, for convenience in checking output.
   Arguments.push_back("-o");
   Arguments.push_back(

lib/Driver/UnixToolChains.cpp

@@ -317,14 +317,15 @@ toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
         Twine("-u", llvm::getInstrProfRuntimeHookVarName())));
   }
 
-  context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
-  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
-
   // Run clang++ in verbose mode if "-v" is set
   if (context.Args.hasArg(options::OPT_v)) {
     Arguments.push_back("-v");
   }
 
+  // These custom arguments should be right before the object file at the end.
+  context.Args.AddAllArgs(Arguments, options::OPT_linker_option_Group);
+  context.Args.AddAllArgs(Arguments, options::OPT_Xlinker);
+
   // This should be the last option, for convenience in checking output.
   Arguments.push_back("-o");
   Arguments.push_back(

test/Driver/linker.swift

@@ -43,6 +43,12 @@
 // RUN: %FileCheck %s < %t.complex.txt
 // RUN: %FileCheck -check-prefix COMPLEX %s < %t.complex.txt
 
+// RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-ios7.1 -Xlinker -rpath -Xlinker customrpath -L foo %s 2>&1 > %t.simple.txt
+// RUN: %FileCheck -check-prefix IOS-linker-order %s < %t.simple.txt
+
+// RUN: %swiftc_driver -driver-print-jobs -target armv7-unknown-linux-gnueabihf -Xlinker -rpath -Xlinker customrpath -L foo %s 2>&1 > %t.linux.txt
+// RUN: %FileCheck -check-prefix LINUX-linker-order %s < %t.linux.txt
+
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 -g %s | %FileCheck -check-prefix DEBUG %s
 
 // RUN: %empty-directory(%t)
@@ -286,6 +292,24 @@
 // LINUX_DYNLIB-x86_64-DAG: -L bar
 // LINUX_DYNLIB-x86_64: -o dynlib.out
 
+// IOS-linker-order: swift
+// IOS-linker-order: -o [[OBJECTFILE:.*]]
+
+// IOS-linker-order: bin/ld{{"? }}
+// IOS-linker-order: -rpath [[STDLIB_PATH:[^ ]+/lib/swift/iphonesimulator]]
+// IOS-linker-order: -L foo
+// IOS-linker-order: -rpath customrpath
+// IOS-linker-order: -o {{.*}}
+
+// LINUX-linker-order: swift
+// LINUX-linker-order: -o [[OBJECTFILE:.*]]
+
+// LINUX-linker-order: clang++{{"? }}
+// LINUX-linker-order: -Xlinker -rpath -Xlinker {{[^ ]+/lib/swift/linux}}
+// LINUX-linker-order: -L foo
+// LINUX-linker-order: -Xlinker -rpath -Xlinker customrpath
+// LINUX-linker-order: -o {{.*}}
+
 // DEBUG: bin/swift
 // DEBUG-NEXT: bin/swift
 // DEBUG-NEXT: bin/ld{{"? }}