diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index c32451d3d58..c2518826d44 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -93,10 +93,12 @@ targetToolchain.macos_x64 = target-toolchain-xcode_12_2-macos_x64 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos additionalToolsDir.macos_x64 = xcode-addon-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-macos_x64 = target-toolchain-xcode_12_2-macos_x64 + arch.macos_x64 = x86_64 targetSysRoot.macos_x64 = target-sysroot-xcode_12_2-macos_x64 targetCpu.macos_x64 = core2 -clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir +clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu $targetCpu.macos_x64 clangNooptFlags.macos_x64 = -O1 clangOptFlags.macos_x64 = -O3 clangDebugFlags.macos_x64 = -O0 @@ -135,7 +137,7 @@ arch.macos_arm64 = arm64 targetSysRoot.macos_arm64 = target-sysroot-xcode_12_2-macos_x64 # TODO: Check Clang behaviour. targetCpu.macos_arm64 = cyclone -clangFlags.macos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir +clangFlags.macos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu $targetCpu.macos_arm64 clangNooptFlags.macos_arm64 = -O1 clangOptFlags.macos_arm64 = -O3 # See clangDebugFlags.ios_arm64 @@ -166,6 +168,7 @@ xcode-addon-xcode_12_2-macos_arm64.default = \ # Apple's 32-bit iOS. targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-ios_arm32 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-ios_arm32.default = \ remote:internal @@ -197,7 +200,6 @@ runtimeDefinitions.ios_arm32 = KONAN_OBJC_INTEROP=1 KONAN_IOS KONAN_ARM32=1 \ # Apple's 64-bit iOS. targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_12_2-macos_x64 - targetToolchain.macos_arm64-ios_arm64 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-ios_arm64.default = \ @@ -228,6 +230,7 @@ additionalCacheFlags.ios_arm64 = -Xembed-bitcode-marker # Apple's iOS simulator. targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-ios_x64 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-ios_x64.default = \ remote:internal @@ -253,6 +256,7 @@ runtimeDefinitions.ios_x64 = KONAN_OBJC_INTEROP=1 KONAN_IOS=1 KONAN_X64=1 \ # Apple's tvOS simulator. targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-tvos_x64 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-tvos_x64.default = \ remote:internal @@ -260,7 +264,7 @@ target-sysroot-xcode_12_2-tvos_x64.default = \ arch.tvos_x64 = x86_64 targetSysRoot.tvos_x64 = target-sysroot-xcode_12_2-tvos_x64 targetCpu.tvos_x64 = core2 -clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir +clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu $targetCpu.tvos_x64 clangNooptFlags.tvos_x64 = -O1 clangOptFlags.tvos_x64 = -O3 clangDebugFlags.tvos_x64 = -O0 @@ -278,6 +282,7 @@ runtimeDefinitions.tvos_x64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_X64=1 \ # Apple's 64-bit tvOS. targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-tvos_arm64 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-tvos_arm64.default = \ remote:internal @@ -303,6 +308,7 @@ runtimeDefinitions.tvos_arm64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_ARM64=1 # watchOS armv7k targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-watchos_arm32 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-watchos_arm32.default = \ remote:internal @@ -330,6 +336,7 @@ runtimeDefinitions.watchos_arm32 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS KONAN_ARM3 # watchOS arm64_32 targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-watchos_arm64 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-watchos_arm64.default = \ remote:internal @@ -358,6 +365,7 @@ runtimeDefinitions.watchos_arm64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS KONAN_ARM3 # Apple's watchOS i386 simulator. targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-watchos_x86 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-watchos_x86.default = \ remote:internal @@ -387,6 +395,7 @@ runtimeDefinitions.watchos_x86 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 KONAN_NO_6 # watchOS x86_64 simulator. targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_12_2-macos_x64 +targetToolchain.macos_arm64-watchos_x64 = target-toolchain-xcode_12_2-macos_x64 target-sysroot-xcode_12_2-watchos_x64.default = \ remote:internal 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 7d454b37894..4c0f5a40492 100644 --- a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt +++ b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt @@ -93,10 +93,18 @@ open class HostManager( WASM32 ), MACOS_ARM64 to setOf( - // TODO: More targets will be added later after additional testing. MACOS_ARM64, + MACOS_X64, + IOS_ARM32, IOS_ARM64, - LINUX_X64 + IOS_X64, + WATCHOS_ARM32, + WATCHOS_ARM64, + WATCHOS_X86, + WATCHOS_X64, + TVOS_ARM64, + TVOS_X64, + LINUX_X64, ) )