Fix: Testing for RISC-V Zb intrinsics

This commit is contained in:
Gijs Burghoorn 2023-09-01 17:19:00 +02:00 committed by Amanieu d'Antras
parent c460cf6706
commit f4ee8f0282
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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