Skip to content

Commit a97f734

Browse files
authored
[libc++] Fix deployment targets that were incorrectly bumped (#134278)
When I introduced the various `_LIBCPP_INTRODUCED_IN_LLVM_XY_ATTRIBUTE` macros in 182f5e9, I tried to correlate them to the right OS versions, but it seems that I made a few mistakes. This wasn't caught in the CI because we don't test back-deployment that far. rdar://148405946
1 parent 50f0b30 commit a97f734

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

libcxx/include/__configuration/availability.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,21 +171,21 @@
171171
__attribute__((availability(driverkit, strict, introduced = 23.0)))
172172

173173
// LLVM 15
174-
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 130400) || \
175-
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 160500) || \
176-
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 160500) || \
177-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 90500) || \
174+
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 130300) || \
175+
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 160300) || \
176+
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 160300) || \
177+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 90300) || \
178178
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 70500) || \
179179
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 220400)
180180
# define _LIBCPP_INTRODUCED_IN_LLVM_15 0
181181
# else
182182
# define _LIBCPP_INTRODUCED_IN_LLVM_15 1
183183
# endif
184184
# define _LIBCPP_INTRODUCED_IN_LLVM_15_ATTRIBUTE \
185-
__attribute__((availability(macos, strict, introduced = 13.4))) \
186-
__attribute__((availability(ios, strict, introduced = 16.5))) \
187-
__attribute__((availability(tvos, strict, introduced = 16.5))) \
188-
__attribute__((availability(watchos, strict, introduced = 9.5))) \
185+
__attribute__((availability(macos, strict, introduced = 13.3))) \
186+
__attribute__((availability(ios, strict, introduced = 16.3))) \
187+
__attribute__((availability(tvos, strict, introduced = 16.3))) \
188+
__attribute__((availability(watchos, strict, introduced = 9.3))) \
189189
__attribute__((availability(bridgeos, strict, introduced = 7.5))) \
190190
__attribute__((availability(driverkit, strict, introduced = 22.4)))
191191

0 commit comments

Comments
 (0)