From 274f50251c37e6ae2eff211d2341002fcc530987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Marques?= Date: Thu, 10 Feb 2022 21:48:11 +0000 Subject: [PATCH] Update toolchain to release 20220210-1 with bitmanip support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release updates the meson cross files to make the toolchains more easily configurable. The tool versions for the bitmanip variant are: - Binutils 2.35 - GCC: 10.2.0 - Clang/LLVM: 13.0.1 - GDB 11.1 - Binutils: `7c9dd840fbb6a1171a51feb08afb859288615137` (riscv-binutils-2.35-rvb) with Pirmin's bitmanip 1.00+0.93 PR patch (https://github.com/riscv-collab/riscv-binutils-gdb/pull/267). - GCC: `73055647d33c0b63a3125c372019d1dac0f8ac34` (RISC-V bitmanip fork, branch riscv-gcc-10.2.0-rvb, commit 73055647d33 from 2021-07-09) - Clang/LLVM: 13.0.1 - GDB 11.1 Signed-off-by: Luís Marques --- azure-pipelines.yml | 2 +- util/container/Dockerfile | 2 +- util/get-toolchain.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6035afbd3d4cae..a46e03bdaaee4a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ variables: VERIBLE_VERSION: v0.0-1213-g9e5c085 RUST_VERSION: 1.55.0 # Release tag from https://github.com/lowRISC/lowrisc-toolchains/releases - TOOLCHAIN_VERSION: 20210412-1 + TOOLCHAIN_VERSION: 20220210-1 # This controls where builds happen, and gets picked up by build_consts.sh. BUILD_ROOT: $(Build.ArtifactStagingDirectory) VIVADO_VERSION: "2020.2" diff --git a/util/container/Dockerfile b/util/container/Dockerfile index 17d69fbbbb4502..fb7fb37657c68c 100644 --- a/util/container/Dockerfile +++ b/util/container/Dockerfile @@ -10,7 +10,7 @@ ARG VERILATOR_VERSION=4.210 ARG OPENOCD_VERSION=0.11.0 ARG VERIBLE_VERSION=v0.0-1213-g9e5c085 # The RISCV toolchain version should match the release tag used in GitHub. -ARG RISCV_TOOLCHAIN_TAR_VERSION=20210412-1 +ARG RISCV_TOOLCHAIN_TAR_VERSION=20220210-1 ARG RUST_VERSION=1.55.0 # Main container image. diff --git a/util/get-toolchain.py b/util/get-toolchain.py index 957a5199b32728..18297c2804e811 100755 --- a/util/get-toolchain.py +++ b/util/get-toolchain.py @@ -19,8 +19,8 @@ # the keys in this dictionary specify valid toolchain kinds ASSET_PREFIXES = { # kind : prefix, - "combined": "lowrisc-toolchain-rv32imc-", - "gcc-only": "lowrisc-toolchain-gcc-rv32imc-", + "combined": "lowrisc-toolchain-rv32imcb-", + "gcc-only": "lowrisc-toolchain-gcc-rv32imcb-", } ASSET_SUFFIX = ".tar.xz" RELEASES_URL_BASE = 'https://api.github.com/repos/lowRISC/lowrisc-toolchains/releases'