llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: Ian Anderson (ian-twilightcoder) <details> <summary>Changes</summary> Every time DarwinSDKInfo reads a new key out of SDKSettings, a boatload of test SDKSettings files need to be updated across several repositories and forks and branches. It’s tedious to be careful to update those with real values so that the tests are properly regression testing older SDKs. It’s important to be careful so that the tests are accurate, e.g. to prevent the scenario where DarwinSDKInfo starts reading a new key out of SDKSettings and assumes that it’s always available everywhere, when in reality it was only added a few releases ago and will break with older SDKs. If the test SDKSettings files continue to be updated ad hoc, it’s going to be really easy to copy/paste a default value everywhere, and then clients will see incorrect behaviors with the real SDKs, or even compiler crashes if the key is unconditionally read. Preemptively add all of the maybe-possibly-compiler relevant keys to the test SDKSettings files from the real SDKs so that the test files are an accurate representation and shouldn't need to be touched in the future. Where the test SDKSettings have intentionally doctored data, add a Comments key explaining what is changed from the real SDK, and alter the SDK name with a tag indicating the change. --- Patch is 66.53 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/177538.diff 32 Files Affected: - (removed) clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.plist () - (added) clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.txt (+2) - (modified) clang/test/Driver/Inputs/DriverKit21.0.1.sdk/SDKSettings.json (+32-4) - (modified) clang/test/Driver/Inputs/DriverKit23.0.sdk/SDKSettings.json (+22-4) - (removed) clang/test/Driver/Inputs/MacOSX10.14.sdk/SDKSettings.json (-1) - (added) clang/test/Driver/Inputs/MacOSX10.15.sdk/SDKSettings.json (+33) - (removed) clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk/SDKSettings.json (-29) - (modified) clang/test/Driver/Inputs/MacOSX15.0.sdk/SDKSettings.json (+37-5) - (modified) clang/test/Driver/Inputs/MacOSX15.1.sdk/SDKSettings.json (+37-5) - (modified) clang/test/Driver/Inputs/WatchOS6.0.sdk/SDKSettings.json (+18-4) - (modified) clang/test/Driver/Inputs/iPhoneOS13.0.sdk/SDKSettings.json (+18-4) - (modified) clang/test/Driver/clang-cc1as-target-variant.s (+4-4) - (modified) clang/test/Driver/darwin-builtin-modules.c (+1-1) - (modified) clang/test/Driver/darwin-invalid-version-range.c (+26-4) - (modified) clang/test/Driver/darwin-ld-platform-version-driverkit.c (+6-6) - (modified) clang/test/Driver/darwin-ld-platform-version-maccatalyst.c (+2-2) - (modified) clang/test/Driver/darwin-ld-platform-version-macos.c (+8-8) - (modified) clang/test/Driver/darwin-ld-platform-version-target-version.c (+6-6) - (modified) clang/test/Driver/darwin-objc-runtime-maccatalyst-target-variant.m (+3-3) - (modified) clang/test/Driver/darwin-objc-runtime-maccatalyst.m (+5-5) - (modified) clang/test/Driver/darwin-sdk-version-maccatalyst.c (+2-2) - (modified) clang/test/Driver/darwin-sdk-version.c (+15-15) - (modified) clang/test/Driver/darwin-target-variant-sdk-version.c (+4-4) - (modified) clang/test/Driver/modulemap-allow-subdirectory-search.c (+74-10) - (modified) clang/test/InstallAPI/Inputs/MacOSX13.0.sdk/SDKSettings.json (+26-27) - (modified) clang/test/Modules/sdk-settings-json-dep.m (+33-23) - (modified) clang/test/Sema/Inputs/AppleTVOS15.0.sdk/SDKSettings.json (+15-68) - (modified) clang/test/Sema/Inputs/MacOSX11.0.sdk/SDKSettings.json (+20-29) - (modified) clang/test/Sema/Inputs/WatchOS7.0.sdk/SDKSettings.json (+12-59) - (removed) clang/test/Sema/Inputs/XROS.sdk/SDKSettings.json (-12) - (added) clang/test/Sema/Inputs/XROS26.0.sdk/SDKSettings.json (+29) - (modified) clang/test/Sema/attr-availability-ios-fallback-aligned-versions.c (+1-1) ``````````diff diff --git a/clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.plist b/clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.plist deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.txt b/clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.txt new file mode 100644 index 0000000000000..53f02248306a5 --- /dev/null +++ b/clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.txt @@ -0,0 +1,2 @@ +The DriverKit 19.0 SDK shipped alongside the macOS 10.15 SDK in Xcode 11.0. Unlike macOS though, +DriverKit did not have an SDKSettings.json file, only an SDKSettings.plist which the compilers don't use. diff --git a/clang/test/Driver/Inputs/DriverKit21.0.1.sdk/SDKSettings.json b/clang/test/Driver/Inputs/DriverKit21.0.1.sdk/SDKSettings.json index f1c42c93057a1..f9ad33065f732 100644 --- a/clang/test/Driver/Inputs/DriverKit21.0.1.sdk/SDKSettings.json +++ b/clang/test/Driver/Inputs/DriverKit21.0.1.sdk/SDKSettings.json @@ -1,4 +1,32 @@ -{"Version": "21.0.1", "CanonicalName": "driverkit21.0.1", "MaximumDeploymentTarget": "21.0.1.99", - "SupportedTargets": { - "driverkit": {"Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "driverkit", "LLVMTargetTripleEnvironment": ""} -}} +{ + "CanonicalName": "driverkit21.0.1", + "Version": "21.0.1", + "IsBaseSDK": "YES", + "DisplayName": "DriverKit 21.0.1", + "MinimalDisplayName": "21.0.1", + "SupportedTargets": { + "driverkit": { + "PlatformFamilyName": "DriverKit", + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "driverkit", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "10", + "DefaultDeploymentTarget": "21.0.1", + "MinimumDeploymentTarget": "19.0", "MaximumDeploymentTarget": "21.0.1.99", + "ValidDeploymentTargets": ["19.0", "20.0", "20.1", "20.2", "20.3", "20.4", "21.0", "21.0.1"] + } + }, + "FrameworkSearchPaths": [ + "System/DriverKit/System/Library/Frameworks" + ], + "HeaderSearchPaths": [ + "System/DriverKit/usr/include" + ], + "LibrarySearchPaths": [ + "System/DriverKit/usr/lib" + ], + "DefaultDeploymentTarget": "21.0.1", + "MaximumDeploymentTarget": "21.0.1.99", + "Comments": [ + "There was no DriverKit 21.0 SDK, this is the first DriverKit 21.x release, appearing in Xcode 13.1. Xcode 13.0", + "contained DriverKit 20.4. DriverKit 21.0.1 is also the first version which is a distinct platform from macOS.", + ] +} diff --git a/clang/test/Driver/Inputs/DriverKit23.0.sdk/SDKSettings.json b/clang/test/Driver/Inputs/DriverKit23.0.sdk/SDKSettings.json index 9ad5266c2a248..12f6e8f1fec93 100644 --- a/clang/test/Driver/Inputs/DriverKit23.0.sdk/SDKSettings.json +++ b/clang/test/Driver/Inputs/DriverKit23.0.sdk/SDKSettings.json @@ -1,4 +1,22 @@ -{"Version":"23.0", "CanonicalName": "driverkit23.0", "MaximumDeploymentTarget": "23.0.99", - "SupportedTargets": { - "driverkit": {"Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "driverkit", "LLVMTargetTripleEnvironment": "", "SystemPrefix": "\/System\/DriverKit"} -}} +{ + "CanonicalName": "driverkit23.0", + "Version": "23.0", + "IsBaseSDK": "YES", + "DisplayName": "DriverKit 23.0", + "MinimalDisplayName": "23.0", + "SupportedTargets": { + "driverkit": { + "PlatformFamilyName": "DriverKit", + "PlatformFamilyDisplayName": "DriverKit", + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "driverkit", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "10", + "SystemPrefix": "/System/DriverKit", + "DefaultDeploymentTarget": "23.0", + "RecommendedDeploymentTarget": "19.0", + "MinimumDeploymentTarget": "19.0", "MaximumDeploymentTarget": "23.0.99", + "ValidDeploymentTargets": ["19.0", "20.0", "20.1", "20.2", "20.3", "20.4", "21.0", "21.4", "21.6", "22.1", "22.2", "22.3", "22.4", "22.5", "23.0"] + } + }, + "DefaultDeploymentTarget": "23.0", + "MaximumDeploymentTarget": "23.0.99" +} diff --git a/clang/test/Driver/Inputs/MacOSX10.14.sdk/SDKSettings.json b/clang/test/Driver/Inputs/MacOSX10.14.sdk/SDKSettings.json deleted file mode 100644 index e7383550e42bd..0000000000000 --- a/clang/test/Driver/Inputs/MacOSX10.14.sdk/SDKSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"Version":"10.14", "CanonicalName": "macosx10.14", "MaximumDeploymentTarget": "10.14.99"} diff --git a/clang/test/Driver/Inputs/MacOSX10.15.sdk/SDKSettings.json b/clang/test/Driver/Inputs/MacOSX10.15.sdk/SDKSettings.json new file mode 100644 index 0000000000000..6e4c438bc0bb3 --- /dev/null +++ b/clang/test/Driver/Inputs/MacOSX10.15.sdk/SDKSettings.json @@ -0,0 +1,33 @@ +{ + "CanonicalName": "macosx10.15", + "Version": "10.15", + "IsBaseSDK": "YES", + "DisplayName": "macOS 10.15", + "MinimalDisplayName": "10.15", + "SupportedTargets": { + "macosx": { + "Archs": ["x86_64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macosx", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "1", + "DefaultDeploymentTarget": "10.15", + "MinimumDeploymentTarget": "10.6", "MaximumDeploymentTarget": "10.15.99", + "ValidDeploymentTargets": ["10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15"] + }, + "iosmac": { + "Archs": ["x86_64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", + "BuildVersionPlatformID": "6", + "DefaultDeploymentTarget": "13.0", + "MinimumDeploymentTarget": "13.0", "MaximumDeploymentTarget": "13.0.99", + "ValidDeploymentTargets": ["13.0"] + } + }, + "VersionMap": { + "macOS_iOSMac": {"10.15": "13.0"}, + "iOSMac_macOS": {"13.0": "10.15"} + }, + "DefaultDeploymentTarget": "10.15", + "MaximumDeploymentTarget": "10.15.99", + "Comments": [ + "This SDK is from Xcode 11.0. Xcode 11.1 would release quickly and updated only the iOS SDK to 13.1. Xcode 11.2 would", + "later remap macOS 10.15 to Mac Catalyst 13.1, which is henceforward considered the first version of Mac Catalyst." + ] +} diff --git a/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk/SDKSettings.json b/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk/SDKSettings.json deleted file mode 100644 index c3b46502069ba..0000000000000 --- a/clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk/SDKSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "Version":"10.15", - "CanonicalName": "macosx10.15", - "MaximumDeploymentTarget": "10.15.99", - "SupportedTargets": { - "macosx": { - "Archs": ["x86_64"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "macosx", - "LLVMTargetTripleEnvironment": "" - }, - "iosmac": { - "Archs": ["x86_64"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "ios", - "LLVMTargetTripleEnvironment": "macabi" - } - }, - "VersionMap" : { - "macOS_iOSMac" : { - "10.15" : "13.1", - "10.15.1" : "13.2" - }, - "iOSMac_macOS" : { - "13.1" : "10.15", - "13.2" : "10.15.1" - } - } -} diff --git a/clang/test/Driver/Inputs/MacOSX15.0.sdk/SDKSettings.json b/clang/test/Driver/Inputs/MacOSX15.0.sdk/SDKSettings.json index e7c691dd80307..b5afb5445b5ef 100644 --- a/clang/test/Driver/Inputs/MacOSX15.0.sdk/SDKSettings.json +++ b/clang/test/Driver/Inputs/MacOSX15.0.sdk/SDKSettings.json @@ -1,5 +1,37 @@ -{"Version":"15.0", "CanonicalName": "macosx15.0", "MaximumDeploymentTarget": "15.0.99", - "SupportedTargets": { - "macosx": {"Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macos", "LLVMTargetTripleEnvironment": "", "SystemPrefix": ""}, - "iosmac": {"Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", "SystemPrefix": "\/System\/iOSSupport"} -}} +{ + "CanonicalName": "macosx15.0", + "Version": "15.0", + "IsBaseSDK": "YES", + "DisplayName": "macOS 15.0", + "MinimalDisplayName": "15.0", + "SupportedTargets": { + "macosx": { + "PlatformFamilyName": "macOS", + "PlatformFamilyDisplayName": "macOS", + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "1", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "", + "DefaultDeploymentTarget": "15.0", + "RecommendedDeploymentTarget": "11.0", + "MinimumDeploymentTarget": "10.13","MaximumDeploymentTarget": "15.0.99", + "ValidDeploymentTargets": ["10.13", "10.14", "10.15", "11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "12.0", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "15.0"] + }, + "iosmac": { + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", + "BuildVersionPlatformID": "6", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "/System/iOSSupport", + "DefaultDeploymentTarget": "18.0", + "RecommendedDeploymentTarget": "14.2", + "MinimumDeploymentTarget": "13.1", "MaximumDeploymentTarget": "18.0.99", + "ValidDeploymentTargets": ["13.1", "13.2", "13.3", "13.3.1", "13.4", "13.5", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "15.0", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1", "16.2", "16.3", "16.4", "16.5", "16.6", "17.0", "17.1", "17.2", "17.3", "17.4", "17.5", "17.6", "18.0"] + } + }, + "VersionMap": { + "macOS_iOSMac": {"10.15": "13.1", "10.15.1": "13.2", "10.15.2": "13.3", "10.15.3": "13.3.1", "10.15.4": "13.4", "10.15.5": "13.5", "11.0": "14.2", "11.0.1": "14.2", "11.1": "14.3", "11.2": "14.4", "11.3": "14.5", "11.4": "14.6", "11.5": "14.7", "12.0": "15.0", "12.0.1": "15.0", "12.1": "15.2", "12.2": "15.3", "12.3": "15.4", "12.4": "15.5", "12.5": "15.6", "13.0": "16.1", "13.1": "16.2", "13.2": "16.3", "13.3": "16.4", "13.4": "16.5", "13.5": "16.6", "14.0": "17.0", "14.1": "17.1", "14.2": "17.2", "14.3": "17.3", "14.4": "17.4", "14.5": "17.5", "14.6": "17.6", "15.0": "18.0"}, + "iOSMac_macOS": {"13.1": "10.15", "13.2": "10.15.1", "13.3": "10.15.2", "13.3.1": "10.15.3", "13.4": "10.15.4", "13.5": "10.15.5", "14.0": "11.0", "14.1": "11.0", "14.2": "11.0", "14.3": "11.1", "14.4": "11.2", "14.5": "11.3", "14.6": "11.4", "14.7": "11.5", "15.0": "12.0", "15.2": "12.1", "15.3": "12.2", "15.4": "12.3", "15.5": "12.4", "15.6": "12.5", "16.0": "13.0", "16.1": "13.0", "16.2": "13.1", "16.3": "13.2", "16.4": "13.3", "16.5": "13.4", "16.6": "13.5", "17.0": "14.0", "17.1": "14.1", "17.2": "14.2", "17.3": "14.3", "17.4": "14.4", "17.5": "14.5", "17.6": "14.6", "18.0": "15.0"} + }, + "DefaultDeploymentTarget": "15.0", + "MaximumDeploymentTarget": "15.0.99" +} diff --git a/clang/test/Driver/Inputs/MacOSX15.1.sdk/SDKSettings.json b/clang/test/Driver/Inputs/MacOSX15.1.sdk/SDKSettings.json index c42e903255296..df40e71a99079 100644 --- a/clang/test/Driver/Inputs/MacOSX15.1.sdk/SDKSettings.json +++ b/clang/test/Driver/Inputs/MacOSX15.1.sdk/SDKSettings.json @@ -1,5 +1,37 @@ -{"Version":"15.1", "CanonicalName": "macosx15.1", "MaximumDeploymentTarget": "15.1.99", - "SupportedTargets": { - "macosx": {"Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macos", "LLVMTargetTripleEnvironment": "", "SystemPrefix": ""}, - "iosmac": {"Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", "SystemPrefix": "\/System\/iOSSupport"} -}} +{ + "CanonicalName": "macosx15.1", + "Version": "15.1", + "IsBaseSDK": "YES", + "DisplayName": "macOS 15.1", + "MinimalDisplayName": "15.1", + "SupportedTargets": { + "macosx": { + "PlatformFamilyName": "macOS", + "PlatformFamilyDisplayName": "macOS", + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "1", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "", + "DefaultDeploymentTarget": "15.1", + "RecommendedDeploymentTarget": "11.0", + "MinimumDeploymentTarget": "10.13", "MaximumDeploymentTarget": "15.1.99", + "ValidDeploymentTargets": ["10.13", "10.14", "10.15", "11.0", "11.1", "11.2", "11.3", "11.4", "11.5", "12.0", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "15.0", "15.1"] + }, + "iosmac": { + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", + "BuildVersionPlatformID": "6", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "/System/iOSSupport", + "DefaultDeploymentTarget": "18.1", + "RecommendedDeploymentTarget": "14.2", + "MinimumDeploymentTarget": "13.1", "MaximumDeploymentTarget": "18.1.99", + "ValidDeploymentTargets": ["13.1", "13.2", "13.3", "13.3.1", "13.4", "13.5", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "15.0", "15.2", "15.3", "15.4", "15.5", "15.6", "16.0", "16.1", "16.2", "16.3", "16.4", "16.5", "16.6", "17.0", "17.1", "17.2", "17.3", "17.4", "17.5", "17.6", "18.0", "18.1"] + }, + }, + "VersionMap": { + "macOS_iOSMac": {"10.15": "13.1", "10.15.1": "13.2", "10.15.2": "13.3", "10.15.3": "13.3.1", "10.15.4": "13.4", "10.15.5": "13.5", "11.0": "14.2", "11.0.1": "14.2", "11.1": "14.3", "11.2": "14.4", "11.3": "14.5", "11.4": "14.6", "11.5": "14.7", "12.0": "15.0", "12.0.1": "15.0", "12.1": "15.2", "12.2": "15.3", "12.3": "15.4", "12.4": "15.5", "12.5": "15.6", "13.0": "16.1", "13.1": "16.2", "13.2": "16.3", "13.3": "16.4", "13.4": "16.5", "13.5": "16.6", "14.0": "17.0", "14.1": "17.1", "14.2": "17.2", "14.3": "17.3", "14.4": "17.4", "14.5": "17.5", "14.6": "17.6", "15.0": "18.0", "15.1": "18.1"}, + "iOSMac_macOS": {"13.1": "10.15", "13.2": "10.15.1", "13.3": "10.15.2", "13.3.1": "10.15.3", "13.4": "10.15.4", "13.5": "10.15.5", "14.0": "11.0", "14.1": "11.0", "14.2": "11.0", "14.3": "11.1", "14.4": "11.2", "14.5": "11.3", "14.6": "11.4", "14.7": "11.5", "15.0": "12.0", "15.2": "12.1", "15.3": "12.2", "15.4": "12.3", "15.5": "12.4", "15.6": "12.5", "16.0": "13.0", "16.1": "13.0", "16.2": "13.1", "16.3": "13.2", "16.4": "13.3", "16.5": "13.4", "16.6": "13.5", "17.0": "14.0", "17.1": "14.1", "17.2": "14.2", "17.3": "14.3", "17.4": "14.4", "17.5": "14.5", "17.6": "14.6", "18.0": "15.0", "18.1": "15.1"} + }, + "DefaultDeploymentTarget": "15.1", + "MaximumDeploymentTarget": "15.1.99" +} diff --git a/clang/test/Driver/Inputs/WatchOS6.0.sdk/SDKSettings.json b/clang/test/Driver/Inputs/WatchOS6.0.sdk/SDKSettings.json index 3e2f817ac1406..47ed94863b262 100644 --- a/clang/test/Driver/Inputs/WatchOS6.0.sdk/SDKSettings.json +++ b/clang/test/Driver/Inputs/WatchOS6.0.sdk/SDKSettings.json @@ -1,4 +1,18 @@ -{"Version":"6.0", "CanonicalName": "watchos6.0", "MaximumDeploymentTarget": "6.0.99", - "SupportedTargets": { - "watchos": {"Archs": ["armv7k", "arm64_32"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "watchos", "LLVMTargetTripleEnvironment": ""} -}} +{ + "CanonicalName": "watchos6.0", + "Version": "6.0", + "IsBaseSDK": "YES", + "DisplayName": "watchOS 6.0", + "MinimalDisplayName": "6.0", + "SupportedTargets": { + "watchos": { + "Archs": ["armv7k", "arm64_32"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "watchos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "4", + "DefaultDeploymentTarget": "6.0", + "MinimumDeploymentTarget": "2.0", "MaximumDeploymentTarget": "6.0.99", + "ValidDeploymentTargets": ["2.0", "2.1", "2.2", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0"] + } + }, + "DefaultDeploymentTarget": "6.0", + "MaximumDeploymentTarget": "6.0.99" +} diff --git a/clang/test/Driver/Inputs/iPhoneOS13.0.sdk/SDKSettings.json b/clang/test/Driver/Inputs/iPhoneOS13.0.sdk/SDKSettings.json index 91cb1fa501b3b..fd719e4cf4de0 100644 --- a/clang/test/Driver/Inputs/iPhoneOS13.0.sdk/SDKSettings.json +++ b/clang/test/Driver/Inputs/iPhoneOS13.0.sdk/SDKSettings.json @@ -1,4 +1,18 @@ -{"Version":"13.0", "CanonicalName": "iphoneos13.0", "MaximumDeploymentTarget": "13.0.99", - "SupportedTargets": { - "iphoneos": {"Archs": ["armv7", "armv7s", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": ""} -}} +{ + "CanonicalName": "iphoneos13.0", + "Version": "13.0", + "IsBaseSDK": "YES", + "DisplayName": "iOS 13.0", + "MinimalDisplayName": "13.0", + "SupportedTargets": { + "iphoneos": { + "Archs": ["armv7", "armv7s", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "2", + "DefaultDeploymentTarget": "13.0", + "MinimumDeploymentTarget": "8.0", "MaximumDeploymentTarget": "13.0.99", + "ValidDeploymentTargets": ["8.0", "8.1", "8.2", "8.3", "8.4", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0"] + } + }, + "DefaultDeploymentTarget": "13.0", + "MaximumDeploymentTarget": "13.0.99" +} diff --git a/clang/test/Driver/clang-cc1as-target-variant.s b/clang/test/Driver/clang-cc1as-target-variant.s index f4b5fb8144d47..e89cf4cb49a92 100644 --- a/clang/test/Driver/clang-cc1as-target-variant.s +++ b/clang/test/Driver/clang-cc1as-target-variant.s @@ -1,15 +1,15 @@ // RUN: touch %t.S -// RUN: %clang -target x86_64-apple-ios13.1-macabi -darwin-target-variant x86_64-apple-macos10.15 -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.S 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.1-macabi -darwin-target-variant x86_64-apple-macos10.15 -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.S 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios-macabi -mmacos-version-min=10.15 -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.S 2>&1 \ +// RUN: %clang -target x86_64-apple-ios-macabi -mmacos-version-min=10.15 -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.S 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-SDK-INFO %s -// RUN: %clang -target x86_64-apple-ios-macabi -mmacos-version-min=10.15 -darwin-target-variant x86_64-apple-macos -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.S 2>&1 \ +// RUN: %clang -target x86_64-apple-ios-macabi -mmacos-version-min=10.15 -darwin-target-variant x86_64-apple-macos -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.S 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-VARIANT-SDK-INFO %s -// RUN: %clang -target x86_64-apple-macos -mmacos-version-min=10.15 -darwin-target-variant x86_64-apple-ios-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.S 2>&1 \ +// RUN: %clang -target x86_64-apple-macos -mmacos-version-min=10.15 -darwin-target-variant x86_64-apple-ios-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.S 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-VARIANT-SDK-INFO-INV %s // CHECK: "-cc1as" diff --git a/clang/test/Driver/darwin-builtin-modules.c b/clang/test/Driver/darwin-builtin-modules.c index 4564d7317d7ab..24b817545eca8 100644 --- a/clang/test/Driver/darwin-builtin-modules.c +++ b/clang/test/Driver/darwin-builtin-modules.c @@ -2,7 +2,7 @@ // when expected. // RUN: %clang -target x86_64-apple-darwin22.4 -### %s 2>&1 | FileCheck %s -// RUN: %clang -isysroot %S/Inputs/MacOSX10.15.vers... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/177538 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
