Skip to content

Commit

Permalink
Merge #413
Browse files Browse the repository at this point in the history
413: Add riscv64gc-unknown-linux-gnu support r=reitermarkus a=tblah

rust support for riscv64gc-unknown-linux-gnu [is not yet advertised](https://forge.rust-lang.org/release/platform-support.html), but [is merged](rust-lang/rust#66661).

There are [issues](rust-lang/rust#62117) with riscv64gc-unknown-linux-gnu but it works well enough to build many crates (including rustc).

Co-authored-by: Tom Eccles <tom.eccles@codethink.co.uk>
  • Loading branch information
bors[bot] and tblah authored May 1, 2020
2 parents 5d717f0 + a7d6482 commit 29350e5
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ terminate.
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 || 3.0.1 ||
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 || 3.0.1 ||
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 || 3.0.1 ||
| `riscv64gc-unknown-linux-gnu` | 2.27 | 7.5.0 || 4.2.0 ||
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 || 4.1.0 | |
| `sparc64-unknown-linux-gnu` [3] | 2.23 | 5.3.1 || 4.1.0 ||
| `sparcv9-sun-solaris` [4] | 2.11 | 5.3.0 || N/A | |
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
powerpc-unknown-linux-gnu: { TARGET: powerpc-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
powerpc64-unknown-linux-gnu: { TARGET: powerpc64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
powerpc64le-unknown-linux-gnu: { TARGET: powerpc64le-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-user qemu-system }
riscv64gc-unknown-linux-gnu: { TARGET: riscv64gc-unknown-linux-gnu, CPP: 1, STD: 1, RUN: 1 }
s390x-unknown-linux-gnu: { TARGET: s390x-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
sparc64-unknown-linux-gnu: { TARGET: sparc64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: qemu-system }
x86_64-unknown-linux-gnu: { TARGET: x86_64-unknown-linux-gnu, CPP: 1, DYLIB: 1, STD: 1, RUN: 1, RUNNERS: native qemu-user qemu-system, DEPLOY: 1, CRATES_IO_PUBLISH: 1 }
Expand Down
26 changes: 26 additions & 0 deletions docker/Dockerfile.riscv64gc-unknown-linux-gnu
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:18.04

COPY common.sh /
RUN /common.sh

# COPY cmake.sh /
# RUN /cmake.sh

COPY xargo.sh /
RUN /xargo.sh

RUN apt-get install -y --no-install-recommends \
g++-riscv64-linux-gnu \
libc6-dev-riscv64-cross

COPY qemu.sh /
RUN /qemu.sh riscv64

COPY linux-runner /

ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-linux-gnu-gcc \
CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="/linux-runner riscv64" \
CC_riscv64gc_unknown_linux_gnu=riscv64-linux-gnu-gcc \
CXX_riscv64gc_unknown_linux_gnu=riscv64-linux-gnu-g++ \
QEMU_LD_PREFIX=/usr/riscv64-linux-gnu \
RUST_TEST_THREADS=1
1 change: 1 addition & 0 deletions docker/linux-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ main() {

# archive.debian.org Release files are expired.
echo "Acquire::Check-Valid-Until false;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid
echo "APT::Get::AllowUnauthenticated true;" | tee -a /etc/apt/apt.conf.d/10-nocheckvalid

dropbear="dropbear"
;;
Expand Down

0 comments on commit 29350e5

Please sign in to comment.