From e44d7706dc9538a93b15465045649feebc929124 Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Wed, 4 Sep 2019 14:53:38 +0300 Subject: [PATCH] [REVERTME] filtering out ANDROID_{X86,ARM32}, WATCHOS_{X86,ARM32} from enabled platform till their full support see details in bc1b67678e53e7114d9808693bb7005c65351f5a --- .../jetbrains/kotlin/backend/konan/OptimizationPipeline.kt | 3 +++ .../kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt | 6 ++++++ .../org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt | 3 ++- .../main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 3 +++ .../kotlin/org/jetbrains/kotlin/konan/target/Platform.kt | 3 ++- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt index 518531c89fd..68e6fbb7aaf 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt @@ -60,10 +60,13 @@ private class LlvmPipelineConfiguration(context: Context) { KonanTarget.ANDROID_ARM32 -> "arm7tdmi" KonanTarget.ANDROID_ARM64 -> "cortex-a57" KonanTarget.ANDROID_X64 -> "x86-64" + KonanTarget.ANDROID_X86 -> TODO("implement me") KonanTarget.LINUX_MIPS32 -> "mips32r2" KonanTarget.LINUX_MIPSEL32 -> "mips32r2" KonanTarget.WATCHOS_ARM64 -> TODO("implement me") + KonanTarget.WATCHOS_ARM32 -> TODO("implement me") KonanTarget.WATCHOS_X64 -> TODO("implement me") + KonanTarget.WATCHOS_X86 -> TODO("implement me") KonanTarget.TVOS_ARM64 -> TODO("implement me") KonanTarget.TVOS_X64 -> TODO("implement me") KonanTarget.WASM32, diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt index 4f902049b44..49e29a6a1e8 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt @@ -113,8 +113,11 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con "-Xclang", "-isystem$absoluteTargetSysRoot/include/compat", "-Xclang", "-isystem$absoluteTargetSysRoot/include/libc") + KonanTarget.ANDROID_X86 -> TODO("implement me") KonanTarget.WATCHOS_ARM64 -> TODO("implement me") + KonanTarget.WATCHOS_ARM32 -> TODO("implement me") KonanTarget.WATCHOS_X64 -> TODO("implement me") + KonanTarget.WATCHOS_X86 -> TODO("implement me") KonanTarget.TVOS_ARM64 -> TODO("implement me") KonanTarget.TVOS_X64 -> TODO("implement me") @@ -268,8 +271,11 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con "-DKONAN_NO_MEMMEM", "-DKONAN_NO_CTORS_SECTION=1") + KonanTarget.ANDROID_X86 -> TODO("implement me") KonanTarget.WATCHOS_ARM64 -> TODO("implement me") + KonanTarget.WATCHOS_ARM32 -> TODO("implement me") KonanTarget.WATCHOS_X64 -> TODO("implement me") + KonanTarget.WATCHOS_X86 -> TODO("implement me") KonanTarget.TVOS_ARM64 -> TODO("implement me") KonanTarget.TVOS_X64 -> TODO("implement me") diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt index a75ca25228f..55ed48bb547 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt @@ -50,7 +50,8 @@ fun loadConfigurables(target: KonanTarget, properties: Properties, baseDir: Stri MingwConfigurablesImpl(target, properties, baseDir) KonanTarget.WASM32 -> WasmConfigurablesImpl(target, properties, baseDir) - KonanTarget.WATCHOS_ARM64, KonanTarget.WATCHOS_X64 -> TODO("unimplemented: $target") + KonanTarget.ANDROID_X86-> TODO("unimplemented: $target") + KonanTarget.WATCHOS_ARM64, KonanTarget.WATCHOS_ARM32, KonanTarget.WATCHOS_X64, KonanTarget.WATCHOS_X86-> TODO("unimplemented: $target") KonanTarget.TVOS_ARM64, KonanTarget.TVOS_X64 -> TODO("unimplemented: $target") is KonanTarget.ZEPHYR -> ZephyrConfigurablesImpl(target, properties, baseDir) diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt index da1c433c59b..b9309337314 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt @@ -445,8 +445,11 @@ fun linker(configurables: Configurables): LinkerFlags = MingwLinker(configurables as MingwConfigurables) KonanTarget.WASM32 -> WasmLinker(configurables as WasmConfigurables) + KonanTarget.ANDROID_X86 -> TODO("implement me") KonanTarget.WATCHOS_ARM64 -> TODO("implement me") + KonanTarget.WATCHOS_ARM32 -> TODO("implement me") KonanTarget.WATCHOS_X64 -> TODO("implement me") + KonanTarget.WATCHOS_X86 -> TODO("implement me") KonanTarget.TVOS_ARM64 -> TODO("implement me") KonanTarget.TVOS_X64 -> TODO("implement me") is KonanTarget.ZEPHYR -> diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt index 3c2d5ffb772..3d083731586 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt @@ -49,7 +49,8 @@ class PlatformManager(distribution: Distribution = Distribution(), experimental: * TODO: Don't forget to delete this field and replace all its usages to `enabled`. */ val filteredOutEnabledButNotSupported - get() = enabled.filterNot { it == KonanTarget.WATCHOS_X64 || it == KonanTarget.WATCHOS_ARM64 || + get() = enabled.filterNot { it == KonanTarget.ANDROID_X86 || it == KonanTarget.WATCHOS_X64 || + it == KonanTarget.WATCHOS_X86|| it == KonanTarget.WATCHOS_ARM64 || it == KonanTarget.WATCHOS_ARM32 || it == KonanTarget.TVOS_X64 || it == KonanTarget.TVOS_ARM64} }