Start patching for support linux arm64 as a host OS

* Fix isl pointed to deprecated url * Add precompiled dependencies for linux aarch64 * Add Linux ARM 64 enum (still incomplete)
JetBrains · Nov 13, 2024 · 604ef54 · 604ef54
1 parent 828c4bd
commit 604ef54
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 8 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1025,6 +1025,9 @@
          </artifact>
       </component>
       <component group="com.google.protobuf" name="protoc" version="3.21.9">
+         <artifact name="protoc-3.21.9-linux-aarch_64.exe">
+            <sha256 value="4647c00c264ebd0f53bd873c4ac7862f37cfcf11e4a03837e7d5ae44b789c95a" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="protoc-3.21.9-linux-x86_64.exe">
             <md5 value="31041ccce431c15221dfe7a1f1e5b155" origin="Generated by Gradle"/>
             <sha256 value="36a41d16894d5f32746d98174ad841a8fd4118dc5042df18795be20b3cd1cb48" origin="Generated by Gradle"/>
@@ -5259,6 +5262,9 @@
          </artifact>
       </component>
       <component group="org.mozilla" name="jsshell" version="2024-05-07-09-13-07-mozilla-central">
+         <artifact name="jsshell-2024-05-07-09-13-07-mozilla-central-linux-aarch64.zip">
+            <sha256 value="22a70c749ab9ffd019c3d5a52a46426a63992259f1c6434fd5e781a52e687170" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="jsshell-2024-05-07-09-13-07-mozilla-central-linux-x86_64.zip">
             <md5 value="4c36a1c4e69d5227a7a5a8efa3088563" origin="Generated by Gradle"/>
             <sha256 value="a363b64017cd6f83bd313fe8b6d1dcf678a16ee10ebeddd11ad4b30be0da6b31" origin="Generated by Gradle"/>
@@ -5285,6 +5291,10 @@
             <md5 value="0d4af228415b57c21a5c053cd5363e3c" origin="Generated by Gradle"/>
             <sha256 value="74bb0f3a80307c529421c3ed84517b8f543867709f41e53cd73df99e6442af4d" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="node-22.0.0-linux-arm64.tar.gz">
+            <md5 value="ae5b1b20a3166183d611bfb2c68bc260" origin="Generated by Gradle"/>
+            <sha256 value="1d3547226be7e59aceee5c7d01a9f8fc18de67e015c5a15d8cf385b6e02d062b" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="node-22.0.0-win-x64.zip">
             <md5 value="02670f9dbbfa4d01a9dc2d87594aeb8f" origin="Generated by Gradle"/>
             <sha256 value="32d639b47d4c0a651ff8f8d7d41a454168a3d4045be37985f9a810cf8cef6174" origin="Generated by Gradle"/>
@@ -5613,6 +5623,9 @@
             <md5 value="34e36bbe3e6345b7d01a94fc78f5559b" origin="Generated by Gradle"/>
             <sha256 value="4f2f34545a97768e28700099ac9cbb18e7b434779d237de860324de400922546" origin="Generated by Gradle"/>
          </artifact>
+         <artifact name="wasmedge-0.14.0-manylinux_2_28_aarch64.tar.gz">
+            <sha256 value="d56480e3216e64b62e63a5f868813b41e503186539c0ee783c3790e85b24fbed" origin="Generated by Gradle"/>
+         </artifact>
          <artifact name="wasmedge-0.14.0-manylinux_2_28_x86_64.tar.gz">
             <md5 value="23c41ba52fbfa3e3c448fe05982648bb" origin="Generated by Gradle"/>
             <sha256 value="09837eba04383a0e2a96c0809bd31d49f0738604a4ec4e3d4d3500cd89e567a8" origin="Generated by Gradle"/>

diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
@@ -47,6 +47,7 @@ predefinedLlvmDistributions = \
 llvm-16.0.0-x86_64-macos-dev-50.default = remote:public:resources/llvm/16.0.0-x86_64-macos
 llvm-16.0.0-aarch64-macos-dev-63.default = remote:public:resources/llvm/16.0.0-aarch64-macos
 llvm-16.0.0-x86_64-linux-dev-80.default = remote:public:resources/llvm/16.0.0-x86_64-linux
+llvm-16.0.0-aarch64-linux-dev-80.default = remote:public:resources/llvm/16.0.0-aarch64-linux
 llvm-16.0.0-x86_64-windows-dev-56.default = remote:public:resources/llvm/16.0.0-x86_64-windows
 llvm-16.0.0-x86_64-macos-essentials-50.default = remote:public:resources/llvm/16.0.0-x86_64-macos
 llvm-16.0.0-aarch64-macos-essentials-63.default = remote:public:resources/llvm/16.0.0-aarch64-macos

diff --git a/kotlin-native/tools/toolchain_builder/build_toolchain.sh b/kotlin-native/tools/toolchain_builder/build_toolchain.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eou pipefail
+set -eo pipefail
 
 TARGET=$1
 VERSION=$2

diff --git a/kotlin-native/tools/toolchain_builder/run_container.sh b/kotlin-native/tools/toolchain_builder/run_container.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eou pipefail
+set -eo pipefail
 
 CONTAINER_NAME=kotlin-toolchain-builder
 IMAGE_NAME=kotlin-toolchain-builder
