[Unix] Move all ELF SDK runtime libraries into their own architecture-specific directories

This is needed for all platforms that don't have multi-architecture libraries
like Darwin. Also, add the new architecture-specific rpath to the resulting
swift-driver and make it possible to cross-compile this repo for non-Darwin
platforms on Darwin.

The driver changes are the Swift translation of the Driver-specific changes of
swiftlang/swift#63782.

Resolves swiftlang/swift#63645

Author: finagolfin

Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

@@ -38,20 +38,6 @@ extension GenericUnixToolchain {
     }
   }
 
-  private func majorArchitectureName(for triple: Triple) -> String {
-    // The concept of a "major" arch name only applies to Linux triples
-    guard triple.os == .linux else { return triple.archName }
-
-    // HACK: We don't wrap LLVM's ARM target architecture parsing, and we should
-    //       definitely not try to port it. This check was only normalizing
-    //       "armv7a/armv7r" and similar variants for armv6 to 'armv7' and
-    //       'armv6', so just take a brute-force approach
-    if triple.archName.contains("armv7") { return "armv7" }
-    if triple.archName.contains("armv6") { return "armv6" }
-    if triple.archName.contains("armv5") { return "armv5" }
-    return triple.archName
-  }
-
   public func addPlatformSpecificLinkerArgs(
     to commandLine: inout [Job.ArgTemplate],
     parsedOptions: inout ParsedOptions,

Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

@@ -38,7 +38,11 @@ extension Toolchain {
     isShared: Bool
   ) throws -> [VirtualPath] {
     let triple = targetInfo.target.triple
-    let resourceDirPath = VirtualPath.lookup(targetInfo.runtimeResourcePath.path).appending(component: triple.platformName() ?? "")
+    var resourceDirPath = VirtualPath.lookup(targetInfo.runtimeResourcePath.path).appending(component: triple.platformName() ?? "")
+    // Only Darwin has multi-architecture libraries, so link against architecture-specific libraries everywhere else.
+    if !triple.isDarwin {
+      resourceDirPath = resourceDirPath.appending(component: majorArchitectureName(for: triple))
+    }
     var result = [resourceDirPath]
 
     let secondaryResourceDir = computeSecondaryResourceDirPath(for: triple, primaryPath: resourceDirPath)
@@ -84,6 +88,20 @@ extension Toolchain {
       commandLine.appendFlag(match.option.spelling + match.argument.asSingle)
     }
   }
+
+  func majorArchitectureName(for triple: Triple) -> String {
+    // The concept of a "major" arch name only applies to Linux triples
+    guard triple.os == .linux else { return triple.archName }
+
+    // HACK: We don't wrap LLVM's ARM target architecture parsing, and we should
+    //       definitely not try to port it. This check was only normalizing
+    //       "armv7a/armv7r" and similar variants for armv6 to 'armv7' and
+    //       'armv6', so just take a brute-force approach
+    if triple.archName.contains("armv7") { return "armv7" }
+    if triple.archName.contains("armv6") { return "armv6" }
+    if triple.archName.contains("armv5") { return "armv5" }
+    return triple.archName
+  }
 }
 
 // MARK: - Common argument routines

Sources/SwiftDriver/Jobs/WindowsToolchain+LinkerSupport.swift

@@ -15,19 +15,6 @@ import SwiftOptions
 import func TSCBasic.lookupExecutablePath
 import struct TSCBasic.AbsolutePath
 
-private func architecture(for triple: Triple) -> String {
-  // The concept of a "major" arch name only applies to Linux triples
-  guard triple.os == .linux else { return triple.archName }
-
-  // HACK: We don't wrap LLVM's ARM target architecture parsing, and we should
-  //       definitely not try to port it. This check was only normalizing
-  //       "armv7a/armv7r" and similar variants for armv6 to 'armv7' and
-  //       'armv6', so just take a brute-force approach
-  if triple.archName.contains("armv7") { return "armv7" }
-  if triple.archName.contains("armv6") { return "armv6" }
-  return triple.archName
-}
-
 extension WindowsToolchain {
   public func addPlatformSpecificLinkerArgs(to commandLine: inout [Job.ArgTemplate],
                                             parsedOptions: inout ParsedOptions,
@@ -137,7 +124,7 @@ extension WindowsToolchain {
         rsrc = try VirtualPath(path: AbsolutePath(validating: sdk)
                                         .appending(components: "usr", "lib", "swift",
                                                    targetTriple.platformName() ?? "",
-                                                   architecture(for: targetTriple))
+                                                   majorArchitectureName(for: targetTriple))
                                         .pathString)
       } else {
         rsrc = VirtualPath.lookup(targetInfo.runtimeResourcePath.path)

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -6267,10 +6267,10 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(linkJob.kind, .link)
       XCTAssertTrue(linkJob.commandLine.contains(subsequence:
                                               ["-Xlinker", "-rpath",
-                                               "-Xlinker", .path(.relative(.init("resource/dir/linux")))]))
+                                               "-Xlinker", .path(.relative(.init("resource/dir/linux/x86_64")))]))
       XCTAssertTrue(linkJob.commandLine.contains(.path(.relative(.init("resource/dir/linux/x86_64/swiftrt.o")))))
       XCTAssertTrue(linkJob.commandLine.contains(subsequence:
-                                              ["-L", .path(.relative(.init("resource/dir/linux")))]))
+                                              ["-L", .path(.relative(.init("resource/dir/linux/x86_64")))]))
     }
   }
 

