Fix various problems

Author: stevapple

Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

@@ -60,7 +60,7 @@ extension Toolchain {
       let root = try? AbsolutePath(validating: vctools) {
         let archName: String = {
           switch triple.arch {
-          case .aarch64, .aarch64_32: return "arm64"
+          case .aarch64: return "arm64"
           case .arm: return "arm"
           case .x86: return "x86"
           case nil, .x86_64: return "x64"
@@ -280,4 +280,4 @@ extension DarwinToolchain {
 
 }
 
-// TODO: See whether Windows needs `addArgsToLinkStdlib`.
+// TODO: Implement `addArgsToLinkStdlib` for `WindowsToolchain`.

Sources/SwiftDriver/Jobs/WindowsToolchain+LinkerSupport.swift

@@ -27,24 +27,26 @@ extension WindowsToolchain {
     let targetTriple = targetInfo.target.triple
     switch linkerOutputType {
     case .dynamicLibrary:
-      // Same options as an executable, just with '-shared'
       commandLine.appendFlags("-parse-as-library", "-emit-library")
-      fallthrough
     case .executable:
       if !targetTriple.triple.isEmpty {
         commandLine.appendFlag("-target")
         commandLine.appendFlag(targetTriple.triple)
       }
-        commandLine.appendFlag("-emit-executable")
+      commandLine.appendFlag("-emit-executable")
     default:
       break
     }
-    
+
     switch linkerOutputType {
     case .staticLibrary:
-        commandLine.append(.joinedOptionAndPath("-out:", outputFile))
-        commandLine.append(contentsOf: inputs.map { .path($0.file) })
+      commandLine.append(.joinedOptionAndPath("-out:", outputFile))
+      commandLine.append(contentsOf: inputs.map { .path($0.file) })
+      if commandLine.contains(.flag("-use-ld=lld")) {
+        return try lookup(executable: "llvm-lib.exe")
+      }
       return try getToolPath(.staticLinker)
+    // TODO: Check for `-use-ld=lld`.
     default:
         // Configure the toolchain.
         //
@@ -93,17 +95,6 @@ extension WindowsToolchain {
           isShared: hasRuntimeArgs
         )
 
-        if hasRuntimeArgs {
-          // FIXME: We probably shouldn't be adding an rpath here unless we know
-          //        ahead of time the standard library won't be copied.
-          for path in runtimePaths {
-            commandLine.appendFlag(.Xlinker)
-            commandLine.appendFlag("-rpath")
-            commandLine.appendFlag(.Xlinker)
-            commandLine.appendPath(path)
-          }
-        }
-
         let sharedResourceDirPath = try computeResourceDirPath(
           for: targetTriple,
           parsedOptions: &parsedOptions,
@@ -214,6 +205,5 @@ extension WindowsToolchain {
         commandLine.appendPath(outputFile)
         return clangPath
     }
-
   }
 }

Sources/SwiftDriver/Toolchains/WindowsToolchain.swift

@@ -55,16 +55,16 @@ public final class WindowsToolchain: Toolchain {
     case .swiftCompiler:
       return try lookup(executable: "swift-frontend.exe")
     case .staticLinker:
-      return try lookup(executable: "llvm-lib.exe")
+      return try lookup(executable: "lib.exe")
     case .dynamicLinker:
       // FIXME: This needs to look in the tools_directory first.
-      return try lookup(executable: "lld-link.exe")
+      return try lookup(executable: "link.exe")
     case .clang:
       return try lookup(executable: "clang.exe")
     case .swiftAutolinkExtract:
-      return try lookup(executable: "swift-autolink-extract.exe")
+      fatalError("Trying to look up \"swift-autolink-extract\" on Windows")
     case .dsymutil:
-      return try lookup(executable: "dsymutil.exe")
+      fatalError("Trying to look up \"dsymutil\" on Windows")
     case .lldb:
       return try lookup(executable: "lldb.exe")
     case .dwarfdump:
@@ -89,6 +89,15 @@ public final class WindowsToolchain: Toolchain {
     targetTriple: Triple,
     isShared: Bool
   ) throws -> String {
-    return "clang_rt.\(sanitizer.libraryName)-\(targetTriple.archName).dll"
+    let archName: String = {
+      switch targetTriple.arch {
+      case .aarch64: return "aarch64"
+      case .arm: return "armv7"
+      case .x86: return "i386"
+      case nil, .x86_64: return "x86_64"
+      default: fatalError("unknown arch \(targetTriple.archName) on Windows")
+      }
+    }()
+    return "clang_rt.\(sanitizer.libraryName)-\(archName).lib"
   }
 }