diff options
| author | Gijs Burghoorn <me@gburghoorn.com> | 2023-09-01 17:19:00 +0200 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2023-09-01 18:32:40 +0200 |
| commit | f4ee8f02822269ef93ffcc5184ff3cd2e3eee89b (patch) | |
| tree | 1753504483bb4dd3199460c999fb0338a34df1c6 | |
| parent | c460cf67060242f34153a247eaf9ad047d4eb30f (diff) | |
| download | rust-f4ee8f02822269ef93ffcc5184ff3cd2e3eee89b.tar.gz rust-f4ee8f02822269ef93ffcc5184ff3cd2e3eee89b.zip | |
Fix: Testing for RISC-V Zb intrinsics
| -rw-r--r-- | library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile | 2 | ||||
| -rwxr-xr-x | library/stdarch/ci/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile index 67f5f4cdefe..7ea795cac25 100644 --- a/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile +++ b/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile @@ -5,5 +5,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ gcc-riscv64-linux-gnu libc6-dev-riscv64-cross ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc \ - CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu -cpu rv64,zk=true" \ + CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu -cpu rv64,zk=true,zbb=true,zbc=true" \ OBJDUMP=riscv64-linux-gnu-objdump diff --git a/library/stdarch/ci/run.sh b/library/stdarch/ci/run.sh index 9923fa8e36e..7b2416fdad2 100755 --- a/library/stdarch/ci/run.sh +++ b/library/stdarch/ci/run.sh @@ -47,7 +47,7 @@ case ${TARGET} in # Some of our test dependencies use the deprecated `gcc` crates which # doesn't detect RISC-V compilers automatically, so do it manually here. riscv64*) - export RUSTFLAGS="${RUSTFLAGS} -Ctarget-feature=+zk" + export RUSTFLAGS="${RUSTFLAGS} -Ctarget-feature=+zk,+zbb,+zbc" export TARGET_CC="riscv64-linux-gnu-gcc" ;; esac |