@@ -244,8 +244,7 @@ fn test_apple(target: &str) {
244244 "os/clock.h" ,
245245 "os/lock.h" ,
246246 "os/signpost.h" ,
247- // FIXME(macos): Requires the macOS 14.4 SDK.
248- //"os/os_sync_wait_on_address.h",
247+ "os/os_sync_wait_on_address.h" ,
249248 "poll.h" ,
250249 "pthread.h" ,
251250 "pthread_spis.h" ,
@@ -322,21 +321,15 @@ fn test_apple(target: &str) {
322321 // it is a moving target, changing through versions
323322 // also contains bitfields members
324323 "tcp_connection_info" => true ,
325- // FIXME(macos): The size is changed in recent macOSes.
326- "malloc_introspection_t" => true ,
327324 _ => false ,
328325 }
329326 } ) ;
330327
331328 cfg. skip_alias ( |ty| ty. ident ( ) . starts_with ( "__c_anonymous_" ) ) ;
332329 cfg. skip_alias ( |ty| {
333330 match ty. ident ( ) {
334- // FIXME(macos): Requires the macOS 14.4 SDK.
335- "os_sync_wake_by_address_flags_t" | "os_sync_wait_on_address_flags_t" => true ,
336-
337331 // FIXME(macos): "'__uint128' undeclared" in C
338332 "__uint128" => true ,
339-
340333 _ => false ,
341334 }
342335 } ) ;
@@ -345,7 +338,7 @@ fn test_apple(target: &str) {
345338 match constant. ident ( ) {
346339 // They're declared via `deprecated_mach` and we don't support it anymore.
347340 x if x. starts_with ( "VM_FLAGS_" ) => true ,
348- // These OSX constants are removed in Sierra.
341+ // FIXME(deprecated): These OSX constants are removed in Sierra.
349342 // https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
350343 "KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true ,
351344 // FIXME(macos): the value has been changed since Catalina (0xffff0000 -> 0x3fff0000).
@@ -354,12 +347,6 @@ fn test_apple(target: &str) {
354347 // FIXME(macos): XCode 13.1 doesn't have it.
355348 "TIOCREMOTE" => true ,
356349
357- // FIXME(macos): Requires the macOS 14.4 SDK.
358- "OS_SYNC_WAKE_BY_ADDRESS_NONE"
359- | "OS_SYNC_WAKE_BY_ADDRESS_SHARED"
360- | "OS_SYNC_WAIT_ON_ADDRESS_NONE"
361- | "OS_SYNC_WAIT_ON_ADDRESS_SHARED" => true ,
362-
363350 _ => false ,
364351 }
365352 } ) ;
@@ -369,41 +356,17 @@ fn test_apple(target: &str) {
369356 match func. ident ( ) {
370357 // FIXME: https://github.com/rust-lang/libc/issues/1272
371358 "execv" | "execve" | "execvp" => true ,
372- // close calls the close_nocancel system call
373- "close" => true ,
374-
375359 // FIXME(1.0): std removed libresolv support: https://github.com/rust-lang/rust/pull/102766
376360 "res_init" => true ,
377-
378- // FIXME(macos): remove once the target in CI is updated
379- "pthread_jit_write_freeze_callbacks_np" => true ,
380-
381- // FIXME(macos): ABI has been changed on recent macOSes.
382- "os_unfair_lock_assert_owner" | "os_unfair_lock_assert_not_owner" => true ,
383-
384- // FIXME(macos): Once the SDK get updated to Ventura's level
385- "freadlink" | "mknodat" | "mkfifoat" => true ,
386-
387- // FIXME(macos): Requires the macOS 14.4 SDK.
388- "os_sync_wake_by_address_any"
389- | "os_sync_wake_by_address_all"
390- | "os_sync_wake_by_address_flags_t"
391- | "os_sync_wait_on_address"
392- | "os_sync_wait_on_address_flags_t"
393- | "os_sync_wait_on_address_with_deadline"
394- | "os_sync_wait_on_address_with_timeout" => true ,
395-
396361 _ => false ,
397362 }
398363 } ) ;
399364
400365 cfg. skip_struct_field ( move |struct_, field| {
401366 match ( struct_. ident ( ) , field. ident ( ) ) {
402- // FIXME(macos): the array size has been changed since macOS 10.15 ([8] -> [7]).
403- ( "statfs" , "f_reserved" ) => true ,
404- ( "__darwin_arm_neon_state64" , "__v" ) => true ,
405367 // MAXPATHLEN is too big for auto-derive traits on arrays.
406368 ( "vnode_info_path" , "vip_path" ) => true ,
369+ // Anonymous ADT fields
407370 ( "ifreq" , "ifr_ifru" ) => true ,
408371 ( "in6_ifreq" , "ifr_ifru" ) => true ,
409372 ( "ifkpi" , "ifk_data" ) => true ,
@@ -454,8 +417,6 @@ fn test_apple(target: &str) {
454417 cfg. skip_roundtrip ( move |s| match s {
455418 // FIXME(macos): this type has the wrong ABI
456419 "max_align_t" if i686 => true ,
457- // Can't return an array from a C function.
458- "uuid_t" | "vol_capabilities_set_t" => true ,
459420 _ => false ,
460421 } ) ;
461422
0 commit comments