diff --git a/lib/libc/darwin/SDKSettings.json b/lib/libc/darwin/SDKSettings.json
index 4227f987e3a9..e833e646c374 100644
--- a/lib/libc/darwin/SDKSettings.json
+++ b/lib/libc/darwin/SDKSettings.json
@@ -1 +1 @@
-{"MinimalDisplayName":"15.1"}
+{"MinimalDisplayName":"15.2"}
diff --git a/lib/libc/darwin/libSystem.tbd b/lib/libc/darwin/libSystem.tbd
index b4bf452f224f..bfdc5b945364 100644
--- a/lib/libc/darwin/libSystem.tbd
+++ b/lib/libc/darwin/libSystem.tbd
@@ -71,7 +71,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libcommonCrypto.dylib'
-current-version: 65535
+current-version: 65535.60.1
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -399,7 +399,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libcorecrypto.dylib'
-current-version: 1736.40.7
+current-version: 1736.60.68
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -769,7 +769,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libdispatch.dylib'
-current-version: 1502.0.1
+current-version: 1504.60.7
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1051,7 +1051,7 @@ exports:
tbd-version: 4
targets: [ x86_64-macos, arm64-macos, arm64e-macos ]
install-name: '/usr/lib/system/libmacho.dylib'
-current-version: 1021.4
+current-version: 1022.1
parent-umbrella:
- targets: [ x86_64-macos, arm64-macos, arm64e-macos ]
umbrella: System
@@ -1070,35 +1070,28 @@ exports:
_swap_dylinker_command, _swap_dysymtab_command, _swap_encryption_command,
_swap_encryption_command_64, _swap_entry_point_command, _swap_fat_arch,
_swap_fat_arch_64, _swap_fat_header, _swap_fileset_entry_command,
- _swap_fvmfile_command, _swap_fvmlib_command, _swap_hppa_fp_thread_state,
- _swap_hppa_frame_thread_state, _swap_hppa_integer_thread_state,
- _swap_i386_exception_state, _swap_i386_float_state, _swap_i386_thread_state,
- _swap_i860_thread_state_regs, _swap_ident_command, _swap_indirect_symbols,
- _swap_linkedit_data_command, _swap_linker_option_command,
- _swap_load_command, _swap_m68k_thread_state_68882, _swap_m68k_thread_state_regs,
- _swap_m68k_thread_state_user_reg, _swap_m88110_thread_state_impl_t,
- _swap_m88k_thread_state_grf_t, _swap_m88k_thread_state_user_t,
- _swap_m88k_thread_state_xrf_t, _swap_mach_header, _swap_mach_header_64,
- _swap_nlist, _swap_nlist_64, _swap_note_command, _swap_ppc_exception_state_t,
- _swap_ppc_float_state_t, _swap_ppc_thread_state_t, _swap_prebind_cksum_command,
+ _swap_fvmfile_command, _swap_fvmlib_command, _swap_i386_exception_state,
+ _swap_i386_float_state, _swap_i386_thread_state, _swap_ident_command,
+ _swap_indirect_symbols, _swap_linkedit_data_command, _swap_linker_option_command,
+ _swap_load_command, _swap_mach_header, _swap_mach_header_64,
+ _swap_nlist, _swap_nlist_64, _swap_note_command, _swap_prebind_cksum_command,
_swap_prebound_dylib_command, _swap_ranlib, _swap_ranlib_64,
_swap_relocation_info, _swap_routines_command, _swap_routines_command_64,
_swap_rpath_command, _swap_section, _swap_section_64, _swap_segment_command,
- _swap_segment_command_64, _swap_source_version_command, _swap_sparc_thread_state_fpu,
- _swap_sparc_thread_state_regs, _swap_sub_client_command, _swap_sub_framework_command,
- _swap_sub_library_command, _swap_sub_umbrella_command, _swap_symseg_command,
- _swap_symtab_command, _swap_thread_command, _swap_twolevel_hint,
- _swap_twolevel_hints_command, _swap_uuid_command, _swap_version_min_command,
- _swap_x86_debug_state, _swap_x86_debug_state32, _swap_x86_debug_state64,
- _swap_x86_exception_state, _swap_x86_exception_state64, _swap_x86_float_state,
- _swap_x86_float_state64, _swap_x86_state_hdr, _swap_x86_thread_state,
- _swap_x86_thread_state64 ]
+ _swap_segment_command_64, _swap_source_version_command, _swap_sub_client_command,
+ _swap_sub_framework_command, _swap_sub_library_command, _swap_sub_umbrella_command,
+ _swap_symseg_command, _swap_symtab_command, _swap_thread_command,
+ _swap_twolevel_hint, _swap_twolevel_hints_command, _swap_uuid_command,
+ _swap_version_min_command, _swap_x86_debug_state, _swap_x86_debug_state32,
+ _swap_x86_debug_state64, _swap_x86_exception_state, _swap_x86_exception_state64,
+ _swap_x86_float_state, _swap_x86_float_state64, _swap_x86_state_hdr,
+ _swap_x86_thread_state, _swap_x86_thread_state64 ]
--- !tapi-tbd
tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libquarantine.dylib'
-current-version: 181.0.7
+current-version: 181.60.2
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1243,7 +1236,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_blocks.dylib'
-current-version: 94
+current-version: 95
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1262,7 +1255,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_c.dylib'
-current-version: 1669.40.2
+current-version: 1669.60.4
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1557,7 +1550,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_collections.dylib'
-current-version: 1669.40.2
+current-version: 1669.60.4
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1587,7 +1580,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_configuration.dylib'
-current-version: 1347.40.1
+current-version: 1351
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1878,7 +1871,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_dnssd.dylib'
-current-version: 2559.40.32
+current-version: 2559.60.39
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -1915,7 +1908,7 @@ exports:
tbd-version: 4
targets: [ x86_64-macos, arm64-macos, arm64e-macos ]
install-name: '/usr/lib/system/libsystem_eligibility.dylib'
-current-version: 129.40.7
+current-version: 160.60.1
parent-umbrella:
- targets: [ x86_64-macos, arm64-macos, arm64e-macos ]
umbrella: System
@@ -2071,7 +2064,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_kernel.dylib'
-current-version: 11215.41.2
+current-version: 11215.61.3
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -2216,33 +2209,34 @@ exports:
_disconnectx, _dup, _dup2, _errno, _etap_trace_thread, _exc_server,
_exc_server_routine, _exception_raise, _exception_raise_state,
_exception_raise_state_identity, _exchangedata, _exclaves_audio_buffer_copyout,
- _exclaves_audio_buffer_create, _exclaves_boot, _exclaves_endpoint_call,
- _exclaves_inbound_buffer_copyin, _exclaves_inbound_buffer_create,
- _exclaves_launch_conclave, _exclaves_lookup_service, _exclaves_named_buffer_copyin,
- _exclaves_named_buffer_copyout, _exclaves_named_buffer_create,
- _exclaves_notification_create, _exclaves_outbound_buffer_copyout,
- _exclaves_outbound_buffer_create, _exclaves_sensor_create,
- _exclaves_sensor_start, _exclaves_sensor_status, _exclaves_sensor_stop,
- _execve, _faccessat, _fchdir, _fchflags, _fchmod, _fchmodat,
- _fchown, _fchownat, _fclonefileat, _fcntl, '_fcntl$NOCANCEL',
- _fdatasync, _ffsctl, _fgetattrlist, _fgetxattr, _fhopen, _fileport_makefd,
- _fileport_makeport, _flistxattr, _flock, _fmount, _fpathconf,
- _freadlink, _fremovexattr, _fs_snapshot_create, _fs_snapshot_delete,
- _fs_snapshot_list, _fs_snapshot_mount, _fs_snapshot_rename,
- _fs_snapshot_revert, _fs_snapshot_root, _fsctl, _fsetattrlist,
- _fsetxattr, _fsgetpath, _fsgetpath_ext, _fstat, _fstat64,
- _fstatat, _fstatat64, _fstatfs, _fstatfs64, _fsync, '_fsync$NOCANCEL',
- _ftruncate, _futimens, _futimes, _getattrlist, _getattrlistat,
- _getattrlistbulk, _getaudit, _getaudit_addr, _getauid, _getdirentries,
- _getdirentriesattr, _getdtablesize, _getegid, _getentropy,
- _geteuid, _getfh, _getfsstat, _getfsstat64, _getgid, _getgroups,
- _gethostuuid, _getiopolicy_np, _getitimer, _getpeername, _getpgid,
- _getpgrp, _getpid, _getppid, _getpriority, _getrlimit, _getrusage,
- _getsgroups_np, _getsid, _getsockname, _getsockopt, _getuid,
- _getwgroups_np, _getxattr, _grab_pgo_data, _graftdmg, _guarded_close_np,
- _guarded_kqueue_np, _guarded_open_dprotected_np, _guarded_open_np,
- _guarded_pwrite_np, _guarded_write_np, _guarded_writev_np,
- _host_check_multiuser_mode, _host_create_mach_voucher, _host_create_mach_voucher_trap,
+ _exclaves_audio_buffer_copyout_with_status, _exclaves_audio_buffer_create,
+ _exclaves_boot, _exclaves_endpoint_call, _exclaves_inbound_buffer_copyin,
+ _exclaves_inbound_buffer_create, _exclaves_launch_conclave,
+ _exclaves_lookup_service, _exclaves_named_buffer_copyin, _exclaves_named_buffer_copyout,
+ _exclaves_named_buffer_create, _exclaves_notification_create,
+ _exclaves_outbound_buffer_copyout, _exclaves_outbound_buffer_create,
+ _exclaves_sensor_create, _exclaves_sensor_start, _exclaves_sensor_status,
+ _exclaves_sensor_stop, _execve, _faccessat, _fchdir, _fchflags,
+ _fchmod, _fchmodat, _fchown, _fchownat, _fclonefileat, _fcntl,
+ '_fcntl$NOCANCEL', _fdatasync, _ffsctl, _fgetattrlist, _fgetxattr,
+ _fhopen, _fileport_makefd, _fileport_makeport, _flistxattr,
+ _flock, _fmount, _fpathconf, _freadlink, _fremovexattr, _fs_snapshot_create,
+ _fs_snapshot_delete, _fs_snapshot_list, _fs_snapshot_mount,
+ _fs_snapshot_rename, _fs_snapshot_revert, _fs_snapshot_root,
+ _fsctl, _fsetattrlist, _fsetxattr, _fsgetpath, _fsgetpath_ext,
+ _fstat, _fstat64, _fstatat, _fstatat64, _fstatfs, _fstatfs64,
+ _fsync, '_fsync$NOCANCEL', _ftruncate, _futimens, _futimes,
+ _getattrlist, _getattrlistat, _getattrlistbulk, _getaudit,
+ _getaudit_addr, _getauid, _getdirentries, _getdirentriesattr,
+ _getdtablesize, _getegid, _getentropy, _geteuid, _getfh, _getfsstat,
+ _getfsstat64, _getgid, _getgroups, _gethostuuid, _getiopolicy_np,
+ _getitimer, _getpeername, _getpgid, _getpgrp, _getpid, _getppid,
+ _getpriority, _getrlimit, _getrusage, _getsgroups_np, _getsid,
+ _getsockname, _getsockopt, _getuid, _getwgroups_np, _getxattr,
+ _grab_pgo_data, _graftdmg, _guarded_close_np, _guarded_kqueue_np,
+ _guarded_open_dprotected_np, _guarded_open_np, _guarded_pwrite_np,
+ _guarded_write_np, _guarded_writev_np, _host_check_multiuser_mode,
+ _host_create_mach_voucher, _host_create_mach_voucher_trap,
_host_default_memory_manager, _host_get_UNDServer, _host_get_atm_diagnostic_flag,
_host_get_boot_info, _host_get_clock_control, _host_get_clock_service,
_host_get_exception_ports, _host_get_io_main, _host_get_io_master,
@@ -2797,7 +2791,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_malloc.dylib'
-current-version: 646.40.3
+current-version: 657.60.21
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -2868,9 +2862,10 @@ exports:
_NEHelperCopyAppInfo, _NEHelperCopyCurrentNetworkAsync, _NEHelperCopyCurrentNetworkInfo,
_NEHelperCopyDataForCertificate, _NEHelperCopyPerAppDomains,
_NEHelperCopyResponse, _NEHelperCopyXPCEndpointForIdentityProxy,
- _NEHelperGetAppTrackerDomains, _NEHelperGetIKESocket, _NEHelperGetIKESocketWithResult,
- _NEHelperGetKernelControlSocket, _NEHelperGetKernelControlSocketExtended,
- _NEHelperGetNECPSessionFD, _NEHelperGetPFKeySocket, _NEHelperHandleConfigurationsChangedBySC,
+ _NEHelperCopyXPCEndpointForIdentityProxyExtended, _NEHelperGetAppTrackerDomains,
+ _NEHelperGetIKESocket, _NEHelperGetIKESocketWithResult, _NEHelperGetKernelControlSocket,
+ _NEHelperGetKernelControlSocketExtended, _NEHelperGetNECPSessionFD,
+ _NEHelperGetPFKeySocket, _NEHelperHandleConfigurationsChangedBySC,
_NEHelperInit, _NEHelperInterfaceCreate, _NEHelperInterfaceDestroy,
_NEHelperInterfaceRemoveAddress, _NEHelperInterfaceSetAddress,
_NEHelperInterfaceSetAddressWithLifetime, _NEHelperInterfaceSetDelegate,
@@ -2941,7 +2936,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_notify.dylib'
-current-version: 327.0.5
+current-version: 327.60.1
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -2961,7 +2956,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_platform.dylib'
-current-version: 340
+current-version: 340.60.2
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -3029,9 +3024,10 @@ exports:
_os_unfair_recursive_lock_unlock_forked_child, _setcontext,
_setjmp, _siglongjmp, _sigsetjmp, _spin_lock, _spin_lock_try,
_spin_unlock, _swapcontext, _sys_cache_control, _sys_dcache_flush,
- _sys_icache_invalidate ]
+ _sys_icache_invalidate, _timingsafe_enable_if_supported, _timingsafe_restore_if_supported ]
- targets: [ arm64-macos, arm64-maccatalyst, arm64e-macos, arm64e-maccatalyst ]
- symbols: [ __ctx_done ]
+ symbols: [ ___sme_memchr, ___sme_memcpy, ___sme_memmove, ___sme_memset,
+ __ctx_done ]
--- !tapi-tbd
tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
@@ -3133,7 +3129,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_sandbox.dylib'
-current-version: 2401.40.25
+current-version: 2401.61.2
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -3167,14 +3163,14 @@ exports:
_rootless_verify_trusted_by_self_token, _sandbox_apply_bytecode,
_sandbox_builtin_query, _sandbox_check, _sandbox_check_bulk,
_sandbox_check_by_audit_token, _sandbox_check_by_reference,
- _sandbox_check_by_uniqueid, _sandbox_check_message_filter_integer,
- _sandbox_check_message_filter_string, _sandbox_check_process_signal_target,
- _sandbox_check_protected_app_container, _sandbox_check_self_signal_target,
- _sandbox_consume_extension, _sandbox_consume_fs_extension,
- _sandbox_consume_mach_extension, _sandbox_container_path_for_audit_token,
- _sandbox_container_path_for_pid, _sandbox_enable_local_state_flag,
- _sandbox_enable_root_translation, _sandbox_enable_state_flag,
- _sandbox_extension_consume, _sandbox_extension_issue_file,
+ _sandbox_check_by_uniqueid, _sandbox_check_finder_automation_for_path,
+ _sandbox_check_message_filter_integer, _sandbox_check_message_filter_string,
+ _sandbox_check_process_signal_target, _sandbox_check_protected_app_container,
+ _sandbox_check_self_signal_target, _sandbox_consume_extension,
+ _sandbox_consume_fs_extension, _sandbox_consume_mach_extension,
+ _sandbox_container_path_for_audit_token, _sandbox_container_path_for_pid,
+ _sandbox_enable_local_state_flag, _sandbox_enable_root_translation,
+ _sandbox_enable_state_flag, _sandbox_extension_consume, _sandbox_extension_issue_file,
_sandbox_extension_issue_file_to_process, _sandbox_extension_issue_file_to_process_by_pid,
_sandbox_extension_issue_file_to_self, _sandbox_extension_issue_generic,
_sandbox_extension_issue_generic_to_process, _sandbox_extension_issue_generic_to_process_by_pid,
@@ -3249,7 +3245,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_secinit.dylib'
-current-version: 153.0.6
+current-version: 153.60.1
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -3282,7 +3278,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libsystem_trace.dylib'
-current-version: 1612.40.4
+current-version: 1612.60.27
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
@@ -3382,7 +3378,7 @@ tbd-version: 4
targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
install-name: '/usr/lib/system/libxpc.dylib'
-current-version: 2866.40.11
+current-version: 2866.60.21
parent-umbrella:
- targets: [ x86_64-macos, x86_64-maccatalyst, arm64-macos, arm64-maccatalyst,
arm64e-macos, arm64e-maccatalyst ]
diff --git a/lib/libc/include/any-macos-any/AvailabilityInternal.h b/lib/libc/include/any-macos-any/AvailabilityInternal.h
index 37a7a075facc..c7cb49a96c41 100644
--- a/lib/libc/include/any-macos-any/AvailabilityInternal.h
+++ b/lib/libc/include/any-macos-any/AvailabilityInternal.h
@@ -36,11 +36,11 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(macos)
#define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_15_1
+ #define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_15_2
#endif
#elif __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
#define __MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
- #define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_15_1
+ #define __MAC_OS_X_VERSION_MAX_ALLOWED __MAC_15_2
#endif /* __has_builtin(__is_target_os) && __is_target_os(macos) */
#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED */
@@ -48,11 +48,11 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(ios)
#define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_18_1
+ #define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_18_2
#endif
#elif __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
#define __IPHONE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
- #define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_18_1
+ #define __IPHONE_OS_VERSION_MAX_ALLOWED __IPHONE_18_2
#endif /* __has_builtin(__is_target_os) && __is_target_os(ios) */
#endif /* __IPHONE_OS_VERSION_MIN_REQUIRED */
@@ -60,13 +60,13 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(watchos)
#define __WATCH_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_11_1
+ #define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_11_2
/* for compatibility with existing code. New code should use platform specific checks */
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
#endif
#elif __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__
#define __WATCH_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__
- #define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_11_1
+ #define __WATCH_OS_VERSION_MAX_ALLOWED __WATCHOS_11_2
/* for compatibility with existing code. New code should use platform specific checks */
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
#endif /* __has_builtin(__is_target_os) && __is_target_os(watchos) */
@@ -76,13 +76,13 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(tvos)
#define __TV_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __TV_OS_VERSION_MAX_ALLOWED __TVOS_18_1
+ #define __TV_OS_VERSION_MAX_ALLOWED __TVOS_18_2
/* for compatibility with existing code. New code should use platform specific checks */
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
#endif
#elif __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__
#define __TV_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__
- #define __TV_OS_VERSION_MAX_ALLOWED __TVOS_18_1
+ #define __TV_OS_VERSION_MAX_ALLOWED __TVOS_18_2
/* for compatibility with existing code. New code should use platform specific checks */
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_9_0
#endif /* __has_builtin(__is_target_os) && __is_target_os(tvos) */
@@ -92,7 +92,7 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(bridgeos)
#define __BRIDGE_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __BRIDGE_OS_VERSION_MAX_ALLOWED __BRIDGEOS_9_1
+ #define __BRIDGE_OS_VERSION_MAX_ALLOWED __BRIDGEOS_9_2
/* for compatibility with existing code. New code should use platform specific checks */
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_11_0
#endif
@@ -103,7 +103,7 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(driverkit)
#define __DRIVERKIT_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __DRIVERKIT_VERSION_MAX_ALLOWED __DRIVERKIT_24_1
+ #define __DRIVERKIT_VERSION_MAX_ALLOWED __DRIVERKIT_24_2
#endif
#endif /* __has_builtin(__is_target_os) && __is_target_os(driverkit) */
#endif /* __DRIVERKIT_VERSION_MIN_REQUIRED */
@@ -112,7 +112,7 @@
#if defined(__has_builtin) && __has_builtin(__is_target_os)
#if __is_target_os(visionos)
#define __VISION_OS_VERSION_MIN_REQUIRED __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
- #define __VISION_OS_VERSION_MAX_ALLOWED __VISIONOS_2_1
+ #define __VISION_OS_VERSION_MAX_ALLOWED __VISIONOS_2_2
/* for compatibility with existing code. New code should use platform specific checks */
#define __IPHONE_OS_VERSION_MIN_REQUIRED __IPHONE_17_1
#endif
diff --git a/lib/libc/include/any-macos-any/AvailabilityMacros.h b/lib/libc/include/any-macos-any/AvailabilityMacros.h
index 6dc972666a28..37fed18a4a2c 100644
--- a/lib/libc/include/any-macos-any/AvailabilityMacros.h
+++ b/lib/libc/include/any-macos-any/AvailabilityMacros.h
@@ -83,11 +83,12 @@
*/
-#include <AvailabilityVersions.h>
-
#ifndef __AVAILABILITYMACROS__
#define __AVAILABILITYMACROS__
+#include <AvailabilityVersions.h>
+#include <TargetConditionals.h>
+
/*
* If min OS not specified, assume 10.4 for intel
* Note: compiler driver may set _ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED_ based on MACOSX_DEPLOYMENT_TARGET environment variable
diff --git a/lib/libc/include/any-macos-any/AvailabilityVersions.h b/lib/libc/include/any-macos-any/AvailabilityVersions.h
index 8f8e7a9fd723..bdcc3e119861 100644
--- a/lib/libc/include/any-macos-any/AvailabilityVersions.h
+++ b/lib/libc/include/any-macos-any/AvailabilityVersions.h
@@ -88,6 +88,7 @@
#define __MAC_14_5 140500
#define __MAC_15_0 150000
#define __MAC_15_1 150100
+#define __MAC_15_2 150200
/* __MAC__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
#define __IPHONE_2_0 20000
@@ -172,6 +173,7 @@
#define __IPHONE_17_5 170500
#define __IPHONE_18_0 180000
#define __IPHONE_18_1 180100
+#define __IPHONE_18_2 180200
/* __IPHONE__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
#define __WATCHOS_1_0 10000
@@ -223,6 +225,7 @@
#define __WATCHOS_10_5 100500
#define __WATCHOS_11_0 110000
#define __WATCHOS_11_1 110100
+#define __WATCHOS_11_2 110200
/* __WATCHOS__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
#define __TVOS_9_0 90000
@@ -275,6 +278,7 @@
#define __TVOS_17_5 170500
#define __TVOS_18_0 180000
#define __TVOS_18_1 180100
+#define __TVOS_18_2 180200
/* __TVOS__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
#define __BRIDGEOS_2_0 20000
@@ -306,6 +310,7 @@
#define __BRIDGEOS_8_5 80500
#define __BRIDGEOS_9_0 90000
#define __BRIDGEOS_9_1 90100
+#define __BRIDGEOS_9_2 90200
#define __DRIVERKIT_19_0 190000
@@ -323,6 +328,7 @@
#define __DRIVERKIT_23_5 230500
#define __DRIVERKIT_24_0 240000
#define __DRIVERKIT_24_1 240100
+#define __DRIVERKIT_24_2 240200
/* __DRIVERKIT__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
#define __VISIONOS_1_0 10000
@@ -330,6 +336,7 @@
#define __VISIONOS_1_2 10200
#define __VISIONOS_2_0 20000
#define __VISIONOS_2_1 20100
+#define __VISIONOS_2_2 20200
/* __VISIONOS__NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */
@@ -409,6 +416,7 @@
#define MAC_OS_VERSION_14_5 __MAC_14_5
#define MAC_OS_VERSION_15_0 __MAC_15_0
#define MAC_OS_VERSION_15_1 __MAC_15_1
+#define MAC_OS_VERSION_15_2 __MAC_15_2
#endif /* #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || defined(_DARWIN_C_SOURCE) */
diff --git a/lib/libc/include/any-macos-any/iconv.h b/lib/libc/include/any-macos-any/iconv.h
index df40f33aafc7..e3f371c30efe 100644
--- a/lib/libc/include/any-macos-any/iconv.h
+++ b/lib/libc/include/any-macos-any/iconv.h
@@ -120,10 +120,12 @@ struct iconv_hooks {
void *data;
};
+#ifndef __APPLE__
/*
* Fallbacks aren't supported but type definitions are provided for
* source compatibility.
*/
+#endif
typedef void (*iconv_unicode_mb_to_uc_fallback) (const char*,
size_t, void (*write_replacement) (const unsigned int *,
size_t, void*), void*, void*);
diff --git a/lib/libc/include/any-macos-any/mach-o/x86_64/reloc.h b/lib/libc/include/any-macos-any/mach-o/x86_64/reloc.h
index d3466d8fe80f..7134d8be730e 100644
--- a/lib/libc/include/any-macos-any/mach-o/x86_64/reloc.h
+++ b/lib/libc/include/any-macos-any/mach-o/x86_64/reloc.h
@@ -20,6 +20,10 @@
*
* @APPLE_LICENSE_HEADER_END@
*/
+
+#ifndef _MACHO_X86_64_RELOC_H_
+#define _MACHO_X86_64_RELOC_H_
+
/*
* Relocations for x86_64 are a bit different than for other architectures in
* Mach-O: Scattered relocations are not used. Almost all relocations produced
@@ -183,3 +187,5 @@ enum reloc_type_x86_64
X86_64_RELOC_SIGNED_4, // for signed 32-bit displacement with a -4 addend
X86_64_RELOC_TLV, // for thread local variables
};
+
+#endif /* #ifndef _MACHO_X86_64_RELOC_H_ */
diff --git a/lib/libc/include/any-macos-any/mach/i386/vm_types.h b/lib/libc/include/any-macos-any/mach/i386/vm_types.h
index e41c111557af..9798e6578a89 100644
--- a/lib/libc/include/any-macos-any/mach/i386/vm_types.h
+++ b/lib/libc/include/any-macos-any/mach/i386/vm_types.h
@@ -133,6 +133,17 @@ typedef uint64_t vm_map_size_t;
typedef mach_vm_address_t mach_port_context_t;
+#if defined(MACH_KERNEL_PRIVATE) || KERNEL_VM_TEST
+
+/*
+ * These are types used internal to Mach to implement the
+ * legacy 32-bit VM APIs published by the kernel.
+ */
+typedef uint32_t vm32_address_t;
+typedef uint32_t vm32_offset_t;
+typedef uint32_t vm32_size_t;
+
+#endif /* MACH_KERNEL_PRIVATE */
#endif /* ASSEMBLER */
diff --git a/lib/libc/include/any-macos-any/mach/machine.h b/lib/libc/include/any-macos-any/mach/machine.h
index 755d7fd0b167..8c496f922212 100644
--- a/lib/libc/include/any-macos-any/mach/machine.h
+++ b/lib/libc/include/any-macos-any/mach/machine.h
@@ -403,6 +403,7 @@ typedef integer_t cpu_threadtype_t;
#define CPUFAMILY_ARM_COLL 0x2876f5b5
#define CPUFAMILY_ARM_LOBOS 0x5f4dea93
#define CPUFAMILY_ARM_DONAN 0x6f5129ac
+#define CPUFAMILY_ARM_BRAVA 0x17d5b93a
#define CPUFAMILY_ARM_TAHITI 0x75d4acb9
#define CPUFAMILY_ARM_TUPAI 0x204526d0
diff --git a/lib/libc/include/any-macos-any/mach/vm_behavior.h b/lib/libc/include/any-macos-any/mach/vm_behavior.h
index 1c1cd1f8e352..c5a788812cb1 100644
--- a/lib/libc/include/any-macos-any/mach/vm_behavior.h
+++ b/lib/libc/include/any-macos-any/mach/vm_behavior.h
@@ -51,6 +51,10 @@ typedef int vm_behavior_t;
* These describe expected page reference behavior for
* for a given range of virtual memory. For implementation
* details see vm/vm_fault.c
+ *
+ * When making a new VM_BEHAVIOR_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * behavior values and you may be turning one of those invalid behaviors valid.
*/
@@ -74,7 +78,9 @@ typedef int vm_behavior_t;
#define VM_BEHAVIOR_REUSABLE ((vm_behavior_t) 8)
#define VM_BEHAVIOR_REUSE ((vm_behavior_t) 9)
#define VM_BEHAVIOR_CAN_REUSE ((vm_behavior_t) 10)
-#define VM_BEHAVIOR_PAGEOUT ((vm_behavior_t) 11)
+#define VM_BEHAVIOR_PAGEOUT ((vm_behavior_t) 11) /* force page-out of the pages in range (development only) */
#define VM_BEHAVIOR_ZERO ((vm_behavior_t) 12) /* zero pages without faulting in additional pages */
+#define VM_BEHAVIOR_LAST_VALID (VM_BEHAVIOR_ZERO)
+
#endif /*_MACH_VM_BEHAVIOR_H_*/
diff --git a/lib/libc/include/any-macos-any/mach/vm_inherit.h b/lib/libc/include/any-macos-any/mach/vm_inherit.h
index 528d6917985e..380f5207b8d7 100644
--- a/lib/libc/include/any-macos-any/mach/vm_inherit.h
+++ b/lib/libc/include/any-macos-any/mach/vm_inherit.h
@@ -76,6 +76,10 @@ typedef unsigned int vm_inherit_t; /* might want to change this */
/*
* Enumeration of valid values for vm_inherit_t.
+ *
+ * When making a new VM_INHERIT_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * inherit values and you may be turning one of those invalid inherits valid.
*/
#define VM_INHERIT_SHARE ((vm_inherit_t) 0) /* share with child */
diff --git a/lib/libc/include/any-macos-any/mach/vm_prot.h b/lib/libc/include/any-macos-any/mach/vm_prot.h
index 2f48ab67c4e8..a5d6627b12bb 100644
--- a/lib/libc/include/any-macos-any/mach/vm_prot.h
+++ b/lib/libc/include/any-macos-any/mach/vm_prot.h
@@ -76,6 +76,10 @@ typedef int vm_prot_t;
/*
* Protection values, defined as bits within the vm_prot_t type
+ *
+ * When making a new VM_PROT_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * vm_prot values and you may be turning one of those invalid protections valid.
*/
#define VM_PROT_NONE ((vm_prot_t) 0x00)
diff --git a/lib/libc/include/any-macos-any/mach/vm_purgable.h b/lib/libc/include/any-macos-any/mach/vm_purgable.h
index 80ea756d9d63..485351831c08 100644
--- a/lib/libc/include/any-macos-any/mach/vm_purgable.h
+++ b/lib/libc/include/any-macos-any/mach/vm_purgable.h
@@ -54,6 +54,10 @@ typedef int vm_purgable_t;
/*
* Enumeration of valid values for vm_purgable_t.
+ *
+ * When making a new VM_PURGABLE_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * values and you may be turning one of those invalid bits valid.
*/
#define VM_PURGABLE_SET_STATE ((vm_purgable_t) 0) /* set state of purgeable object */
#define VM_PURGABLE_GET_STATE ((vm_purgable_t) 1) /* get state of purgeable object */
diff --git a/lib/libc/include/any-macos-any/mach/vm_statistics.h b/lib/libc/include/any-macos-any/mach/vm_statistics.h
index a3080233031f..cbcc47742d56 100644
--- a/lib/libc/include/any-macos-any/mach/vm_statistics.h
+++ b/lib/libc/include/any-macos-any/mach/vm_statistics.h
@@ -341,6 +341,12 @@ enum virtual_memory_guard_exception_codes {
/* current accounting postmark */
#define __VM_LEDGER_ACCOUNTING_POSTMARK 2019032600
+/*
+ * When making a new VM_LEDGER_TAG_* or VM_LEDGER_FLAG_*, update tests
+ * vm_parameter_validation_[user|kern] and their expected results; they
+ * deliberately call VM functions with invalid ledger values and you may
+ * be turning one of those invalid tags/flags valid.
+ */
/* discrete values: */
#define VM_LEDGER_TAG_NONE 0x00000000
#define VM_LEDGER_TAG_DEFAULT 0x00000001
diff --git a/lib/libc/include/any-macos-any/mach/vm_sync.h b/lib/libc/include/any-macos-any/mach/vm_sync.h
index 8dccb9c2c9a2..06d5a772187d 100644
--- a/lib/libc/include/any-macos-any/mach/vm_sync.h
+++ b/lib/libc/include/any-macos-any/mach/vm_sync.h
@@ -67,6 +67,10 @@ typedef unsigned vm_sync_t;
/*
* Synchronization flags, defined as bits within the vm_sync_t type
+ *
+ * When making a new VM_SYNC_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * sync values and you may be turning one of those invalid syncs valid.
*/
#define VM_SYNC_ASYNCHRONOUS ((vm_sync_t) 0x01)
diff --git a/lib/libc/include/any-macos-any/netinet/tcp.h b/lib/libc/include/any-macos-any/netinet/tcp.h
index bdd1914e5a1d..8aab372e1b8f 100644
--- a/lib/libc/include/any-macos-any/netinet/tcp.h
+++ b/lib/libc/include/any-macos-any/netinet/tcp.h
@@ -151,8 +151,8 @@ struct tcphdr {
#define TCPOPT_FASTOPEN 34
#define TCPOLEN_FASTOPEN_REQ 2
-#define TCPOPT_ACCECN0 0xAC /* AccECN Order 0 */
-#define TCPOPT_ACCECN1 0XAE /* AccECN Order 1 */
+#define TCPOPT_ACCECN0 172 /* AccECN Order 0 */
+#define TCPOPT_ACCECN1 174 /* AccECN Order 1 */
#define TCPOLEN_ACCECN_EMPTY 2 /* Empty option contains kind and length */
#define TCPOLEN_ACCECN_COUNTER 3 /* Length of each AccECN counter */
diff --git a/lib/libc/include/any-macos-any/sys/_symbol_aliasing.h b/lib/libc/include/any-macos-any/sys/_symbol_aliasing.h
index b3f27c5ebf15..0c6e448bba2c 100644
--- a/lib/libc/include/any-macos-any/sys/_symbol_aliasing.h
+++ b/lib/libc/include/any-macos-any/sys/_symbol_aliasing.h
@@ -521,6 +521,12 @@
#define __DARWIN_ALIAS_STARTING_IPHONE___IPHONE_18_1(x)
#endif
+#if defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 180200
+#define __DARWIN_ALIAS_STARTING_IPHONE___IPHONE_18_2(x) x
+#else
+#define __DARWIN_ALIAS_STARTING_IPHONE___IPHONE_18_2(x)
+#endif
+
#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1000
#define __DARWIN_ALIAS_STARTING_MAC___MAC_10_0(x) x
#else
@@ -905,3 +911,9 @@
#define __DARWIN_ALIAS_STARTING_MAC___MAC_15_1(x)
#endif
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 150200
+#define __DARWIN_ALIAS_STARTING_MAC___MAC_15_2(x) x
+#else
+#define __DARWIN_ALIAS_STARTING_MAC___MAC_15_2(x)
+#endif
+
diff --git a/lib/libc/include/any-macos-any/sys/attr.h b/lib/libc/include/any-macos-any/sys/attr.h
index f68a28a0b251..744718083cc1 100644
--- a/lib/libc/include/any-macos-any/sys/attr.h
+++ b/lib/libc/include/any-macos-any/sys/attr.h
@@ -488,6 +488,7 @@ typedef struct vol_attributes_attr {
#define ATTR_VOL_ENCODINGSUSED 0x00010000
#define ATTR_VOL_CAPABILITIES 0x00020000
#define ATTR_VOL_UUID 0x00040000
+#define ATTR_VOL_MOUNTEXTFLAGS 0x00080000
#define ATTR_VOL_FSTYPENAME 0x00100000
#define ATTR_VOL_FSSUBTYPE 0x00200000
#define ATTR_VOL_SPACEUSED 0x00800000
@@ -496,7 +497,7 @@ typedef struct vol_attributes_attr {
#define ATTR_VOL_ATTRIBUTES 0x40000000
#define ATTR_VOL_INFO 0x80000000
-#define ATTR_VOL_VALIDMASK 0xF0B7FFFF
+#define ATTR_VOL_VALIDMASK 0xF0BFFFFF
/*
* The list of settable ATTR_VOL_* attributes include the following:
diff --git a/lib/libc/include/any-macos-any/sys/mman.h b/lib/libc/include/any-macos-any/sys/mman.h
index 91cf985f73fa..d6de5a440179 100644
--- a/lib/libc/include/any-macos-any/sys/mman.h
+++ b/lib/libc/include/any-macos-any/sys/mman.h
@@ -178,6 +178,10 @@
/*
* msync() flags
+ *
+ * When making a new MS_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * msync values and you may be turning one of those invalid msyncs valid.
*/
#define MS_ASYNC 0x0001 /* [MF|SIO] return immediately */
#define MS_INVALIDATE 0x0002 /* [MF|SIO] invalidate all cached data */
@@ -192,6 +196,10 @@
/*
* Advice to madvise
+ *
+ * When making a new MADV_*, update tests vm_parameter_validation_[user|kern]
+ * and their expected results; they deliberately call VM functions with invalid
+ * madvise values and you may be turning one of those invalid madvises valid.
*/
#define POSIX_MADV_NORMAL 0 /* [MC1] no further special treatment */
#define POSIX_MADV_RANDOM 1 /* [MC1] expect random page refs */