diff options
author | Florian Hofhammer <florian.hofhammer@fhofhammer.de> | 2022-02-24 10:07:58 +0100 |
---|---|---|
committer | Florian Hofhammer <florian.hofhammer@fhofhammer.de> | 2022-02-24 10:07:58 +0100 |
commit | f2caeb4d5a306c7ff2861f4c0fcd01338a315f9b (patch) | |
tree | 8a5f6661d6fc993adbabf21c19201e14e8ad6df5 /.github | |
parent | 7c07a876c4fefb7c8fb8e43f9b9ad33bbf08467e (diff) | |
download | riscv-gnu-toolchain-f2caeb4d5a306c7ff2861f4c0fcd01338a315f9b.zip riscv-gnu-toolchain-f2caeb4d5a306c7ff2861f4c0fcd01338a315f9b.tar.gz riscv-gnu-toolchain-f2caeb4d5a306c7ff2861f4c0fcd01338a315f9b.tar.bz2 |
Add musl libc submodule
Since musl is already incorporated into the build system (see for
example configure.ac, Makefile.in), this patch adds a submodule for
musl based on the current v1.2.2 release.
The GitHub Actions configurations have also been updated to include
the musl based toolchain.
Signed-off-by: Florian Hofhammer <florian.hofhammer@fhofhammer.de>
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/build.yaml | 11 | ||||
-rw-r--r-- | .github/workflows/nightly-release.yaml | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 18bbf6c..1696365 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, ubuntu-20.04] - mode: [newlib, linux] + mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] steps: - uses: actions/checkout@v2 @@ -40,7 +40,14 @@ jobs: id: toolchain-name-generator run: | if [[ "${{ matrix.target }}" == *"32"* ]]; then BITS=32; else BITS=64; fi - if [[ "${{ matrix.mode }}" == "linux" ]]; then MODE="glibc"; else MODE="elf"; fi + case "${{ matrix.mode }}" in + "linux") + MODE="glibc";; + "musl") + MODE="musl";; + *) + MODE="elf";; + esac echo ::set-output name=TOOLCHAIN_NAME::riscv$BITS-$MODE-${{ matrix.os }}-nightly - uses: actions/upload-artifact@v2 diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index 21d6cf9..ddf4464 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -49,7 +49,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04, ubuntu-20.04] - mode: [newlib, linux] + mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] steps: - uses: actions/checkout@v2 @@ -75,7 +75,14 @@ jobs: id: toolchain-name-generator run: | if [[ "${{ matrix.target }}" == *"32"* ]]; then BITS=32; else BITS=64; fi - if [[ "${{ matrix.mode }}" == "linux" ]]; then MODE="glibc"; else MODE="elf"; fi + case "${{ matrix.mode }}" in + "linux") + MODE="glibc";; + "musl") + MODE="musl";; + *) + MODE="elf";; + esac echo ::set-output name=TOOLCHAIN_NAME::riscv$BITS-$MODE-${{ matrix.os }}-nightly - uses: actions/upload-artifact@v2 |