Skip to content

Commit af3d4cb

Browse files
ManishearthManishearth
authored
Rollup merge of #72973 - msizanoen1:riscv-host, r=pietroalbini
RISC-V GNU/Linux as host platform This PR add a new builder named `dist-riscv64-linux` that builds the compiler toolchain for RISC-V 64-bit GNU/Linux. r? @alexcrichton
2 parents 7e11379 + 933ba82 commit af3d4cb

File tree

10 files changed

+69
-25
lines changed

10 files changed

+69
-25
lines changed

‎.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,9 @@ jobs:
297297
- name: dist-powerpc64le-linux
298298
os: ubuntu-latest-xl
299299
env: {}
300+
- name: dist-riscv64-linux
301+
os: ubuntu-latest-xl
302+
env: {}
300303
- name: dist-s390x-linux
301304
os: ubuntu-latest-xl
302305
env: {}

‎src/bootstrap/native.rs

+22-2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,15 @@ impl Step for Llvm {
112112
/// Compile LLVM for `target`.
113113
fn run(self, builder: &Builder<'_>) -> PathBuf {
114114
let target = self.target;
115+
let target_native = if self.target.starts_with("riscv") {
116+
// RISC-V target triples in Rust is not named the same as C compiler target triples.
117+
// This converts Rust RISC-V target triples to C compiler triples.
118+
let idx = target.find('-').unwrap();
119+
120+
format!("riscv{}{}", &target[5..7], &target[idx..])
121+
} else {
122+
target.to_string()
123+
};
115124

116125
let Meta { stamp, build_llvm_config, out_dir, root } =
117126
match prebuilt_llvm_config(builder, target) {
@@ -165,8 +174,8 @@ impl Step for Llvm {
165174
.define("LLVM_ENABLE_BINDINGS", "OFF")
166175
.define("LLVM_ENABLE_Z3_SOLVER", "OFF")
167176
.define("LLVM_PARALLEL_COMPILE_JOBS", builder.jobs().to_string())
168-
.define("LLVM_TARGET_ARCH", target.split('-').next().unwrap())
169-
.define("LLVM_DEFAULT_TARGET_TRIPLE", target);
177+
.define("LLVM_TARGET_ARCH", target_native.split('-').next().unwrap())
178+
.define("LLVM_DEFAULT_TARGET_TRIPLE", target_native);
170179

171180
if !target.contains("netbsd") {
172181
cfg.define("LLVM_ENABLE_ZLIB", "ON");
@@ -213,6 +222,17 @@ impl Step for Llvm {
213222
}
214223
}
215224

225+
if target.starts_with("riscv") {
226+
// In RISC-V, using C++ atomics require linking to `libatomic` but the LLVM build
227+
// system check cannot detect this. Therefore it is set manually here.
228+
if !builder.config.llvm_tools_enabled {
229+
cfg.define("CMAKE_EXE_LINKER_FLAGS", "-latomic");
230+
} else {
231+
cfg.define("CMAKE_EXE_LINKER_FLAGS", "-latomic -static-libstdc++");
232+
}
233+
cfg.define("CMAKE_SHARED_LINKER_FLAGS", "-latomic");
234+
}
235+
216236
if target.contains("msvc") {
217237
cfg.define("LLVM_USE_CRT_DEBUG", "MT");
218238
cfg.define("LLVM_USE_CRT_RELEASE", "MT");

‎src/ci/azure-pipelines/auto.yml

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
dist-powerpc-linux: {}
5454
dist-powerpc64-linux: {}
5555
dist-powerpc64le-linux: {}
56+
dist-riscv64-linux: {}
5657
dist-s390x-linux: {}
5758
dist-x86_64-freebsd: {}
5859
dist-x86_64-illumos: {}

‎src/ci/docker/host-x86_64/dist-riscv64-linux/Dockerfile

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM ubuntu:18.04
2+
3+
COPY scripts/cross-apt-packages.sh /scripts/
4+
RUN sh /scripts/cross-apt-packages.sh
5+
6+
COPY host-x86_64/dist-riscv64-linux/crosstool-ng.sh /scripts/
7+
RUN sh /scripts/crosstool-ng.sh
8+
9+
COPY scripts/rustbuild-setup.sh /scripts/
10+
RUN sh /scripts/rustbuild-setup.sh
11+
USER rustbuild
12+
WORKDIR /tmp
13+
14+
COPY host-x86_64/dist-riscv64-linux/build-toolchains.sh host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config /tmp/
15+
RUN ./build-toolchains.sh
16+
17+
USER root
18+
19+
COPY scripts/sccache.sh /scripts/
20+
RUN sh /scripts/sccache.sh
21+
22+
ENV PATH=$PATH:/x-tools/riscv64-unknown-linux-gnu/bin
23+
24+
ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
25+
AR_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-ar \
26+
CXX_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-g++
27+
28+
ENV HOSTS=riscv64gc-unknown-linux-gnu
29+
30+
ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
31+
ENV SCRIPT python3 ../x.py dist --target $HOSTS --host $HOSTS

‎src/ci/docker/host-x86_64/dist-various-1/build-riscv-toolchain.sh renamed to ‎src/ci/docker/host-x86_64/dist-riscv64-linux/build-toolchains.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ exit 1
1919
set -x
2020
}
2121

22-
mkdir -p /tmp/build-riscv
23-
cp riscv64-unknown-linux-gnu.config /tmp/build-riscv/.config
24-
cd /tmp/build-riscv
22+
mkdir build
23+
cd build
24+
cp ../riscv64-unknown-linux-gnu.config .config
2525
hide_output ct-ng build
2626
cd ..
27-
rm -rf build-riscv
27+
rm -rf build

‎src/ci/docker/host-x86_64/dist-various-1/crosstool-ng.sh renamed to ‎src/ci/docker/host-x86_64/dist-riscv64-linux/crosstool-ng.sh

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/bin/bash
21
set -ex
32

43
# Mirrored from https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-1.24.0.tar.gz

‎src/ci/docker/host-x86_64/dist-various-1/riscv64-unknown-linux-gnu.config renamed to ‎src/ci/docker/host-x86_64/dist-riscv64-linux/riscv64-unknown-linux-gnu.config

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
1717
CT_CONFIGURE_has_python_3_4_or_newer=y
1818
CT_CONFIGURE_has_bison_2_7_or_newer=y
1919
CT_CONFIGURE_has_python=y
20-
CT_CONFIGURE_has_dtc=y
21-
CT_CONFIGURE_has_svn=y
2220
CT_CONFIGURE_has_git=y
2321
CT_CONFIGURE_has_md5sum=y
2422
CT_CONFIGURE_has_sha1sum=y

‎src/ci/docker/host-x86_64/dist-various-1/Dockerfile

-16
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,6 @@ RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa && \
4747
apt-get update && \
4848
apt-get install -y --no-install-recommends gcc-arm-embedded
4949

50-
COPY scripts/rustbuild-setup.sh host-x86_64/dist-various-1/build-riscv-toolchain.sh host-x86_64/dist-various-1/riscv64-unknown-linux-gnu.config host-x86_64/dist-various-1/crosstool-ng.sh /build/
51-
RUN ./crosstool-ng.sh
52-
53-
# Crosstool-ng will refuse to build as root
54-
RUN sh ./rustbuild-setup.sh
55-
USER rustbuild
56-
57-
RUN ./build-riscv-toolchain.sh
58-
59-
USER root
60-
ENV PATH=/x-tools/riscv64-unknown-linux-gnu/bin:$PATH
61-
6250
COPY host-x86_64/dist-various-1/build-rumprun.sh /build
6351
RUN ./build-rumprun.sh
6452

@@ -158,7 +146,6 @@ ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
158146
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
159147
ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf
160148
ENV TARGETS=$TARGETS,riscv64gc-unknown-none-elf
161-
ENV TARGETS=$TARGETS,riscv64gc-unknown-linux-gnu
162149
ENV TARGETS=$TARGETS,armebv7r-none-eabi
163150
ENV TARGETS=$TARGETS,armebv7r-none-eabihf
164151
ENV TARGETS=$TARGETS,armv7r-none-eabi
@@ -186,9 +173,6 @@ ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
186173
CFLAGS_aarch64_unknown_none_softfloat=-mstrict-align -march=armv8-a+nofp+nosimd \
187174
CC_aarch64_unknown_none=aarch64-none-elf-gcc \
188175
CFLAGS_aarch64_unknown_none=-mstrict-align -march=armv8-a+fp+simd \
189-
CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
190-
AR_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-ar \
191-
CXX_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-g++ \
192176
CC_riscv32i_unknown_none_elf=false \
193177
CC_riscv32imc_unknown_none_elf=false \
194178
CC_riscv32imac_unknown_none_elf=false \

‎src/ci/github-actions/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ jobs:
341341
- name: dist-powerpc64le-linux
342342
<<: *job-linux-xl
343343

344+
- name: dist-riscv64-linux
345+
<<: *job-linux-xl
346+
344347
- name: dist-s390x-linux
345348
<<: *job-linux-xl
346349

‎src/librustc_llvm/build.rs

+5
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,11 @@ fn main() {
275275
"stdc++"
276276
};
277277

278+
// RISC-V requires libatomic for sub-word atomic operations
279+
if target.starts_with("riscv") {
280+
println!("cargo:rustc-link-lib=atomic");
281+
}
282+
278283
// C++ runtime library
279284
if !target.contains("msvc") {
280285
if let Some(s) = llvm_static_stdcpp {

0 commit comments

Comments
 (0)