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

Renamed x86-64 suffix to x64.

Browse Source 
RaspberryPi was mistakenly attributed to its own architecture,
whereas it should be just ARM32.
This commit is contained in:
Alexander Gorshenev
2017-10-05 16:53:29 +03:00
committed by alexander-gorshenev
parent 174e440d9d
commit 3abd8e4851
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTarget.kt
+7 -18
View File
@@ -24,38 +24,27 @@ enum class Family(name:String, val exeSuffix:String) {
WASM("wasm", "wasm")
}
enum class Bitness {
BITSNESS_32,
BITNESS_64
}
enum class Architecture(val bitness: Int) {
X86_64(64),
X64(64),
ARM64(64),
ARM32(32),
RASPBERRYPI(32),
MIPS32(32),
MIPSEL32(32),
WASM32(32);
val userName: String
get() {
return if (this == X86_64)
"x86-64" // Dash instead of underscore.
else
this.name.toLowerCase()
}
get() = this.name.toLowerCase()
}
enum class KonanTarget(val family: Family, val architecture: Architecture, val detailedName: String, var enabled: Boolean = false) {
ANDROID_ARM32( Family.ANDROID, Architecture.ARM32, "android_arm32"),
ANDROID_ARM64( Family.ANDROID, Architecture.ARM64, "android_arm64"),
IPHONE( Family.OSX, Architecture.ARM32, "ios"),
IPHONE_SIM( Family.OSX, Architecture.X86_64, "ios_sim"),
LINUX( Family.LINUX, Architecture.X86_64, "linux"),
MINGW( Family.WINDOWS, Architecture.X86_64, "mingw"),
MACBOOK( Family.OSX, Architecture.X86_64, "osx"),
RASPBERRYPI( Family.LINUX, Architecture.RASPBERRYPI, "raspberrypi"),
IPHONE_SIM( Family.OSX, Architecture.X64, "ios_sim"),
LINUX( Family.LINUX, Architecture.X64, "linux"),
MINGW( Family.WINDOWS, Architecture.X64, "mingw"),
MACBOOK( Family.OSX, Architecture.X64, "osx"),
RASPBERRYPI( Family.LINUX, Architecture.ARM32, "raspberrypi"),
LINUX_MIPS32( Family.LINUX, Architecture.MIPS32, "linux_mips32"),
LINUX_MIPSEL32( Family.LINUX, Architecture.MIPSEL32, "linux_mipsel32"),
WASM32( Family.WASM, Architecture.WASM32, "wasm32");