From 30863cd1847f1a427bad231e62fb285ecffcba19 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Mon, 22 Mar 2021 19:14:54 +0700
Subject: [PATCH] Support the rest of Linux targets on macos_arm64

---
 kotlin-native/konan/konan.properties                     | 9 +++++++++
 .../src/org/jetbrains/kotlin/konan/target/HostManager.kt | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
index c2518826d44..2cc48caff27 100644
--- a/kotlin-native/konan/konan.properties
+++ b/kotlin-native/konan/konan.properties
@@ -493,6 +493,8 @@ dependencies.mingw_x64-linux_arm32_hfp = \
     arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2
 dependencies.macos_x64-linux_arm32_hfp = \
     arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2
+dependencies.macos_arm64-linux_arm32_hfp = \
+    arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2
 
 quadruple.linux_arm32_hfp = arm-unknown-linux-gnueabihf
 linkerNoDebugFlags.linux_arm32_hfp = -S
@@ -519,6 +521,8 @@ linker.mingw_x64-linux_arm32_hfp = $targetToolchain.mingw_x64-linux_arm32_hfp/bi
 linkerHostSpecificFlags.mingw_x64-linux_arm32_hfp =
 linker.macos_x64-linux_arm32_hfp = $targetToolchain.macos_x64-linux_arm32_hfp/bin/ld.lld
 linkerHostSpecificFlags.macos_x64-linux_arm32_hfp = --no-threads
+linker.macos_arm64-linux_arm32_hfp = $targetToolchain.macos_arm64-linux_arm32_hfp/bin/ld.lld
+linkerHostSpecificFlags.macos_arm64-linux_arm32_hfp = --no-threads
 dynamicLinker.linux_arm32_hfp = /lib/ld-linux-armhf.so.3
 # targetSysRoot relative
 abiSpecificLibraries.linux_arm32_hfp = lib usr/lib
@@ -533,6 +537,7 @@ gccToolchain.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel
 targetToolchain.linux_x64-linux_arm64 = $gccToolchain.linux_arm64/aarch64-unknown-linux-gnu
 targetToolchain.mingw_x64-linux_arm64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
 targetToolchain.macos_x64-linux_arm64 = $llvmHome.macos_x64
+targetToolchain.macos_arm64-linux_arm64 = $llvmHome.macos_arm64
 
 emulatorDependency.linux_x64-linux_arm64 = qemu-aarch64-static-5.1.0-linux-2
 emulatorExecutable.linux_x64-linux_arm64 = qemu-aarch64-static-5.1.0-linux-2/qemu-aarch64
@@ -543,6 +548,8 @@ dependencies.mingw_x64-linux_arm64 = \
     aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2
 dependencies.macos_x64-linux_arm64 = \
     aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2
+dependencies.macos_arm64-linux_arm64 = \
+    aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2
 
 quadruple.linux_arm64 = aarch64-unknown-linux-gnu
 linkerNoDebugFlags.linux_arm64 = -S
@@ -568,6 +575,8 @@ linker.mingw_x64-linux_arm64 = $targetToolchain.mingw_x64-linux_arm64/bin/ld.gol
 linkerHostSpecificFlags.mingw_x64-linux_arm64 =
 linker.macos_x64-linux_arm64 = $targetToolchain.macos_x64-linux_arm64/bin/ld.lld
 linkerHostSpecificFlags.macos_x64-linux_arm64 = --no-threads
+linker.macos_arm64-linux_arm64 = $targetToolchain.macos_arm64-linux_arm64/bin/ld.lld
+linkerHostSpecificFlags.macos_arm64-linux_arm64 = --no-threads
 dynamicLinker.linux_arm64 = /lib/ld-linux-aarch64.so.1
 # targetSysRoot relative
 abiSpecificLibraries.linux_arm64 = lib usr/lib
diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
index 4c0f5a40492..3f90b9e6355 100644
--- a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
+++ b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
@@ -105,6 +105,8 @@ open class HostManager(
             TVOS_ARM64,
             TVOS_X64,
             LINUX_X64,
+            LINUX_ARM32_HFP,
+            LINUX_ARM64
         )
     )