azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REVERTME] filtering out ANDROID_{X86,ARM32}, WATCHOS_{X86,ARM32} from enabled platform till their full support

Browse Source 
see details in bc1b67678e
This commit is contained in:
Vasily Levchenko
2019-09-04 14:53:38 +03:00
parent d928eabeb1
commit e44d7706dc
5 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OptimizationPipeline.kt
+3
View File
@@ -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,
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+6
View File
@@ -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")
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt
+2 -1
View File
@@ -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)
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+3
View File
@@ -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 ->
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Platform.kt
+2 -1
View File
@@ -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}
}