From c0547903153a9f03149aba7d79004574855256fa Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Fri, 7 Mar 2025 12:06:37 +0100 Subject: [PATCH 1/2] Upgrade toolchain to musl `1.2.5.1`. --- ci/ci_common/musl-common.libsonnet | 4 ++-- sdk/mx.sdk/suite.py | 32 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ci/ci_common/musl-common.libsonnet b/ci/ci_common/musl-common.libsonnet index b9a788fac685..3bae934d67db 100644 --- a/ci/ci_common/musl-common.libsonnet +++ b/ci/ci_common/musl-common.libsonnet @@ -3,8 +3,8 @@ musl_dependency:: { downloads+: { MUSL_TOOLCHAIN: { - name: 'toolchain-gcc-10.2.1-musl', - version: '1.2.2', + name: 'toolchain-gcc-10.3.0-zlib-1.2.13-musl', + version: '1.2.5.1', platformspecific: true, }, }, diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py index 0b29e7d7395e..6c8b45ed2e94 100644 --- a/sdk/mx.sdk/suite.py +++ b/sdk/mx.sdk/suite.py @@ -228,12 +228,12 @@ "os_arch": { "linux": { "amd64": { - "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-amd64.tar.gz"], - "digest" : "sha512:8f49b04d4826c560c791e5223f504046fa0daa6b79e581ea1781a2d01f4efe2de4a0fb6771dc1b07318ab0109a61ea3b04255eadf36191a76687f873931eb283", + "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.3.0-zlib-1.2.13-musl-1.2.5.1-linux-amd64.tar.gz"], + "digest" : "sha512:a4be5d7f0a0857e30992079b39b0b7a00b80b4f255a0dddf8e4208d53c0a2a79ad26dbcb3e7b4018bfc1ef5751cf2bf7180c64d6b13dd4c80ed2dd0335945736", }, "aarch64": { - "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-aarch64.tar.gz"], - "digest" : "sha512:f5545f6b36c2306861c026895d437a57357515e8dfefb0e8419413f61b146f42dc072f8a8a7a9f4885d6448396d656f59264e61e3f5eedd278486228aa58904e", + "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.3.0-zlib-1.2.13-musl-1.2.5.1-linux-aarch64.tar.gz"], + "digest" : "sha512:7f645bceaad864e6a0cf3289ca234e76819f7bfc06abf0c82b59e51e152191235b65c3b7f4e9baa2f2c2982459ffec2c284d99cc28bf7923eb9022eef03ad72d", }, "": { "optional": True, @@ -1626,9 +1626,9 @@ class UniversalDetector { "source_type": "string", "value": ''' include -CC=/x86_64-linux-musl-native/bin/gcc -CXX=/x86_64-linux-musl-native/bin/g++ -AR=/x86_64-linux-musl-native/bin/ar +CC=/musl-toolchain/bin/x86_64-linux-musl-gcc +CXX=/musl-toolchain/bin/x86_64-linux-musl-g++ +AR=/musl-toolchain/bin/x86_64-linux-musl-ar CFLAGS= CXXFLAGS= LDFLAGS= @@ -1646,9 +1646,9 @@ class UniversalDetector { "source_type": "string", "value": ''' include -CC=/aarch64-linux-musl-native/bin/gcc -CXX=/aarch64-linux-musl-native/bin/g++ -AR=/aarch64-linux-musl-native/bin/ar +CC=/musl-toolchain/bin/aarch64-linux-musl-gcc +CXX=/musl-toolchain/bin/aarch64-linux-musl-g++ +AR=/musl-toolchain/bin/aarch64-linux-musl-ar CFLAGS= CXXFLAGS= LDFLAGS= @@ -1688,9 +1688,9 @@ class UniversalDetector { "toolchain.cmake" : { "source_type": "string", "value": ''' -set(CMAKE_C_COMPILER /x86_64-linux-musl-native/bin/gcc) -set(CMAKE_CXX_COMPILER /x86_64-linux-musl-native/bin/g++) -set(CMAKE_AR /x86_64-linux-musl-native/bin/ar) +set(CMAKE_C_COMPILER /musl-toolchain/bin/x86_64-linux-musl-gcc) +set(CMAKE_CXX_COMPILER /musl-toolchain/bin/x86_64-linux-musl-g++) +set(CMAKE_AR /musl-toolchain/bin/x86_64-linux-musl-ar) ''' }, }, @@ -1703,9 +1703,9 @@ class UniversalDetector { "toolchain.cmake" : { "source_type": "string", "value": ''' -set(CMAKE_C_COMPILER /aarch64-linux-musl-native/bin/gcc) -set(CMAKE_CXX_COMPILER /aarch64-linux-musl-native/bin/g++) -set(CMAKE_AR /aarch64-linux-musl-native/bin/ar) +set(CMAKE_C_COMPILER /musl-toolchain/bin/aarch64-linux-musl-gcc) +set(CMAKE_CXX_COMPILER /musl-toolchain/bin/aarch64-linux-musl-g++) +set(CMAKE_AR /musl-toolchain/bin/aarch64-linux-musl-ar) ''' }, }, From b8febef59df861ffc92d89e748667045abccae81 Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Thu, 17 Jul 2025 17:27:54 +0200 Subject: [PATCH 2/2] Use correct MX_SVMTEST_RUN_PREFIX according to the location of libc.so inside the toolchain --- substratevm/ci/ci_common/svm-gate.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/substratevm/ci/ci_common/svm-gate.libsonnet b/substratevm/ci/ci_common/svm-gate.libsonnet index 3367297dbace..d862fa85a03f 100644 --- a/substratevm/ci/ci_common/svm-gate.libsonnet +++ b/substratevm/ci/ci_common/svm-gate.libsonnet @@ -87,7 +87,7 @@ mxgate_config+::["musl-dynamic"], mxgate_extra_args+: ["--extra-image-builder-arguments=--libc=musl -H:+UnlockExperimentalVMOptions -H:-StaticExecutable -H:-UnlockExperimentalVMOptions"], environment+: { - MX_SVMTEST_RUN_PREFIX: "$MUSL_TOOLCHAIN/lib/libc.so ", # see GR-53484, launching the ELF file with the right interpreter + MX_SVMTEST_RUN_PREFIX: "$MUSL_TOOLCHAIN/x86_64-linux-musl/lib/libc.so ", # see GR-53484, launching the ELF file with the right interpreter. If the path is incorrect, some svm tests fail with "FAILED image construction: java.lang.AssertionError: internal error" }, } + # The galahad gates run with oracle JDK, which do not offer a musl build