Skip to content

Commit 1f26a95

Browse files
ldionneSterling-Augustine
ldionne
authored and
Sterling-Augustine
committed
[libc++][Apple] Add missing availabilty mappings for Apple platforms (llvm#110289)
1 parent b76743e commit 1f26a95

File tree

1 file changed

+36
-12
lines changed

1 file changed

+36
-12
lines changed

‎libcxx/include/__configuration/availability.h‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@
141141
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 150000) || \
142142
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 180000) || \
143143
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 180000) || \
144-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 110000)
144+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 110000) || \
145+
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 90000) || \
146+
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 240000)
145147
# define _LIBCPP_INTRODUCED_IN_LLVM_18 0
146148
# else
147149
# define _LIBCPP_INTRODUCED_IN_LLVM_18 1
@@ -150,13 +152,17 @@
150152
__attribute__((availability(macos, strict, introduced = 15.0))) \
151153
__attribute__((availability(ios, strict, introduced = 18.0))) \
152154
__attribute__((availability(tvos, strict, introduced = 18.0))) \
153-
__attribute__((availability(watchos, strict, introduced = 11.0)))
155+
__attribute__((availability(watchos, strict, introduced = 11.0))) \
156+
__attribute__((availability(bridgeos, strict, introduced = 9.0))) \
157+
__attribute__((availability(driverkit, strict, introduced = 24.0)))
154158

155159
// LLVM 17
156160
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 140400) || \
157161
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 170400) || \
158162
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 170400) || \
159-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 100400)
163+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 100400) || \
164+
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 80400) || \
165+
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 230400)
160166
# define _LIBCPP_INTRODUCED_IN_LLVM_17 0
161167
# else
162168
# define _LIBCPP_INTRODUCED_IN_LLVM_17 1
@@ -165,13 +171,17 @@
165171
__attribute__((availability(macos, strict, introduced = 14.4))) \
166172
__attribute__((availability(ios, strict, introduced = 17.4))) \
167173
__attribute__((availability(tvos, strict, introduced = 17.4))) \
168-
__attribute__((availability(watchos, strict, introduced = 10.4)))
174+
__attribute__((availability(watchos, strict, introduced = 10.4))) \
175+
__attribute__((availability(bridgeos, strict, introduced = 8.4))) \
176+
__attribute__((availability(driverkit, strict, introduced = 23.4)))
169177

170178
// LLVM 16
171179
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 140000) || \
172180
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 170000) || \
173181
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 170000) || \
174-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 100000)
182+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 100000) || \
183+
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 80000) || \
184+
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 230000)
175185
# define _LIBCPP_INTRODUCED_IN_LLVM_16 0
176186
# else
177187
# define _LIBCPP_INTRODUCED_IN_LLVM_16 1
@@ -180,13 +190,17 @@
180190
__attribute__((availability(macos, strict, introduced = 14.0))) \
181191
__attribute__((availability(ios, strict, introduced = 17.0))) \
182192
__attribute__((availability(tvos, strict, introduced = 17.0))) \
183-
__attribute__((availability(watchos, strict, introduced = 10.0)))
193+
__attribute__((availability(watchos, strict, introduced = 10.0))) \
194+
__attribute__((availability(bridgeos, strict, introduced = 8.0))) \
195+
__attribute__((availability(driverkit, strict, introduced = 23.0)))
184196

185197
// LLVM 15
186198
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 130400) || \
187199
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 160500) || \
188200
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 160500) || \
189-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 90500)
201+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 90500) || \
202+
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 70500) || \
203+
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 220400)
190204
# define _LIBCPP_INTRODUCED_IN_LLVM_15 0
191205
# else
192206
# define _LIBCPP_INTRODUCED_IN_LLVM_15 1
@@ -195,7 +209,9 @@
195209
__attribute__((availability(macos, strict, introduced = 13.4))) \
196210
__attribute__((availability(ios, strict, introduced = 16.5))) \
197211
__attribute__((availability(tvos, strict, introduced = 16.5))) \
198-
__attribute__((availability(watchos, strict, introduced = 9.5)))
212+
__attribute__((availability(watchos, strict, introduced = 9.5))) \
213+
__attribute__((availability(bridgeos, strict, introduced = 7.5))) \
214+
__attribute__((availability(driverkit, strict, introduced = 22.4)))
199215

200216
// LLVM 14
201217
# define _LIBCPP_INTRODUCED_IN_LLVM_14 _LIBCPP_INTRODUCED_IN_LLVM_15
@@ -205,7 +221,9 @@
205221
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 130000) || \
206222
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 160000) || \
207223
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 160000) || \
208-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 90000)
224+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 90000) || \
225+
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 70000) || \
226+
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 220000)
209227
# define _LIBCPP_INTRODUCED_IN_LLVM_13 0
210228
# else
211229
# define _LIBCPP_INTRODUCED_IN_LLVM_13 1
@@ -214,13 +232,17 @@
214232
__attribute__((availability(macos, strict, introduced = 13.0))) \
215233
__attribute__((availability(ios, strict, introduced = 16.0))) \
216234
__attribute__((availability(tvos, strict, introduced = 16.0))) \
217-
__attribute__((availability(watchos, strict, introduced = 9.0)))
235+
__attribute__((availability(watchos, strict, introduced = 9.0))) \
236+
__attribute__((availability(bridgeos, strict, introduced = 7.0))) \
237+
__attribute__((availability(driverkit, strict, introduced = 22.0)))
218238

219239
// LLVM 12
220240
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 120300) || \
221241
(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 150300) || \
222242
(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 150300) || \
223-
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 80300)
243+
(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 80300) || \
244+
(defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 60000) || \
245+
(defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 210300)
224246
# define _LIBCPP_INTRODUCED_IN_LLVM_12 0
225247
# else
226248
# define _LIBCPP_INTRODUCED_IN_LLVM_12 1
@@ -229,7 +251,9 @@
229251
__attribute__((availability(macos, strict, introduced = 12.3))) \
230252
__attribute__((availability(ios, strict, introduced = 15.3))) \
231253
__attribute__((availability(tvos, strict, introduced = 15.3))) \
232-
__attribute__((availability(watchos, strict, introduced = 8.3)))
254+
__attribute__((availability(watchos, strict, introduced = 8.3))) \
255+
__attribute__((availability(bridgeos, strict, introduced = 6.0))) \
256+
__attribute__((availability(driverkit, strict, introduced = 21.3)))
233257

234258
// LLVM 11
235259
# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 110000) || \

0 commit comments

Comments
 (0)