Platform libs for macos_arm64

(cherry picked from commit abaa99d6cc993ec30b4b8342078b69cf9e4ee6ef)

kotlin-native/platformLibs/src/platform/osx/Hypervisor.def

@@ -1,4 +1,4 @@
-depends = darwin posix
+depends = darwin osx posix
 language = Objective-C
 package = platform.Hypervisor
 

kotlin-native/platformLibs/src/platform/osx/darwin.def

@@ -26,6 +26,7 @@ headers = AppleTextureEncoder.h AssertMacros.h Availability.h AvailabilityIntern
     os/activity.h os/availability.h os/base.h os/lock.h \
     os/log.h os/object.h os/overflow.h os/signpost.h os/trace.h \
     simd/simd.h sys/sysctl.h sys/user.h \
+    sys/_types/_os_inline.h \
     net/if_media.h sys/disk.h sys/kernel_types.h
 
 headerFilter = **
@@ -39,5 +40,6 @@ excludedFunctions = __tg_promote KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN \
                     xpc_debugger_api_misuse_info \
                     vm_stats
 
-compilerOpts = -D_XOPEN_SOURCE -DSHARED_LIBBIND -D_DARWIN_NO_64_BIT_INODE -DSYSCTL_DEF_ENABLED
+compilerOpts.macos_x64 = -D_XOPEN_SOURCE -DSHARED_LIBBIND -D_DARWIN_NO_64_BIT_INODE -DSYSCTL_DEF_ENABLED
+compilerOpts.macos_arm64 = -D_XOPEN_SOURCE -DSHARED_LIBBIND -DSYSCTL_DEF_ENABLED
 linkerOpts = -ldl -lz -lcurses -lbz2 -lcompression -late -lbsm

kotlin-native/platformLibs/src/platform/osx/osx.def

@@ -1,17 +1,18 @@
 depends = darwin posix
 language = Objective-C
 package = platform.osx
+
 headers = NSSystemDirectories.h \
     aliasdb.h bootparams.h bootstrap.h \
     com_err.h \
     crt_externs.h \
     disktab.h dtrace.h \
-    emmintrin.h eti.h expat.h \
+    eti.h expat.h \
     expat_external.h form.h fsproperties.h get_compat.h \
     gssapi.h histedit.h \
     krb5.h launch.h lber.h lber_types.h ldif.h libc.h libcharset.h \
     libproc.h localcharset.h \
-    mmintrin.h monitor.h \
+    monitor.h \
     nc_tparm.h ncurses.h ncurses_dll.h \
     nlist.h \
     panel.h pcap-bpf.h pcap-namedb.h pcap.h printerdb.h \
@@ -20,10 +21,15 @@ headers = NSSystemDirectories.h \
     struct.h term.h \
     term_entry.h termcap.h tic.h timeconv.h tzfile.h \
     unctrl.h vproc.h \
-    xmmintrin.h \
     atm/atm_types.h corpses/task_corpse.h \
     hfs/hfs_format.h hfs/hfs_mount.h hfs/hfs_unistr.h \
     sys/kauth.h
+headers.macos_x64 = \
+    emmintrin.h \
+    mmintrin.h \
+    xmmintrin.h
+headers.macos_arm64 = \
+    arm64/hv/hv_kern_types.h
 
 headerFilter = **
 

kotlin-native/platformLibs/src/platform/osx/posix.def

@@ -13,7 +13,8 @@ headers = alloca.h ar.h assert.h complex.h ctype.h dirent.h dlfcn.h err.h errno.
     sys/queue.h sys/select.h sys/shm.h sys/socket.h sys/stat.h \
     sys/syslimits.h sys/time.h sys/times.h sys/utsname.h sys/wait.h
 
-compilerOpts = -D_XOPEN_SOURCE -DSHARED_LIBBIND -D_DARWIN_NO_64_BIT_INODE -D_DARWIN_C_SOURCE
+compilerOpts.macos_x64 = -D_XOPEN_SOURCE -DSHARED_LIBBIND -D_DARWIN_NO_64_BIT_INODE -D_DARWIN_C_SOURCE
+compilerOpts.macos_arm64 = -D_XOPEN_SOURCE -DSHARED_LIBBIND -D_DARWIN_C_SOURCE
 # -D_ANSI_SOURCE, sigh, breaks user_addr_t
 excludedFunctions = KERNEL_AUDIT_TOKEN KERNEL_SECURITY_TOKEN add_profil             \
                     addrsel_policy_init                                             \

kotlin-native/platformLibs/src/platform/osx/set_depends.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-../../../../dist/bin/run_konan defFileDependencies -target macos_x64 *.def
+../../../../dist/bin/run_konan defFileDependencies -target macos_x64 -target macos_arm64 *.def