Utilities/build-script-helper.py

@@ -9,7 +9,6 @@
 import subprocess
 import sys
 import errno
-import re
 
 if platform.system() == 'Darwin':
     shared_lib_ext = '.dylib'
@@ -80,7 +79,9 @@ def get_swiftpm_options(args):
   if args.verbose:
     swiftpm_args += ['--verbose']
 
-  if platform.system() == 'Darwin':
+  build_arch = args.build_target.split('-')[0]
+  build_os = args.build_target.split('-')[2]
+  if build_os.startswith('macosx'):
     swiftpm_args += [
       # Relative library rpath for swift; will only be used when /usr/lib/swift
       # is not available.
@@ -99,18 +100,17 @@ def get_swiftpm_options(args):
     if args.cross_compile_hosts:
       swiftpm_args += ['--destination', args.cross_compile_config]
 
-    if 'ANDROID_DATA' in os.environ or (args.cross_compile_hosts and re.match(
-        'android-', args.cross_compile_hosts[0])):
+    if '-android' in args.build_target:
       swiftpm_args += [
-        '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android',
+        '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/android/' + build_arch,
         # SwiftPM will otherwise try to compile against GNU strerror_r on
         # Android and fail.
         '-Xswiftc', '-Xcc', '-Xswiftc', '-U_GNU_SOURCE',
       ]
     else:
       # Library rpath for swift, dispatch, Foundation, etc. when installing
       swiftpm_args += [
-        '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/linux',
+        '-Xlinker', '-rpath', '-Xlinker', '$ORIGIN/../lib/swift/' + build_os + '/' + build_arch,
       ]
 
   if args.action == 'install':
@@ -158,15 +158,14 @@ def handle_invocation(args):
   swiftpm_args = get_swiftpm_options(args)
   toolchain_bin = os.path.join(args.toolchain, 'bin')
   swift_exec = os.path.join(toolchain_bin, 'swift')
-  swiftc_exec = os.path.join(toolchain_bin, 'swiftc')
 
   # Platform-specific targets for which we must build swift-driver
   if args.cross_compile_hosts:
     targets = args.cross_compile_hosts
-  elif platform.system() == 'Darwin':
-    targets = [get_build_target(swiftc_exec, args) + macos_deployment_target]
+  elif '-apple-macosx' in args.build_target:
+    targets = [args.build_target + macos_deployment_target]
   else:
-    targets = [get_build_target(swiftc_exec, args)]
+    targets = [args.build_target]
 
   env = os.environ
   # Use local dependencies (i.e. checked out next to swift-driver).
@@ -182,7 +181,7 @@ def handle_invocation(args):
   env['SWIFT_EXEC'] = '%sc' % (swift_exec)
 
   if args.action == 'build':
-    if args.cross_compile_hosts and not re.match('-macosx', args.cross_compile_hosts[0]):
+    if args.cross_compile_hosts and not '-macosx' in args.cross_compile_hosts[0]:
       swiftpm('build', swift_exec, swiftpm_args, env)
     else:
       build_using_cmake(args, toolchain_bin, args.build_path, targets)
@@ -205,7 +204,7 @@ def handle_invocation(args):
       env['SWIFT_DRIVER_LIT_DIR'] = args.lit_test_dir
     swiftpm('test', swift_exec, test_args, env)
   elif args.action == 'install':
-    if platform.system() == 'Darwin':
+    if '-apple-macosx' in args.build_target:
       build_using_cmake(args, toolchain_bin, args.build_path, targets)
       install(args, args.build_path, targets)
     else:
@@ -425,7 +424,7 @@ def build_using_cmake(args, toolchain_bin, build_dir, targets):
     base_cmake_flags = []
     swift_flags = base_swift_flags.copy()
     swift_flags.append('-target %s' % target)
-    if platform.system() == 'Darwin':
+    if '-apple-macosx' in args.build_target:
       base_cmake_flags.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=%s' % macos_deployment_target)
       base_cmake_flags.append('-DCMAKE_OSX_ARCHITECTURES=%s' % target.split('-')[0])
 
@@ -477,7 +476,7 @@ def build_llbuild_using_cmake(args, target, swiftc_exec, build_dir, base_cmake_f
     llbuild_cmake_flags.append('-DSQLite3_INCLUDE_DIR=%s/usr/include' % args.sysroot)
     # FIXME: This may be particularly hacky but CMake finds a different version of libsqlite3
     # on some machines. This is also Darwin-specific...
-    if platform.system() == 'Darwin':
+    if '-apple-macosx' in args.build_target:
       llbuild_cmake_flags.append('-DSQLite3_LIBRARY=%s/usr/lib/libsqlite3.tbd' % args.sysroot)
   llbuild_swift_flags = swift_flags[:]
 
@@ -517,7 +516,7 @@ def build_yams_using_cmake(args, target, swiftc_exec, build_dir, base_cmake_flag
       '-DCMAKE_C_COMPILER:=clang',
       '-DBUILD_SHARED_LIBS=OFF']
 
-  if platform.system() == 'Darwin':
+  if '-apple-macosx' in args.build_target:
     yams_cmake_flags.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=%s' % macos_deployment_target)
     yams_cmake_flags.append('-DCMAKE_C_FLAGS=-target %s' % target)
   else:
@@ -595,16 +594,20 @@ def cmake_build(args, swiftc_exec, cmake_args, swift_flags, source_path,
   if args.verbose:
     print(stdout)
 
-def get_build_target(swiftc_path, args):
+def get_build_target(swiftc_path, args, cross_compile=False):
     """Returns the target-triple of the current machine."""
     try:
-        target_info_json = subprocess.check_output([swiftc_path, '-print-target-info'],
+        command = [swiftc_path, '-print-target-info']
+        if cross_compile:
+            cross_compile_json = json.load(open(args.cross_compile_config))
+            command += ['-target', cross_compile_json["target"]]
+        target_info_json = subprocess.check_output(command,
                                                    stderr=subprocess.PIPE,
                                                    universal_newlines=True).strip()
         args.target_info = json.loads(target_info_json)
         triple = args.target_info['target']['triple']
         # Windows also wants unversionedTriple, but does not use this.
-        if platform.system() == 'Darwin':
+        if '-apple-macosx' in args.target_info["target"]["unversionedTriple"]:
           triple = args.target_info['target']['unversionedTriple']
         return triple
     except Exception as e:
@@ -662,18 +665,18 @@ def add_common_args(parser):
   args.build_path = os.path.abspath(args.build_path)
   args.toolchain = os.path.abspath(args.toolchain)
 
-  if platform.system() == 'Darwin':
+  swift_exec = os.path.join(os.path.join(args.toolchain, 'bin'), 'swiftc')
+  args.build_target = get_build_target(swift_exec, args, cross_compile=(True if args.cross_compile_config else False))
+  if '-apple-macosx' in args.build_target:
     args.sysroot = call_output(["xcrun", "--sdk", "macosx", "--show-sdk-path"], verbose=args.verbose)
   else:
     args.sysroot = None
 
-  swift_exec = os.path.join(os.path.join(args.toolchain, 'bin'), 'swiftc')
-  build_target = get_build_target(swift_exec, args)
-  if (build_target == 'x86_64-apple-macosx' and 'macosx-arm64' in args.cross_compile_hosts):
-      args.cross_compile_hosts = [build_target + macos_deployment_target, 'arm64-apple-macosx%s' % macos_deployment_target]
-  elif (build_target == 'arm64-apple-macosx' and 'macosx-x86_64' in args.cross_compile_hosts):
-      args.cross_compile_hosts = [build_target + macos_deployment_target, 'x86_64-apple-macosx%s' % macos_deployment_target]
-  elif args.cross_compile_hosts and re.match('android-', args.cross_compile_hosts[0]):
+  if (args.build_target == 'x86_64-apple-macosx' and 'macosx-arm64' in args.cross_compile_hosts):
+      args.cross_compile_hosts = [args.build_target + macos_deployment_target, 'arm64-apple-macosx%s' % macos_deployment_target]
+  elif (args.build_target == 'arm64-apple-macosx' and 'macosx-x86_64' in args.cross_compile_hosts):
+      args.cross_compile_hosts = [args.build_target + macos_deployment_target, 'x86_64-apple-macosx%s' % macos_deployment_target]
+  elif args.cross_compile_hosts and 'android-' in args.cross_compile_hosts[0]:
       print('Cross-compiling for %s' % args.cross_compile_hosts[0])
   elif args.cross_compile_hosts:
       error("cannot cross-compile for %s" % cross_compile_hosts)