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

Revert "Cleanup HostManager.kt a little bit"

Browse Source 
This reverts commit 9d957f68
This commit is contained in:
Nikolay Krasko
2021-03-17 20:40:48 +03:00
parent 3dd25e4965
commit 98b2c00083
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
+18 -17
View File
@@ -46,7 +46,7 @@ open class HostManager(
return targets[resolveAlias(name)] ?: throw TargetSupportException("Unknown target name: $name") return targets[resolveAlias(name)] ?: throw TargetSupportException("Unknown target name: $name")
} }
private val enabledRegularByHost: Map<KonanTarget, Set<KonanTarget>> = mapOf( val enabledRegularByHost: Map<KonanTarget, Set<KonanTarget>> = mapOf(
LINUX_X64 to setOf( LINUX_X64 to setOf(
LINUX_X64, LINUX_X64,
LINUX_ARM32_HFP, LINUX_ARM32_HFP,
@@ -94,7 +94,7 @@ open class HostManager(
) )
) )
private val enabledExperimentalByHost: Map<KonanTarget, Set<KonanTarget>> = mapOf( val enabledExperimentalByHost: Map<KonanTarget, Set<KonanTarget>> = mapOf(
LINUX_X64 to setOf(MINGW_X86, MINGW_X64) + zephyrSubtargets, LINUX_X64 to setOf(MINGW_X86, MINGW_X64) + zephyrSubtargets,
MACOS_X64 to setOf(MINGW_X86, MINGW_X64) + zephyrSubtargets, MACOS_X64 to setOf(MINGW_X86, MINGW_X64) + zephyrSubtargets,
MINGW_X64 to setOf<KonanTarget>() + zephyrSubtargets MINGW_X64 to setOf<KonanTarget>() + zephyrSubtargets
@@ -110,11 +110,11 @@ open class HostManager(
result.toMap() result.toMap()
} }
private val enabledRegular: List<KonanTarget> by lazy { val enabledRegular: List<KonanTarget> by lazy {
enabledRegularByHost[host]?.toList() ?: throw TargetSupportException("Unknown host platform: $host") enabledRegularByHost[host]?.toList() ?: throw TargetSupportException("Unknown host platform: $host")
} }
private val enabledExperimental: List<KonanTarget> by lazy { val enabledExperimental: List<KonanTarget> by lazy {
enabledExperimentalByHost[host]?.toList() ?: throw TargetSupportException("Unknown host platform: $host") enabledExperimentalByHost[host]?.toList() ?: throw TargetSupportException("Unknown host platform: $host")
} }
@@ -124,7 +124,7 @@ open class HostManager(
fun isEnabled(target: KonanTarget) = enabled.contains(target) fun isEnabled(target: KonanTarget) = enabled.contains(target)
companion object { companion object {
private fun hostOs(): String { fun host_os(): String {
val javaOsName = System.getProperty("os.name") val javaOsName = System.getProperty("os.name")
return when { return when {
javaOsName == "Mac OS X" -> "osx" javaOsName == "Mac OS X" -> "osx"
@@ -136,7 +136,7 @@ open class HostManager(
@JvmStatic @JvmStatic
fun simpleOsName(): String { fun simpleOsName(): String {
val hostOs = hostOs() val hostOs = host_os()
return if (hostOs == "osx") "macos" else hostOs return if (hostOs == "osx") "macos" else hostOs
} }
@@ -148,8 +148,9 @@ open class HostManager(
else -> throw TargetSupportException("Unknown host: $host.") else -> throw TargetSupportException("Unknown host: $host.")
} }
private fun hostArch(): String { fun host_arch(): String {
return when (val javaArch = System.getProperty("os.arch")) { val javaArch = System.getProperty("os.arch")
return when (javaArch) {
"x86_64" -> "x86_64" "x86_64" -> "x86_64"
"amd64" -> "x86_64" "amd64" -> "x86_64"
"arm64" -> "arm64" "arm64" -> "arm64"
@@ -157,14 +158,12 @@ open class HostManager(
} }
} }
private val hostMapping: Map<Pair<String, String>, KonanTarget> = mapOf( val host: KonanTarget = when (host_os()) {
Pair("osx", "x86_64") to MACOS_X64, "osx" -> MACOS_X64
Pair("linux", "x86_64") to LINUX_X64, "linux" -> LINUX_X64
Pair("windows", "x86_64") to MINGW_X64 "windows" -> MINGW_X64
) else -> throw TargetSupportException("Unknown host target: ${host_os()} ${host_arch()}")
}
val host: KonanTarget = hostMapping[hostOs() to hostArch()]
?: throw TargetSupportException("Unknown host target: ${hostOs()} ${hostArch()}")
// Note Hotspot-specific VM option enforcing C1-only, critical for decent compilation speed. // Note Hotspot-specific VM option enforcing C1-only, critical for decent compilation speed.
val defaultJvmArgs = listOf("-XX:TieredStopAtLevel=1", "-ea", "-Dfile.encoding=UTF-8") val defaultJvmArgs = listOf("-XX:TieredStopAtLevel=1", "-ea", "-Dfile.encoding=UTF-8")
@@ -174,8 +173,10 @@ open class HostManager(
val hostIsLinux = (host.family == Family.LINUX) val hostIsLinux = (host.family == Family.LINUX)
val hostIsMingw = (host.family == Family.MINGW) val hostIsMingw = (host.family == Family.MINGW)
val hostSuffix get() = host.name
@JvmStatic @JvmStatic
val hostName: String val hostName
get() = host.name get() = host.name
val knownTargetTemplates = listOf("zephyr") val knownTargetTemplates = listOf("zephyr")