Add support for static linking and swiftrt.o

Author: troughton

lib/Driver/Driver.cpp

@@ -215,18 +215,18 @@ Driver::buildToolChain(const llvm::opt::InputArgList &ArgList) {
     break;
   case llvm::Triple::Linux:
     if (target.isAndroid())
-      return llvm::make_unique<toolchains::Android>(driver, target);
+      return llvm::make_unique<toolchains::Android>(*this, target);
     else
-      return llvm::make_unique<toolchains::GenericUnix>(driver, target);
+      return llvm::make_unique<toolchains::GenericUnix>(*this, target);
     break;
   case llvm::Triple::FreeBSD:
     return llvm::make_unique<toolchains::GenericUnix>(*this, target);
     break;
   case llvm::Triple::Win32: 
     if (target.isWindowsCygwinEnvironment())
-      return llvm::make_unique<toolchains::Cygwin>(driver, target);
+      return llvm::make_unique<toolchains::Cygwin>(*this, target);
     else
-      return llvm::make_unique<toolchains::Windows>(driver, target);
+      return llvm::make_unique<toolchains::Windows>(*this, target);
     break;
   case llvm::Triple::Haiku:
     return llvm::make_unique<toolchains::GenericUnix>(*this, target);

lib/Driver/ToolChains.cpp

@@ -1581,18 +1581,39 @@ toolchains::Windows::constructInvocation(const LinkJobAction &job,
     Arguments.push_back(context.Args.MakeArgString(Target));
   }
 
+
   SmallString<128> SharedRuntimeLibPath;
   getRuntimeLibraryPath(SharedRuntimeLibPath, context.Args, *this);
-
-  // Add the runtime library link path, which is platform-specific and found
-  // relative to the compiler.
+    
+  // Link the standard library.
   Arguments.push_back("-L");
-  Arguments.push_back(context.Args.MakeArgString(SharedRuntimeLibPath + "/"
+  if (context.Args.hasFlag(options::OPT_static_stdlib,
+                            options::OPT_no_static_stdlib,
+                            false)) {
+    SmallString<128> StaticRuntimeLibPath;
+    getRuntimeStaticLibraryPath(StaticRuntimeLibPath, context.Args, *this);
+    
+    // Since Windows has separate libraries per architecture, link against the
+    // architecture specific version of the static library.
+    Arguments.push_back(context.Args.MakeArgString(StaticRuntimeLibPath + "/"
+                                                    + getTriple().getArchName()));
+
+    Arguments.push_back("-Xlinker");
+    Arguments.push_back("/NODEFAULTLIB:libcmt");
+  } else {
+    Arguments.push_back(context.Args.MakeArgString(SharedRuntimeLibPath + "/"
                           + getTriple().getArchName()));
+  }
 
+  SmallString<128> swiftrtPath = SharedRuntimeLibPath;
+  llvm::sys::path::append(swiftrtPath,
+                          swift::getMajorArchitectureName(getTriple()));
+  llvm::sys::path::append(swiftrtPath, "swiftrt.o");
+  Arguments.push_back(context.Args.MakeArgString(swiftrtPath));
+    
   addPrimaryInputsOfType(Arguments, context.Inputs, types::TY_Object);
   addInputsOfType(Arguments, context.InputActions, types::TY_Object);
-
+    
   for (const Arg *arg : context.Args.filtered(options::OPT_F,
                                               options::OPT_Fsystem)) {
     if (arg->getOption().matches(options::OPT_Fsystem))

test/Driver/sdk.swift

@@ -40,7 +40,7 @@
 // WINDOWS: -sdk {{.*}}/Inputs/clang-importer-sdk
 // WINDOWS-NEXT: bin/swift
 // WINDOWS: -sdk {{.*}}/Inputs/clang-importer-sdk
-// WINDOWS: bin/{{.+}} {{.*}}.o{{[ "]}}
+// WINDOWS: bin/{{.+}} {{.*}}swiftrt.o
 // WINDOWS: {{-syslibroot|--sysroot}} {{.*}}/Inputs/clang-importer-sdk
 
 // RUN: %swift_driver -driver-print-jobs -repl -sdk %S/Inputs/nonexistent-sdk 2>&1 | %FileCheck %s --check-prefix=SDKWARNING