From d1229d008b3ed0c19f0433ba1b20cf0a3f64c4ef Mon Sep 17 00:00:00 2001 From: Gijs Burghoorn Date: Thu, 31 Aug 2023 17:49:02 +0200 Subject: [PATCH] Fix: Add proper flags for RISCV64 ci --- .../ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile | 7 +++---- library/stdarch/ci/run.sh | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile index b9b3c682eaf9..67f5f4cdefe2 100644 --- a/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile +++ b/library/stdarch/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile @@ -1,10 +1,9 @@ -FROM ubuntu:22.04 +FROM ubuntu:23.04 RUN apt-get update && apt-get install -y --no-install-recommends \ gcc libc6-dev qemu-user ca-certificates \ - gcc-riscv64-linux-gnu libc6-dev-riscv64-cross \ - qemu-user + 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" \ + CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="qemu-riscv64 -L /usr/riscv64-linux-gnu -cpu rv64,zk=true" \ OBJDUMP=riscv64-linux-gnu-objdump diff --git a/library/stdarch/ci/run.sh b/library/stdarch/ci/run.sh index 0e33de89dbc3..9923fa8e36ea 100755 --- a/library/stdarch/ci/run.sh +++ b/library/stdarch/ci/run.sh @@ -47,6 +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 TARGET_CC="riscv64-linux-gnu-gcc" ;; esac