https://github.com/ian-twilightcoder updated https://github.com/llvm/llvm-project/pull/177538
>From ff598cae9a6596344f5f3e7d48a7fe066235fbd3 Mon Sep 17 00:00:00 2001 From: Ian Anderson <[email protected]> Date: Thu, 22 Jan 2026 23:13:40 -0800 Subject: [PATCH] [test][NFC] Add more keys to test SDKSettings files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .../DriverKit19.0.sdk/SDKSettings.plist | 0 .../Inputs/DriverKit19.0.sdk/SDKSettings.txt | 2 + .../DriverKit21.0.1.sdk/SDKSettings.json | 36 +++++++- .../Inputs/DriverKit23.0.sdk/SDKSettings.json | 26 +++++- .../Inputs/MacOSX10.14.sdk/SDKSettings.json | 1 - .../Inputs/MacOSX10.15.sdk/SDKSettings.json | 33 ++++++++ .../SDKSettings.json | 29 ------- .../Inputs/MacOSX15.0.sdk/SDKSettings.json | 42 ++++++++-- .../Inputs/MacOSX15.1.sdk/SDKSettings.json | 42 ++++++++-- .../Inputs/WatchOS6.0.sdk/SDKSettings.json | 22 ++++- .../Inputs/iPhoneOS13.0.sdk/SDKSettings.json | 22 ++++- .../test/Driver/clang-cc1as-target-variant.s | 8 +- clang/test/Driver/darwin-builtin-modules.c | 2 +- .../Driver/darwin-invalid-version-range.c | 30 ++++++- .../darwin-ld-platform-version-driverkit.c | 12 +-- .../darwin-ld-platform-version-maccatalyst.c | 4 +- .../Driver/darwin-ld-platform-version-macos.c | 22 ++--- ...arwin-ld-platform-version-target-version.c | 12 +-- ...-objc-runtime-maccatalyst-target-variant.m | 6 +- .../Driver/darwin-objc-runtime-maccatalyst.m | 10 +-- .../Driver/darwin-sdk-version-maccatalyst.c | 4 +- clang/test/Driver/darwin-sdk-version.c | 30 +++---- .../darwin-target-variant-sdk-version.c | 8 +- .../modulemap-allow-subdirectory-search.c | 84 ++++++++++++++++--- .../Inputs/MacOSX13.0.sdk/SDKSettings.json | 53 ++++++------ clang/test/Modules/sdk-settings-json-dep.m | 68 ++++++++------- .../Inputs/AppleTVOS15.0.sdk/SDKSettings.json | 83 ++++-------------- .../Inputs/MacOSX11.0.sdk/SDKSettings.json | 49 +++++------ .../Inputs/WatchOS7.0.sdk/SDKSettings.json | 66 --------------- .../Inputs/WatchOS8.0.sdk/SDKSettings.json | 23 +++++ .../Sema/Inputs/XROS.sdk/SDKSettings.json | 12 --- .../Sema/Inputs/XROS26.0.sdk/SDKSettings.json | 29 +++++++ ...ailability-ios-fallback-aligned-versions.c | 2 +- ...ttr-availability-iosmac-infer-from-macos.c | 2 +- clang/test/Sema/attr-availability-watchos.c | 2 +- 35 files changed, 513 insertions(+), 363 deletions(-) delete mode 100644 clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.plist create mode 100644 clang/test/Driver/Inputs/DriverKit19.0.sdk/SDKSettings.txt delete mode 100644 clang/test/Driver/Inputs/MacOSX10.14.sdk/SDKSettings.json create mode 100644 clang/test/Driver/Inputs/MacOSX10.15.sdk/SDKSettings.json delete mode 100644 clang/test/Driver/Inputs/MacOSX10.15.versioned.sdk/SDKSettings.json delete mode 100644 clang/test/Sema/Inputs/WatchOS7.0.sdk/SDKSettings.json create mode 100644 clang/test/Sema/Inputs/WatchOS8.0.sdk/SDKSettings.json delete mode 100644 clang/test/Sema/Inputs/XROS.sdk/SDKSettings.json create mode 100644 clang/test/Sema/Inputs/XROS26.0.sdk/SDKSettings.json 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..f8b98a743b7cd --- /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.1", + "MinimumDeploymentTarget": "13.1", "MaximumDeploymentTarget": "13.2.99", + "ValidDeploymentTargets": ["13.1", "13.2"] + } + }, + "VersionMap": { + "macOS_iOSMac": {"10.15": "13.1", "10.15.1": "13.2"}, + "iOSMac_macOS": {"13.1": "10.15", "13.2": "10.15.1"} + }, + "DefaultDeploymentTarget": "10.15", + "MaximumDeploymentTarget": "10.15.99", + "Comments": [ + "This is actually the macOS 10.15.1 SDK from Xcode 11.2. The Version value wasn't updated until Xcode 11.4 when the", + "macOS SDK was updated to 10.15.4." + ] +} 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..967330fc0e281 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.versioned.sdk -target x86_64-apple-macos10.15 -### %s 2>&1 | FileCheck %s +// RUN: %clang -isysroot %S/Inputs/MacOSX10.15.sdk -target x86_64-apple-macos10.15 -### %s 2>&1 | FileCheck %s // RUN: %clang -isysroot %S/Inputs/iPhoneOS13.0.sdk -target arm64-apple-ios13.0 -### %s 2>&1 | FileCheck %s // CHECK: -fbuiltin-headers-in-system-modules diff --git a/clang/test/Driver/darwin-invalid-version-range.c b/clang/test/Driver/darwin-invalid-version-range.c index 9b771c5582867..a14f28ae10597 100644 --- a/clang/test/Driver/darwin-invalid-version-range.c +++ b/clang/test/Driver/darwin-invalid-version-range.c @@ -26,7 +26,29 @@ // DEPLOY_VAR: error: invalid version number in 'IPHONEOS_DEPLOYMENT_TARGET=21.0' //--- iPhoneOS21.0.sdk/SDKSettings.json -{"Version":"21.0", "CanonicalName":"iphoneos21.0", "MaximumDeploymentTarget": "21.0.99", - "SupportedTargets": { - "iphoneos": {"Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "","SystemPrefix": ""} -}} +{ + "CanonicalName": "iphoneos21.0", + "Version": "21.0", + "IsBaseSDK": "YES", + "DisplayName": "iOS 21.0", + "MinimalDisplayName": "21.0", + "SupportedTargets": { + "iphoneos": { + "PlatformFamilyName": "iOS", + "PlatformFamilyDisplayName": "iOS", + "Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "2", + "ClangRuntimeLibraryPlatformName": "ios", + "SystemPrefix": "", + "DefaultDeploymentTarget": "21.0", + "RecommendedDeploymentTarget": "15.0", + "MinimumDeploymentTarget": "12.0", "MaximumDeploymentTarget": "21.0.99", + "ValidDeploymentTargets": ["12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "15.0", "15.1", "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", "18.2", "18.3", "18.4", "18.5", "18.6", "21.0"] + } + }, + "DefaultDeploymentTarget": "21.0", + "MaximumDeploymentTarget": "21.0.99", + "Comments": [ + "Modified version of the iOS SDK from Xcode 21.0 to have an invalid version." + ] +} diff --git a/clang/test/Driver/darwin-ld-platform-version-driverkit.c b/clang/test/Driver/darwin-ld-platform-version-driverkit.c index eda077ffe64ed..7a03b4eb58c03 100644 --- a/clang/test/Driver/darwin-ld-platform-version-driverkit.c +++ b/clang/test/Driver/darwin-ld-platform-version-driverkit.c @@ -1,20 +1,20 @@ // RUN: touch %t.o -// RUN: not %clang -target x86_64-apple-driverkit10.15 -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: not %clang -target x86_64-apple-driverkit10.14 -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck %s // RUN: mkdir -p %t.sdk // RUN: %clang -target x86_64-apple-driverkit19 -isysroot %t.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=MISSING-SDK-JSON-WORKAROUND %s -// RUN: %clang -target arm64-apple-driverkit19 -isysroot %S/Inputs/MacOSX10.14.sdk -fuse-ld= -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target arm64-apple-driverkit19 -isysroot %S/Inputs/MacOSX10.15.sdk -fuse-ld= -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW %s -// RUN: %clang -target arm64-apple-driverkit19 -isysroot %S/Inputs/MacOSX10.14.sdk -fuse-ld= -mlinker-version=400 -### %t.o 2>&1 \ +// RUN: %clang -target arm64-apple-driverkit19 -isysroot %S/Inputs/MacOSX10.15.sdk -fuse-ld= -mlinker-version=400 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_OLD %s -// RUN: %clang -target arm64e-apple-driverkit19 -isysroot %S/Inputs/MacOSX10.14.sdk -fuse-ld= -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target arm64e-apple-driverkit19 -isysroot %S/Inputs/MacOSX10.15.sdk -fuse-ld= -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW %s -// CHECK: "-platform_version" "driverkit" "10.15.0" "10.14" +// CHECK: "-platform_version" "driverkit" "10.14.0" "10.15" // MISSING-SDK-JSON-WORKAROUND: "-platform_version" "driverkit" "19.0.0" "19.0.0" -// ARM64_NEW: "-platform_version" "driverkit" "20.0.0" "10.14" +// ARM64_NEW: "-platform_version" "driverkit" "20.0.0" "10.15" // ARM64_OLD: "-driverkit_version_min" "20.0.0" diff --git a/clang/test/Driver/darwin-ld-platform-version-maccatalyst.c b/clang/test/Driver/darwin-ld-platform-version-maccatalyst.c index 9878376ec5e74..5ad70cdf08fc0 100644 --- a/clang/test/Driver/darwin-ld-platform-version-maccatalyst.c +++ b/clang/test/Driver/darwin-ld-platform-version-maccatalyst.c @@ -1,8 +1,8 @@ // RUN: touch %t.o -// RUN: %clang -target x86_64-apple-ios13.3-macabi -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.3-macabi -isysroot %S/Inputs/iPhoneOS13.0.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios13.3-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.3-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-MAPPED-SDK %s // CHECK: "-platform_version" "mac catalyst" "13.3.0" "13.1" diff --git a/clang/test/Driver/darwin-ld-platform-version-macos.c b/clang/test/Driver/darwin-ld-platform-version-macos.c index b16ca8a853745..bdd80c8360402 100644 --- a/clang/test/Driver/darwin-ld-platform-version-macos.c +++ b/clang/test/Driver/darwin-ld-platform-version-macos.c @@ -1,44 +1,44 @@ // RUN: touch %t.o // RUN: %clang -target x86_64-apple-macos10.13 -fuse-ld=lld \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=0 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=0 \ // RUN: -### %t.o -B%S/Inputs/lld 2>&1 \ // RUN: | FileCheck --check-prefix=LINKER-NEW %s // RUN: %clang -target x86_64-apple-macos10.13 -fuse-ld= \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=400 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=400 \ // RUN: -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=LINKER-OLD %s -// RUN: env SDKROOT=%S/Inputs/MacOSX10.14.sdk %clang \ +// RUN: env SDKROOT=%S/Inputs/MacOSX10.15.sdk %clang \ // RUN: -target x86_64-apple-macos10.13.0.1 -mlinker-version=520 \ // RUN: -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=LINKER-NEW %s // RUN: %clang -target arm64-apple-macos10.13 -fuse-ld= \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=400 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=400 \ // RUN: -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_OLD %s // RUN: %clang -target arm64-apple-macos10.13 -fuse-ld=lld \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=400 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=400 \ // RUN: -### %t.o -B%S/Inputs/lld 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW %s // RUN: %clang -target arm64-apple-macos10.13 -fuse-ld= \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=520 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 \ // RUN: -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW %s // RUN: %clang -target arm64-apple-darwin19 -fuse-ld= \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=520 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 \ // RUN: -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW %s // RUN: %clang -target arm64-apple-macos11.1 -fuse-ld= \ -// RUN: -isysroot %S/Inputs/MacOSX10.14.sdk -mlinker-version=520 \ +// RUN: -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 \ // RUN: -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW_1 %s // LINKER-OLD: "-macosx_version_min" "10.13.0" -// LINKER-NEW: "-platform_version" "macos" "10.13.0" "10.14" +// LINKER-NEW: "-platform_version" "macos" "10.13.0" "10.15" -// ARM64_NEW: "-platform_version" "macos" "11.0.0" "10.14" -// ARM64_NEW_1: "-platform_version" "macos" "11.1.0" "10.14" +// ARM64_NEW: "-platform_version" "macos" "11.0.0" "10.15" +// ARM64_NEW_1: "-platform_version" "macos" "11.1.0" "10.15" // ARM64_OLD: "-macosx_version_min" "11.0.0" // RUN: %clang -target x86_64-apple-macos10.13 -mlinker-version=520 \ diff --git a/clang/test/Driver/darwin-ld-platform-version-target-version.c b/clang/test/Driver/darwin-ld-platform-version-target-version.c index cc88e015f82c5..ecb41406656c4 100644 --- a/clang/test/Driver/darwin-ld-platform-version-target-version.c +++ b/clang/test/Driver/darwin-ld-platform-version-target-version.c @@ -1,17 +1,17 @@ // RUN: touch %t.o -// 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.o 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.o 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-macos10.14.3 -darwin-target-variant x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target x86_64-apple-macos10.14.3 -darwin-target-variant x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-INV %s -// RUN: %clang -target arm64-apple-ios13.1-macabi -darwin-target-variant arm64-apple-macos10.15 -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target arm64-apple-ios13.1-macabi -darwin-target-variant arm64-apple-macos10.15 -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW %s -// RUN: %clang -target arm64-apple-macos10.15 -darwin-target-variant arm64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -mlinker-version=520 -### %t.o 2>&1 \ +// RUN: %clang -target arm64-apple-macos10.15 -darwin-target-variant arm64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -mlinker-version=520 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_NEW-INV %s -// RUN: %clang -target arm64-apple-ios13.1-macabi -darwin-target-variant arm64-apple-macos10.15 -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -fuse-ld= -mlinker-version=400 -### %t.o 2>&1 \ +// RUN: %clang -target arm64-apple-ios13.1-macabi -darwin-target-variant arm64-apple-macos10.15 -isysroot %S/Inputs/MacOSX10.15.sdk -fuse-ld= -mlinker-version=400 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_OLD %s -// RUN: %clang -target arm64-apple-macos10.15 -darwin-target-variant arm64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -fuse-ld= -mlinker-version=400 -### %t.o 2>&1 \ +// RUN: %clang -target arm64-apple-macos10.15 -darwin-target-variant arm64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -fuse-ld= -mlinker-version=400 -### %t.o 2>&1 \ // RUN: | FileCheck --check-prefix=ARM64_OLD-INV %s // CHECK: "-platform_version" "mac catalyst" "13.1.0" "13.1" diff --git a/clang/test/Driver/darwin-objc-runtime-maccatalyst-target-variant.m b/clang/test/Driver/darwin-objc-runtime-maccatalyst-target-variant.m index 2b9d0d39ff128..8b430ddf6b6da 100644 --- a/clang/test/Driver/darwin-objc-runtime-maccatalyst-target-variant.m +++ b/clang/test/Driver/darwin-objc-runtime-maccatalyst-target-variant.m @@ -1,8 +1,8 @@ -// RUN: %clang -target x86_64-apple-ios13.2-macabi -darwin-target-variant x86_64-apple-macos10.15.3-macos -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.2-macabi -darwin-target-variant x86_64-apple-macos10.15.3-macos -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-macos10.15.1 -darwin-target-variant x86_64-apple-ios13.2-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-macos10.15.1 -darwin-target-variant x86_64-apple-ios13.2-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios13.2-macabi -darwin-target-variant x86_64-apple-macos10.15-macos -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.2-macabi -darwin-target-variant x86_64-apple-macos10.15-macos -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=LOWER %s // CHECK: -fobjc-runtime=macosx-10.15.1 diff --git a/clang/test/Driver/darwin-objc-runtime-maccatalyst.m b/clang/test/Driver/darwin-objc-runtime-maccatalyst.m index 1b330fc218198..2129dfd9b2b51 100644 --- a/clang/test/Driver/darwin-objc-runtime-maccatalyst.m +++ b/clang/test/Driver/darwin-objc-runtime-maccatalyst.m @@ -1,12 +1,12 @@ -// RUN: %clang -target x86_64-apple-ios13.2-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.2-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios13.2.0-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.2.0-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios13.2-macabi -isysroot %S/Inputs/MacOSX10.14.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.2-macabi -isysroot %S/Inputs/iPhoneOS13.0.sdk -c %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=FALLBACK-DEFAULT %s -// RUN: not %clang -target x86_64-apple-ios12.99.99-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: not %clang -target x86_64-apple-ios12.99.99-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=FALLBACK-DEFAULT %s -// RUN: %clang -target x86_64-apple-ios-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c %s -### 2>&1 \ +// RUN: %clang -target x86_64-apple-ios-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c %s -### 2>&1 \ // RUN: | FileCheck --check-prefix=FALLBACK-DEFAULT %s // CHECK: -fobjc-runtime=macosx-10.15.1 diff --git a/clang/test/Driver/darwin-sdk-version-maccatalyst.c b/clang/test/Driver/darwin-sdk-version-maccatalyst.c index 2ec0b6dfc4ceb..61fd3eaeca7bb 100644 --- a/clang/test/Driver/darwin-sdk-version-maccatalyst.c +++ b/clang/test/Driver/darwin-sdk-version-maccatalyst.c @@ -1,6 +1,6 @@ -// RUN: %clang -target x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c -### %s 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios13.99-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c -### %s 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.99-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck %s // CHECK: "-target-sdk-version=13.1" diff --git a/clang/test/Driver/darwin-sdk-version.c b/clang/test/Driver/darwin-sdk-version.c index e95103b7cfb58..9f8113f32a451 100644 --- a/clang/test/Driver/darwin-sdk-version.c +++ b/clang/test/Driver/darwin-sdk-version.c @@ -1,35 +1,35 @@ -// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %S/Inputs/MacOSX10.14.sdk -c -### %s 2>&1 \ +// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %S/Inputs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck %s -// RUN: env SDKROOT=%S/Inputs/MacOSX10.14.sdk %clang -target x86_64-apple-macosx10.13 -c -### %s 2>&1 \ +// RUN: env SDKROOT=%S/Inputs/MacOSX10.15.sdk %clang -target x86_64-apple-macosx10.13 -c -### %s 2>&1 \ // RUN: | FileCheck %s // // RUN: rm -rf %t/SDKs/MacOSX10.10.sdk // RUN: mkdir -p %t/SDKs/MacOSX10.10.sdk // RUN: %clang -m64 -isysroot %t/SDKs/MacOSX10.10.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefix=INFER_SDK_VERSION %s -// RUN: sed -e 's/10\.14/10\.8/g' %S/Inputs/MacOSX10.14.sdk/SDKSettings.json > %t/SDKs/MacOSX10.10.sdk/SDKSettings.json +// RUN: sed -e 's/10\.15/10\.8/g' %S/Inputs/MacOSX10.15.sdk/SDKSettings.json > %t/SDKs/MacOSX10.10.sdk/SDKSettings.json // RUN: %clang -m64 -isysroot %t/SDKs/MacOSX10.10.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefix=INFER_DEPLOYMENT_TARGET_VERSION %s // REQUIRES: system-darwin && native // -// RUN: rm -rf %t/SDKs/MacOSX10.14.sdk -// RUN: mkdir -p %t/SDKs/MacOSX10.14.sdk -// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %t/SDKs/MacOSX10.14.sdk -c -### %s 2>&1 \ +// RUN: rm -rf %t/SDKs/MacOSX10.15.sdk +// RUN: mkdir -p %t/SDKs/MacOSX10.15.sdk +// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %t/SDKs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefix=NO_VERSION %s // -// RUN: rm -rf %t/SDKs/MacOSX10.14.sdk -// RUN: mkdir -p %t/SDKs/MacOSX10.14.sdk -// RUN: echo '{broken json' > %t/SDKs/MacOSX10.14.sdk/SDKSettings.json -// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %t/SDKs/MacOSX10.14.sdk -c -### %s 2>&1 \ +// RUN: rm -rf %t/SDKs/MacOSX10.15.sdk +// RUN: mkdir -p %t/SDKs/MacOSX10.15.sdk +// RUN: echo '{broken json' > %t/SDKs/MacOSX10.15.sdk/SDKSettings.json +// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %t/SDKs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefixes=NO_VERSION,ERROR %s // -// RUN: rm -rf %t/SDKs/MacOSX10.14.sdk -// RUN: mkdir -p %t/SDKs/MacOSX10.14.sdk -// RUN: echo '{"Version":1}' > %t/SDKs/MacOSX10.14.sdk/SDKSettings.json -// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %t/SDKs/MacOSX10.14.sdk -c -### %s 2>&1 \ +// RUN: rm -rf %t/SDKs/MacOSX10.15.sdk +// RUN: mkdir -p %t/SDKs/MacOSX10.15.sdk +// RUN: echo '{"Version":1}' > %t/SDKs/MacOSX10.15.sdk/SDKSettings.json +// RUN: %clang -target x86_64-apple-macosx10.13 -isysroot %t/SDKs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefixes=NO_VERSION,ERROR %s -// CHECK: -target-sdk-version=10.14 +// CHECK: -target-sdk-version=10.15 // INFER_SDK_VERSION: "-triple" "{{arm64|x86_64}}-apple-macosx10.10.0" // INFER_SDK_VERSION-SAME: -target-sdk-version=10.10 // INFER_DEPLOYMENT_TARGET_VERSION: "-triple" "{{arm64|x86_64}}-apple-macosx10.8.0" diff --git a/clang/test/Driver/darwin-target-variant-sdk-version.c b/clang/test/Driver/darwin-target-variant-sdk-version.c index 32470e525d223..5b8a1c13576d7 100644 --- a/clang/test/Driver/darwin-target-variant-sdk-version.c +++ b/clang/test/Driver/darwin-target-variant-sdk-version.c @@ -1,10 +1,10 @@ -// RUN: %clang -target x86_64-apple-macosx10.15 -darwin-target-variant x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c -### %s 2>&1 \ +// RUN: %clang -target x86_64-apple-macosx10.15 -darwin-target-variant x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck %s -// RUN: env SDKROOT=%S/Inputs/MacOSX10.15.versioned.sdk %clang -target x86_64-apple-macosx10.15 -darwin-target-variant x86_64-apple-ios13.1-macabi -c -### %s 2>&1 \ +// RUN: env SDKROOT=%S/Inputs/MacOSX10.15.sdk %clang -target x86_64-apple-macosx10.15 -darwin-target-variant x86_64-apple-ios13.1-macabi -c -### %s 2>&1 \ // RUN: | FileCheck %s -// RUN: %clang -target x86_64-apple-ios13.1-macabi -darwin-target-variant x86_64-apple-macosx10.15 -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c -### %s 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.1-macabi -darwin-target-variant x86_64-apple-macosx10.15 -isysroot %S/Inputs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-SWAPPED %s -// RUN: %clang -target x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.versioned.sdk -c -### %s 2>&1 \ +// RUN: %clang -target x86_64-apple-ios13.1-macabi -isysroot %S/Inputs/MacOSX10.15.sdk -c -### %s 2>&1 \ // RUN: | FileCheck --check-prefix=CHECK-MACCATALYST %s // CHECK: "-target-sdk-version=10.15" "-darwin-target-variant-sdk-version=13.1" diff --git a/clang/test/Driver/modulemap-allow-subdirectory-search.c b/clang/test/Driver/modulemap-allow-subdirectory-search.c index f6535b2fa5829..261d409a6b500 100644 --- a/clang/test/Driver/modulemap-allow-subdirectory-search.c +++ b/clang/test/Driver/modulemap-allow-subdirectory-search.c @@ -21,15 +21,79 @@ // SEARCH-SUBDIRECTORIES-NOT: "-fno-modulemap-allow-subdirectory-search" //--- MacOSX15.0.sdk/SDKSettings.json -{"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" +} //--- MacOSX14.0.sdk/SDKSettings.json -{"Version":"14.0", "CanonicalName": "macosx14.0", "MaximumDeploymentTarget": "14.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": "macosx14.0", + "Version": "14.0", + "IsBaseSDK": "YES", + "DisplayName": "macOS 14.0", + "MinimalDisplayName": "14.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": "14.0", + "RecommendedDeploymentTarget": "10.14.6", + "MinimumDeploymentTarget": "10.13", "MaximumDeploymentTarget": "14.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"] + }, + "iosmac": { + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", + "BuildVersionPlatformID": "6", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "/System/iOSSupport", + "DefaultDeploymentTarget": "17.0", + "RecommendedDeploymentTarget": "13.1", + "MinimumDeploymentTarget": "13.1", "MaximumDeploymentTarget": "17.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"] + } + }, + "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"}, + "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"} + }, + "DefaultDeploymentTarget": "14.0", + "MaximumDeploymentTarget": "14.0.99" +} diff --git a/clang/test/InstallAPI/Inputs/MacOSX13.0.sdk/SDKSettings.json b/clang/test/InstallAPI/Inputs/MacOSX13.0.sdk/SDKSettings.json index 563d17cfface9..6cdd3a7fef54d 100644 --- a/clang/test/InstallAPI/Inputs/MacOSX13.0.sdk/SDKSettings.json +++ b/clang/test/InstallAPI/Inputs/MacOSX13.0.sdk/SDKSettings.json @@ -1,37 +1,36 @@ { - "DefaultVariant": "macos", "DisplayName": "macOS 13", - "Version": "13.0", "CanonicalName": "macosx13.0", - "MaximumDeploymentTarget": "13.0.99", - "PropertyConditionFallbackNames": [], + "Version": "13.0", + "IsBaseSDK": "YES", + "DisplayName": "macOS 13.0", + "MinimalDisplayName": "13.0", "SupportedTargets": { "macosx": { - "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "macos", - "LLVMTargetTripleEnvironment": "", - "SystemPrefix": "" + "PlatformFamilyName": "macOS", + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "1", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "", + "DefaultDeploymentTarget": "13.0", + "RecommendedDeploymentTarget": "10.14.6", + "MinimumDeploymentTarget": "10.13", "MaximumDeploymentTarget": "13.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"] }, "iosmac": { - "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "ios", - "LLVMTargetTripleEnvironment": "macabi", - "SystemPrefix": "\/System\/iOSSupport" + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", + "BuildVersionPlatformID": "6", + "ClangRuntimeLibraryPlatformName": "osx", + "SystemPrefix": "/System/iOSSupport", + "DefaultDeploymentTarget": "16.1", + "RecommendedDeploymentTarget": "13.1", + "MinimumDeploymentTarget": "13.1", "MaximumDeploymentTarget": "16.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"] } }, "VersionMap": { - "iOSMac_macOS": { - "16.1": "13.0", - "15.0": "12.0", - "13.1": "10.15", - "14.0": "11.0" - }, - "macOS_iOSMac": { - "13.0": "16.1", - "12.0": "15.0", - "11.0": "14.0", - "10.15": "13.1" - } - } + "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"}, + "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"} + }, + "DefaultDeploymentTarget": "13.0", + "MaximumDeploymentTarget": "13.0.99" } diff --git a/clang/test/Modules/sdk-settings-json-dep.m b/clang/test/Modules/sdk-settings-json-dep.m index a1de628f46323..2f4d7fa1470df 100644 --- a/clang/test/Modules/sdk-settings-json-dep.m +++ b/clang/test/Modules/sdk-settings-json-dep.m @@ -5,65 +5,75 @@ //--- AppleTVOS15.0.sdk/SDKSettings-old.json { - "DisplayName": "tvOS 15.0", - "Version": "15.0", "CanonicalName": "appletvos15.0", - "MaximumDeploymentTarget": "15.0.99", - "PropertyConditionFallbackNames": [], + "Version": "15.0", + "IsBaseSDK": "YES", + "DisplayName": "tvOS 15.0", + "MinimalDisplayName": "15.0", "SupportedTargets": { "appletvos": { - "Archs": ["arm64e", "arm64"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "tvos", - "LLVMTargetTripleEnvironment": "" + "PlatformFamilyName": "tvOS", + "Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "tvos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "3", + "DefaultDeploymentTarget": "15.0", + "MinimumDeploymentTarget": "9.0", "MaximumDeploymentTarget": "15.0.99", + "ValidDeploymentTargets": ["9.0", "9.1", "9.2", "10.0", "10.1", "10.2", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "15.0"] } }, + "DefaultDeploymentTarget": "15.0", + "MaximumDeploymentTarget": "15.0.99", + "Comments": [ + "Modified version of the tvOS SDK from Xcode 13.0 to remove VersionMap." + ] } //--- AppleTVOS15.0.sdk/SDKSettings-new.json { - "DisplayName": "tvOS 15.0", - "Version": "15.0", "CanonicalName": "appletvos15.0", - "MaximumDeploymentTarget": "15.0.99", - "PropertyConditionFallbackNames": [], + "Version": "15.0", + "IsBaseSDK": "YES", + "DisplayName": "tvOS 15.0", + "MinimalDisplayName": "15.0", "SupportedTargets": { "appletvos": { - "Archs": ["arm64e", "arm64"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "tvos", - "LLVMTargetTripleEnvironment": "" + "PlatformFamilyName": "tvOS", + "Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "tvos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "3", + "DefaultDeploymentTarget": "15.0", + "MinimumDeploymentTarget": "9.0", "MaximumDeploymentTarget": "15.0.99", + "ValidDeploymentTargets": ["9.0", "9.1", "9.2", "10.0", "10.1", "10.2", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "15.0"] } }, "VersionMap": { - "iOS_tvOS": { - "13.2": "13.1" - }, - "tvOS_iOS": { - "13.1": "13.2" - } - } + "tvOS_iOS": {"9.0": "9.0", "9.1": "9.2", "9.2": "9.3", "10.0": "10.0", "10.1": "10.2", "10.2": "10.3", "11.0": "11.0", "11.1": "11.1", "11.2": "11.2", "11.3": "11.3", "11.4": "11.4", "12.0": "12.0", "12.1": "12.1", "12.2": "12.2", "12.4": "12.4", "13.0": "13.0", "13.2": "13.2", "13.4": "13.4", "14.0": "14.0", "14.2": "14.2", "14.3": "14.3", "14.5": "14.5", "15.0": "15.0"}, + "iOS_tvOS": {"9.0": "9.0", "9.1": "9.0", "9.2": "9.1", "9.3": "9.2", "10.0": "10.0", "10.1": "10.0", "10.2": "10.1", "10.3": "10.2", "10.3.1": "10.2", "11.0": "11.0", "11.1": "11.1", "11.2": "11.2", "11.3": "11.3", "11.4": "11.4", "12.0": "12.0", "12.1": "12.1", "12.2": "12.2", "12.4": "12.4", "13.0": "13.0", "13.1": "13.0", "13.2": "13.2", "13.4": "13.4", "13.5": "13.4", "13.6": "13.4", "13.7": "13.4", "14.0": "14.0", "14.1": "14.0", "14.2": "14.2", "14.3": "14.3", "14.4": "14.3", "14.5": "14.5", "15.0": "15.0"} + }, + "DefaultDeploymentTarget": "15.0", + "MaximumDeploymentTarget": "15.0.99", + "Comments": [ + "Unmodified version of the tvOS SDK from Xcode 13.0." + ] } //--- module.modulemap module M { header "M.h" } //--- M.h -void foo(void) __attribute__((availability(iOS, obsoleted = 13.2))); +void foo(void) __attribute__((availability(iOS, obsoleted = 10.3))); void test() { foo(); } //--- tu.m #include "M.h" -// Compiling for tvOS 13.1 without "VersionMap" should succeed, since by default iOS 13.2 gets mapped to tvOS 13.2, +// Compiling for tvOS 10.2 without "VersionMap" should succeed, since by default iOS 10.3 gets mapped to tvOS 10.3, // and \c foo is therefore **not** deprecated. // RUN: cp %t/AppleTVOS15.0.sdk/SDKSettings-old.json %t/AppleTVOS15.0.sdk/SDKSettings.json -// RUN: %clang -target x86_64-apple-tvos13.1 -isysroot %t/AppleTVOS15.0.sdk \ +// RUN: %clang -target x86_64-apple-tvos10.2 -isysroot %t/AppleTVOS15.0.sdk \ // RUN: -fsyntax-only %t/tu.m -o %t/tu.o -fmodules -Xclang -fdisable-module-hash -fmodules-cache-path=%t/cache -// Compiling for tvOS 13.1 with "VersionMap" saying it maps to iOS 13.2 should fail, since \c foo is now deprecated. +// Compiling for tvOS 10.2 with "VersionMap" saying it maps to iOS 10.3 should fail, since \c foo is now deprecated. // RUN: sleep 1 // RUN: cp %t/AppleTVOS15.0.sdk/SDKSettings-new.json %t/AppleTVOS15.0.sdk/SDKSettings.json -// RUN: not %clang -target x86_64-apple-tvos13.1 -isysroot %t/AppleTVOS15.0.sdk \ +// RUN: not %clang -target x86_64-apple-tvos10.2 -isysroot %t/AppleTVOS15.0.sdk \ // RUN: -fsyntax-only %t/tu.m -o %t/tu.o -fmodules -Xclang -fdisable-module-hash -fmodules-cache-path=%t/cache 2>&1 \ // RUN: | FileCheck %s -// CHECK: M.h:2:15: error: 'foo' is unavailable: obsoleted in tvOS 13.1 +// CHECK: M.h:2:15: error: 'foo' is unavailable: obsoleted in tvOS 10.2 // CHECK: M.h:1:6: note: 'foo' has been explicitly marked unavailable here // CHECK: tu.m:1:10: fatal error: could not build module 'M' diff --git a/clang/test/Sema/Inputs/AppleTVOS15.0.sdk/SDKSettings.json b/clang/test/Sema/Inputs/AppleTVOS15.0.sdk/SDKSettings.json index 1c74c27e48b96..b10c021c38862 100644 --- a/clang/test/Sema/Inputs/AppleTVOS15.0.sdk/SDKSettings.json +++ b/clang/test/Sema/Inputs/AppleTVOS15.0.sdk/SDKSettings.json @@ -1,76 +1,23 @@ { - "DisplayName": "tvOS 15.0", - "Version": "15.0", "CanonicalName": "appletvos15.0", - "MaximumDeploymentTarget": "15.0.99", - "PropertyConditionFallbackNames": [], + "Version": "15.0", + "IsBaseSDK": "YES", + "DisplayName": "tvOS 15.0", + "MinimalDisplayName": "15.0", "SupportedTargets": { "appletvos": { - "Archs": ["arm64e", "arm64"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "tvos", - "LLVMTargetTripleEnvironment": "" + "PlatformFamilyName": "tvOS", + "Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "tvos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "3", + "DefaultDeploymentTarget": "15.0", + "MinimumDeploymentTarget": "9.0", "MaximumDeploymentTarget": "15.0.99", + "ValidDeploymentTargets": ["9.0", "9.1", "9.2", "10.0", "10.1", "10.2", "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", "13.0", "13.1", "13.2", "13.3", "13.4", "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "15.0"] } }, "VersionMap": { - "iOS_tvOS": { - "10.0": "10.0", - "10.1": "10.0", - "10.2": "10.1", - "10.3": "10.2", - "10.3.1": "10.2", - "11.0": "11.0", - "11.1": "11.1", - "11.2": "11.2", - "11.3": "11.3", - "11.4": "11.4", - "12.0": "12.0", - "12.1": "12.1", - "12.2": "12.2", - "12.4": "12.4", - "13.0": "13.0", - "13.1": "13.0", - "13.2": "13.2", - "13.4": "13.4", - "13.5": "13.4", - "13.6": "13.4", - "13.7": "13.4", - "14.0": "14.0", - "14.1": "14.0", - "14.2": "14.2", - "14.3": "14.3", - "14.4": "14.3", - "14.5": "14.5", - "15.0": "15.0", - "9.0": "9.0", - "9.1": "9.0", - "9.2": "9.1", - "9.3": "9.2" - }, - "tvOS_iOS": { - "10.0": "10.0", - "10.1": "10.2", - "10.2": "10.3", - "11.0": "11.0", - "11.1": "11.1", - "11.2": "11.2", - "11.3": "11.3", - "11.4": "11.4", - "12.0": "12.0", - "12.1": "12.1", - "12.2": "12.2", - "12.4": "12.4", - "13.0": "13.0", - "13.2": "13.2", - "13.4": "13.4", - "14.0": "14.0", - "14.2": "14.2", - "14.3": "14.3", - "14.5": "14.5", - "15.0": "15.0", - "9.0": "9.0", - "9.1": "9.2", - "9.2": "9.3" - } - } + "tvOS_iOS": {"9.0": "9.0", "9.1": "9.2", "9.2": "9.3", "10.0": "10.0", "10.1": "10.2", "10.2": "10.3", "11.0": "11.0", "11.1": "11.1", "11.2": "11.2", "11.3": "11.3", "11.4": "11.4", "12.0": "12.0", "12.1": "12.1", "12.2": "12.2", "12.4": "12.4", "13.0": "13.0", "13.2": "13.2", "13.4": "13.4", "14.0": "14.0", "14.2": "14.2", "14.3": "14.3", "14.5": "14.5", "15.0": "15.0"}, + "iOS_tvOS": {"9.0": "9.0", "9.1": "9.0", "9.2": "9.1", "9.3": "9.2", "10.0": "10.0", "10.1": "10.0", "10.2": "10.1", "10.3": "10.2", "10.3.1": "10.2", "11.0": "11.0", "11.1": "11.1", "11.2": "11.2", "11.3": "11.3", "11.4": "11.4", "12.0": "12.0", "12.1": "12.1", "12.2": "12.2", "12.4": "12.4", "13.0": "13.0", "13.1": "13.0", "13.2": "13.2", "13.4": "13.4", "13.5": "13.4", "13.6": "13.4", "13.7": "13.4", "14.0": "14.0", "14.1": "14.0", "14.2": "14.2", "14.3": "14.3", "14.4": "14.3", "14.5": "14.5", "15.0": "15.0"} + }, + "DefaultDeploymentTarget": "15.0", + "MaximumDeploymentTarget": "15.0.99" } diff --git a/clang/test/Sema/Inputs/MacOSX11.0.sdk/SDKSettings.json b/clang/test/Sema/Inputs/MacOSX11.0.sdk/SDKSettings.json index fbb8fa69edf5f..4bb8ad5eb8400 100644 --- a/clang/test/Sema/Inputs/MacOSX11.0.sdk/SDKSettings.json +++ b/clang/test/Sema/Inputs/MacOSX11.0.sdk/SDKSettings.json @@ -1,39 +1,30 @@ { - "DefaultVariant": "macos", "DisplayName": "macOS 11", - "Version": "11.0", "CanonicalName": "macosx11.0", - "MaximumDeploymentTarget": "11.0.99", - "PropertyConditionFallbackNames": [], + "Version": "11.0", + "IsBaseSDK": "YES", + "DisplayName": "macOS 11.0", + "MinimalDisplayName": "11.0", "SupportedTargets": { "macosx": { - "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "macosx", - "LLVMTargetTripleEnvironment": "" + "PlatformFamilyName": "macOS", + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "macosx", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "1", + "DefaultDeploymentTarget": "11.0", + "MinimumDeploymentTarget": "10.9", "MaximumDeploymentTarget": "11.0.99", + "ValidDeploymentTargets": ["10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0"] }, "iosmac": { - "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "ios", - "LLVMTargetTripleEnvironment": "macabi" + "Archs": ["x86_64", "x86_64h", "arm64", "arm64e"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "ios", "LLVMTargetTripleEnvironment": "macabi", + "BuildVersionPlatformID": "6", + "DefaultDeploymentTarget": "14.2", + "MinimumDeploymentTarget": "13.1", "MaximumDeploymentTarget": "14.2.99", + "ValidDeploymentTargets": ["13.1", "13.2", "13.3", "13.3.1", "13.4", "13.5", "14.2"] } }, "VersionMap": { - "iOSMac_macOS": { - "13.2": "10.15.1", - "13.4": "10.15.4", - "13.3.1": "10.15.3", - "13.3": "10.15.2", - "13.1": "10.15", - "14.0": "11.0" - }, - "macOS_iOSMac": { - "10.15.2": "13.3", - "11.0": "14.0", - "10.15": "13.1", - "10.15.3": "13.3.1", - "10.15.1": "13.2", - "10.15.4": "13.4" - } - } + "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"}, + "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.2": "11.0"} + }, + "DefaultDeploymentTarget": "11.0", + "MaximumDeploymentTarget": "11.0.99" } diff --git a/clang/test/Sema/Inputs/WatchOS7.0.sdk/SDKSettings.json b/clang/test/Sema/Inputs/WatchOS7.0.sdk/SDKSettings.json deleted file mode 100644 index 4481ec7ddefd4..0000000000000 --- a/clang/test/Sema/Inputs/WatchOS7.0.sdk/SDKSettings.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "DisplayName": "watchOS 7.0", - "Version": "7.0", - "CanonicalName": "watchos7.0", - "MaximumDeploymentTarget": "7.0.99", - "PropertyConditionFallbackNames": [], - "SupportedTargets": { - "watchos": { - "Archs": ["arm64_32", "armv7k"], - "LLVMTargetTripleVendor": "apple", - "LLVMTargetTripleSys": "watchos", - "LLVMTargetTripleEnvironment": "" - } - }, - "VersionMap": { - "iOS_watchOS": { - "10.0": "3.0", - "10.1": "3.1", - "10.2": "3.1", - "10.3": "3.2", - "10.3.1": "3.2", - "11.0": "4.0", - "11.1": "4.1", - "11.2": "4.2", - "11.3": "4.3", - "11.4": "4.3", - "12.0": "5.0", - "12.1": "5.1", - "12.2": "5.2", - "12.4": "5.3", - "13.0": "6.0", - "13.1": "6.0", - "13.2": "6.1", - "13.4": "6.2", - "13.5": "6.2", - "13.6": "6.2", - "13.7": "6.2", - "14.0": "7.0", - "14.1": "7.0", - "9.0": "2.0", - "9.1": "2.0", - "9.2": "2.1", - "9.3": "2.2" - }, - "watchOS_iOS": { - "2.0": "9.0", - "2.1": "9.2", - "2.2": "9.3", - "3.0": "10.0", - "3.1": "10.1", - "3.2": "10.3", - "4.0": "11.0", - "4.1": "11.1", - "4.2": "11.2", - "4.3": "11.3", - "5.0": "12.0", - "5.1": "12.1", - "5.2": "12.2", - "5.3": "12.4", - "6.0": "13.0", - "6.1": "13.2", - "6.2": "13.4", - "7.0": "14.0" - } - } -} diff --git a/clang/test/Sema/Inputs/WatchOS8.0.sdk/SDKSettings.json b/clang/test/Sema/Inputs/WatchOS8.0.sdk/SDKSettings.json new file mode 100644 index 0000000000000..5dfc54123b4c8 --- /dev/null +++ b/clang/test/Sema/Inputs/WatchOS8.0.sdk/SDKSettings.json @@ -0,0 +1,23 @@ +{ + "CanonicalName": "watchos8.0", + "Version": "8.0", + "IsBaseSDK": "YES", + "DisplayName": "watchOS 8.0", + "MinimalDisplayName": "8.0", + "SupportedTargets": { + "watchos": { + "PlatformFamilyName": "watchOS", + "Archs": ["arm64_32", "armv7k"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "watchos", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "4", + "DefaultDeploymentTarget": "8.0", + "MinimumDeploymentTarget": "2.0", "MaximumDeploymentTarget": "8.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", "6.1", "6.2", "7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0"] + } + }, + "VersionMap": { + "watchOS_iOS": {"2.0": "9.0", "2.1": "9.2", "2.2": "9.3", "3.0": "10.0", "3.1": "10.1", "3.2": "10.3", "4.0": "11.0", "4.1": "11.1", "4.2": "11.2", "4.3": "11.3", "5.0": "12.0", "5.1": "12.1", "5.2": "12.2", "5.3": "12.4", "6.0": "13.0", "6.1": "13.2", "6.2": "13.4", "7.0": "14.0", "7.1": "14.2", "7.2": "14.3", "7.4": "14.5", "8.0": "15.0"}, + "iOS_watchOS": {"9.0": "2.0", "9.1": "2.0", "9.2": "2.1", "9.3": "2.2", "10.0": "3.0", "10.1": "3.1", "10.2": "3.1", "10.3": "3.2", "10.3.1": "3.2", "11.0": "4.0", "11.1": "4.1", "11.2": "4.2", "11.3": "4.3", "11.4": "4.3", "12.0": "5.0", "12.1": "5.1", "12.2": "5.2", "12.4": "5.3", "13.0": "6.0", "13.1": "6.0", "13.2": "6.1", "13.4": "6.2", "13.5": "6.2", "13.6": "6.2", "13.7": "6.2", "14.0": "7.0", "14.1": "7.0", "14.2": "7.1", "14.3": "7.2", "14.4": "7.2", "14.5": "7.4", "15.0": "8.0"}, + }, + "DefaultDeploymentTarget": "8.0", + "MaximumDeploymentTarget": "8.0.99" +} diff --git a/clang/test/Sema/Inputs/XROS.sdk/SDKSettings.json b/clang/test/Sema/Inputs/XROS.sdk/SDKSettings.json deleted file mode 100644 index ccae54bcff48c..0000000000000 --- a/clang/test/Sema/Inputs/XROS.sdk/SDKSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "DefaultVariant": "xrOS", "DisplayName": "xrOS", - "Version": "26.0", - "CanonicalName": "xros26.0", - "MaximumDeploymentTarget": "26.0.99", - "SupportedTargets": { - "xros": {"Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "xros", "LLVMTargetTripleEnvironment": "", "SystemPrefix": ""} - }, - "VersionMap": { - "iOS_xrOS":{"15.0":"1.0", "16.0":"2.0", "19.0":"26.0", "26.0":"26.0"} - } -} diff --git a/clang/test/Sema/Inputs/XROS26.0.sdk/SDKSettings.json b/clang/test/Sema/Inputs/XROS26.0.sdk/SDKSettings.json new file mode 100644 index 0000000000000..7e5b708fcebcb --- /dev/null +++ b/clang/test/Sema/Inputs/XROS26.0.sdk/SDKSettings.json @@ -0,0 +1,29 @@ +{ + "CanonicalName": "xros26.0", + "Version": "26.0", + "IsBaseSDK": "YES", + "DisplayName": "visionOS 26.0", + "MinimalDisplayName": "26.0", + "SupportedTargets": { + "xros": { + "PlatformFamilyName": "xrOS", + "PlatformFamilyDisplayName": "visionOS", + "Archs": ["arm64e", "arm64"], "LLVMTargetTripleVendor": "apple", "LLVMTargetTripleSys": "xros", "LLVMTargetTripleEnvironment": "", + "BuildVersionPlatformID": "11", + "ClangRuntimeLibraryPlatformName": "xros", + "SystemPrefix": "", + "DefaultDeploymentTarget": "26.0", + "RecommendedDeploymentTarget": "1.0", + "MinimumDeploymentTarget": "1.0", "MaximumDeploymentTarget": "26.0.99", + "ValidDeploymentTargets": ["1.0", "1.1", "1.2", "1.3", "2.0", "2.1", "2.2", "2.3", "2.4", "2.5", "2.6", "26.0"] + } + }, + "VersionMap": { + "visionOS_iOS": {"1.0": "17.1", "1.1": "17.4", "1.2": "17.5", "2.0": "18.0", "2.1": "18.1", "2.2": "18.2", "2.3": "18.3", "2.4": "18.4", "2.5": "18.5", "2.6": "18.6", "26.0": "26.0"}, + "iOS_visionOS": {"17.1": "1.0", "17.4": "1.1", "17.5": "1.2", "18.0": "2.0", "18.1": "2.1", "18.2": "2.2", "18.3": "2.3", "18.4": "2.4", "18.5": "2.5", "18.6": "2.6", "26.0": "26.0"}, + "xrOS_iOS": {"1.0": "17.1", "1.1": "17.4", "1.2": "17.5", "2.0": "18.0", "2.1": "18.1", "2.2": "18.2", "2.3": "18.3", "2.4": "18.4", "2.5": "18.5", "2.6": "18.6", "26.0": "26.0"}, + "iOS_xrOS": {"17.1": "1.0", "17.4": "1.1", "17.5": "1.2", "18.0": "2.0", "18.1": "2.1", "18.2": "2.2", "18.3": "2.3", "18.4": "2.4", "18.5": "2.5", "18.6": "2.6", "26.0": "26.0"} + }, + "DefaultDeploymentTarget": "26.0", + "MaximumDeploymentTarget": "26.0.99" +} diff --git a/clang/test/Sema/attr-availability-ios-fallback-aligned-versions.c b/clang/test/Sema/attr-availability-ios-fallback-aligned-versions.c index 8947bc7dda469..6d87deef84f2f 100644 --- a/clang/test/Sema/attr-availability-ios-fallback-aligned-versions.c +++ b/clang/test/Sema/attr-availability-ios-fallback-aligned-versions.c @@ -6,7 +6,7 @@ // RUN: %clang_cc1 "-triple" "arm64-apple-tvos26" -fsyntax-only -verify %s // VisionOS requires SDKSettings support to enable remappings. -// RUN: %clang_cc1 "-triple" "arm64-apple-visionos26" -isysroot %S/Inputs/XROS.sdk -fsyntax-only -verify %s +// RUN: %clang_cc1 "-triple" "arm64-apple-visionos26" -isysroot %S/Inputs/XROS26.0.sdk -fsyntax-only -verify %s // expected-no-diagnostics diff --git a/clang/test/Sema/attr-availability-iosmac-infer-from-macos.c b/clang/test/Sema/attr-availability-iosmac-infer-from-macos.c index 73ff8c33ebe54..f7b3bf31e9ef8 100644 --- a/clang/test/Sema/attr-availability-iosmac-infer-from-macos.c +++ b/clang/test/Sema/attr-availability-iosmac-infer-from-macos.c @@ -35,7 +35,7 @@ void usage(void) { fAvail(); f16(); #ifndef IOS14 - // expected-warning@-2 {{'f16' is only available on macCatalyst 14.0 or newer}} expected-note@-2 {{enclose}} + // expected-warning@-2 {{'f16' is only available on macCatalyst 14.2 or newer}} expected-note@-2 {{enclose}} #endif fObs(); // expected-error {{'fObs' is unavailable: obsoleted in macCatalyst 13.1}} fAPItoDepr(); diff --git a/clang/test/Sema/attr-availability-watchos.c b/clang/test/Sema/attr-availability-watchos.c index 8a9cc60dea474..80cd213e9f3e6 100644 --- a/clang/test/Sema/attr-availability-watchos.c +++ b/clang/test/Sema/attr-availability-watchos.c @@ -1,5 +1,5 @@ // RUN: %clang_cc1 "-triple" "arm64-apple-watchos4.0" -fsyntax-only -verify %s -// RUN: %clang_cc1 "-triple" "arm64-apple-watchos4.0" -DUSE_VERSION_MAP -isysroot %S/Inputs/WatchOS7.0.sdk -fsyntax-only -verify %s +// RUN: %clang_cc1 "-triple" "arm64-apple-watchos4.0" -DUSE_VERSION_MAP -isysroot %S/Inputs/WatchOS8.0.sdk -fsyntax-only -verify %s void f0(int) __attribute__((availability(ios,introduced=2.0,deprecated=2.1))); // expected-note {{'f0' has been explicitly marked deprecated here}} void f1(int) __attribute__((availability(ios,introduced=2.1))); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
