Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start patching for support linux arm64 as a host OS #5377

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Start patching for support linux arm64 as a host OS #5377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,10 @@
</artifact>
</component>
<component group="com.google.protobuf" name="protoc" version="4.28.2">
<artifact name="protoc-4.28.2-linux-aarch_64.exe">
<md5 value="15d4f42398050d6d16ebc1470b72b041" origin="Generated by Gradle"/>
<sha256 value="b3e419ae03f32ee2879a453b5750a624997435c781f0c84fb640b86072837066" origin="Generated by Gradle"/>
</artifact>
<artifact name="protoc-4.28.2-linux-x86_64.exe">
<md5 value="33fb46a696253a7d099b143416aa59d5" origin="Generated by Gradle"/>
<sha256 value="c280b6c0bec0c30b1b6127ed7f53488971efadfb249d7776331b9d63bc78f917" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -5319,6 +5323,10 @@
</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">
<md5 value="2b95a345457e4e5e503df518f76f96b0" origin="Generated by Gradle"/>
<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"/>
Expand Down Expand Up @@ -5667,6 +5675,10 @@
<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">
<md5 value="38685b390ec45918334e7963a500981b" origin="Generated by Gradle"/>
<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"/>
Expand Down
1 change: 1 addition & 0 deletions kotlin-native/konan/konan.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kotlin-native/tools/toolchain_builder/build_toolchain.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

set -eou pipefail
set -eo pipefail

TARGET=$1
VERSION=$2
Expand Down
4 changes: 2 additions & 2 deletions kotlin-native/tools/toolchain_builder/run_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eou pipefail
set -eo pipefail

CONTAINER_NAME=kotlin-toolchain-builder
IMAGE_NAME=kotlin-toolchain-builder
Expand All @@ -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."
2 changes: 1 addition & 1 deletion ...chain_builder/toolchains/aarch64-unknown-linux-gnu/gcc-8.3.0-glibc-2.25-kernel-4.9.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...ain_builder/toolchains/arm-unknown-linux-gnueabihf/gcc-8.3.0-glibc-2.19-kernel-4.9.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...oolchain_builder/toolchains/mips-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...lchain_builder/toolchains/mipsel-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...lchain_builder/toolchains/x86_64-unknown-linux-gnu/gcc-8.3.0-glibc-2.19-kernel-4.9.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions native/utils/src/org/jetbrains/kotlin/konan/target/HostManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 2 additions & 0 deletions wasm/wasm.tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,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"
Expand All @@ -83,6 +84,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),
Expand Down