@@ -19,6 +19,6 @@ docker run \
   --name=$CONTAINER_NAME $IMAGE_NAME
 
 mkdir -p artifacts
-docker cp kotlin-toolchain-builder:"/home/ct/x-tools/$TARGET-$VERSION-$TOOLCHAIN_VERSION_SUFFIX.tar.gz" artifacts/
+docker cp kotlin-toolchain-builder:"/home/ct/x-tools/$TARGET-$VERSION$TOOLCHAIN_VERSION_SUFFIX.tar.gz" artifacts/
 
 echo "Done."
diff --git a/...chain_builder/toolchains/aarch64-unknown-linux-gnu/gcc-8.3.0-glibc-2.25-kernel-4.9.config b/...chain_builder/toolchains/aarch64-unknown-linux-gnu/gcc-8.3.0-glibc-2.25-kernel-4.9.config
@@ -626,7 +626,7 @@ CT_ISL_V_0_20=y
 # CT_ISL_V_0_15 is not set
 # CT_ISL_NO_VERSIONS is not set
 CT_ISL_VERSION="0.20"
-CT_ISL_MIRRORS="http://isl.gforge.inria.fr"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"

diff --git a/...ain_builder/toolchains/arm-unknown-linux-gnueabihf/gcc-8.3.0-glibc-2.19-kernel-4.9.config b/...ain_builder/toolchains/arm-unknown-linux-gnueabihf/gcc-8.3.0-glibc-2.19-kernel-4.9.config
@@ -630,7 +630,7 @@ CT_ISL_V_0_20=y
 # CT_ISL_V_0_15 is not set
 # CT_ISL_NO_VERSIONS is not set
 CT_ISL_VERSION="0.20"
-CT_ISL_MIRRORS="http://isl.gforge.inria.fr"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"

diff --git a/...oolchain_builder/toolchains/mips-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config b/...oolchain_builder/toolchains/mips-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config
@@ -616,7 +616,7 @@ CT_ISL_V_0_20=y
 # CT_ISL_V_0_15 is not set
 # CT_ISL_NO_VERSIONS is not set
 CT_ISL_VERSION="0.20"
-CT_ISL_MIRRORS="http://isl.gforge.inria.fr"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"

diff --git a/...lchain_builder/toolchains/mipsel-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config b/...lchain_builder/toolchains/mipsel-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config
@@ -621,7 +621,7 @@ CT_ISL_V_0_20=y
 # CT_ISL_V_0_15 is not set
 # CT_ISL_NO_VERSIONS is not set
 CT_ISL_VERSION="0.20"
-CT_ISL_MIRRORS="http://isl.gforge.inria.fr"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"

diff --git a/...lchain_builder/toolchains/x86_64-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config b/...lchain_builder/toolchains/x86_64-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config
@@ -606,7 +606,7 @@ CT_ISL_V_0_20=y
 # CT_ISL_V_0_15 is not set
 # CT_ISL_NO_VERSIONS is not set
 CT_ISL_VERSION="0.20"
-CT_ISL_MIRRORS="http://isl.gforge.inria.fr"
+CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"

diff --git a/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt b/native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
@@ -77,6 +77,7 @@ open class HostManager() {
 
     val enabledByHost: Map<KonanTarget, Set<KonanTarget>> = mapOf(
         LINUX_X64 to commonTargets,
+        LINUX_ARM64 to commonTargets,
         MINGW_X64 to commonTargets,
         MACOS_X64 to commonTargets + appleTargets,
         MACOS_ARM64 to commonTargets + appleTargets
@@ -148,6 +149,7 @@ open class HostManager() {
             Pair("osx", "x86_64") to MACOS_X64,
             Pair("osx", "aarch64") to MACOS_ARM64,
             Pair("linux", "x86_64") to LINUX_X64,
+            Pair("linux", "aarch64") to LINUX_ARM64,
             Pair("windows", "x86_64") to MINGW_X64
         )
 

diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts
@@ -65,6 +65,7 @@ val jsShellVersion = "2024-05-07-09-13-07-mozilla-central"
 val jsShellSuffix = when (currentOsType) {
     OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686"
     OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64"
+    OsType(OsName.LINUX, OsArch.ARM64) -> "linux-aarch64"
     OsType(OsName.MAC, OsArch.X86_64),
     OsType(OsName.MAC, OsArch.ARM64) -> "mac"
     OsType(OsName.WINDOWS, OsArch.X86_32) -> "win32"
@@ -80,6 +81,7 @@ val jsShell by configurations.creating {
 val wasmEdgeVersion = libs.versions.wasmedge
 val wasmEdgeSuffix = when (currentOsType) {
     OsType(OsName.LINUX, OsArch.X86_64) -> "[email protected]"
+    OsType(OsName.LINUX, OsArch.ARM64) -> "[email protected]"
     OsType(OsName.MAC, OsArch.X86_64) -> "[email protected]"
     OsType(OsName.MAC, OsArch.ARM64) -> "[email protected]"
     OsType(OsName.WINDOWS, OsArch.X86_32),