Merge pull request swiftlang#35435 from CodaFi/arch-nemesis

Pass -target to lit Tests instead of -arch (+ -version-min)

Author: CodaFi

test/lit.cfg

@@ -920,8 +920,8 @@ if run_vendor == 'apple':
            target_future_version = "9.99.0"
 
        config.target_cc_options = (
-           "-arch %s %s" %
-           (run_cpu, clang_mcp_opt))
+           "-target %s %s" %
+           (config.variant_triple, clang_mcp_opt))
 
        config.target_build_swift = (
            ("%s %s %s -F %r -toolchain-stdlib-rpath " +
@@ -960,8 +960,8 @@ if run_vendor == 'apple':
         target_specific_module_triple += "-simulator"
 
         config.target_cc_options = (
-            "-arch %s %s" %
-            (run_cpu, clang_mcp_opt))
+            "-target %s %s" %
+            (config.variant_triple, clang_mcp_opt))
 
         config.target_build_swift = (
             ("%s %s %s -F %r -toolchain-stdlib-rpath %s " +
@@ -996,16 +996,9 @@ if run_vendor == 'apple':
 
         xcrun_sdk_name = "macosx"
 
-        if run_os == 'maccatalyst':
-            # For maccatalyst, pass the target triple to clang
-            # rather than arch and version separately.
-            config.target_cc_options = (
-                "-target %s %s" %
-                (config.variant_triple, clang_mcp_opt))
-        else:
-            config.target_cc_options = (
-                "-arch %s %s" %
-                (run_cpu, clang_mcp_opt))
+        config.target_cc_options = (
+            "-target %s %s" %
+            (config.variant_triple, clang_mcp_opt))
 
         maccatalyst_frameworks_component = ""
         if run_os == 'maccatalyst':

test/stdlib/Compatibility50Linking.c

@@ -4,7 +4,6 @@
 // RUN: %target-run %t/main
 // REQUIRES: objc_interop
 // REQUIRES: executable_test
-// REQUIRES: rdar73174820
 
 // The compatibility library needs to have no build-time dependencies on
 // libswiftCore so it can be linked into a program that doesn't link

validation-test/Runtime/class_update_callback_with_fixed_layout.m

@@ -25,7 +25,6 @@
 
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
-// REQUIRES: rdar73174820
 
 #import <objc/runtime.h>
 #import <assert.h>