OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tools: Use GCC 13.2 from xPack for risc-v

This commit is contained in:
Huang Qi 2023-09-18 18:20:53 +08:00 committed by Xiang Xiao
parent 9334ae47c7
commit 43610f75f1
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/risc-v/src/common/Toolchain.defs
View File

@ -133,12 +133,17 @@ endif
ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG) ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
# Generic GNU RVG toolchain # Generic GNU RVG toolchain, prefer to use riscv-none-elf-gcc from xPack
# if CROSSDEV is not defined.
ifeq ($(CONFIG_RISCV_TOOLCHAIN_GNU_RV32),y) ifeq ($(shell riscv-none-elf-gcc --version > /dev/null 2>&1; echo $$?), 0)
CROSSDEV ?= riscv32-unknown-elf- CROSSDEV ?= riscv-none-elf-
else else
CROSSDEV ?= riscv64-unknown-elf- ifeq ($(CONFIG_RISCV_TOOLCHAIN_GNU_RV32),y)
CROSSDEV ?= riscv32-unknown-elf-
else
CROSSDEV ?= riscv64-unknown-elf-
endif
endif endif
# Detect cpu ISA support flags # Detect cpu ISA support flags

16
tools/ci/docker/linux/Dockerfile
View File

@ -168,10 +168,10 @@ RUN cd /tools/renesas-tools/build/gcc && \
# Build image for tool required by RISCV builds # Build image for tool required by RISCV builds
############################################################################### ###############################################################################
FROM nuttx-toolchain-base AS nuttx-toolchain-riscv FROM nuttx-toolchain-base AS nuttx-toolchain-riscv
# Download the latest RISCV GCC toolchain prebuilt by SiFive # Download the latest RISCV GCC toolchain prebuilt by xPack
RUN mkdir riscv64-unknown-elf-gcc && \ RUN mkdir riscv-none-elf-gcc && \
curl -s -L "https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz" \ curl -s -L "https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v13.2.0-1/xpack-riscv-none-elf-gcc-13.2.0-1-linux-x64.tar.gz" \
| tar -C riscv64-unknown-elf-gcc --strip-components 1 -xz | tar -C riscv-none-elf-gcc --strip-components 1 -xz
############################################################################### ###############################################################################
# Build image for tool required by SPARC builds # Build image for tool required by SPARC builds
@ -350,8 +350,8 @@ COPY --from=nuttx-toolchain-renesas /tools/renesas-toolchain/rx-elf-gcc/ renesas
ENV PATH="/tools/renesas-toolchain/rx-elf-gcc/bin:$PATH" ENV PATH="/tools/renesas-toolchain/rx-elf-gcc/bin:$PATH"
# RISCV toolchain # RISCV toolchain
COPY --from=nuttx-toolchain-riscv /tools/riscv64-unknown-elf-gcc/ riscv64-unknown-elf-gcc/ COPY --from=nuttx-toolchain-riscv /tools/riscv-none-elf-gcc/ riscv-none-elf-gcc/
ENV PATH="/tools/riscv64-unknown-elf-gcc/bin:$PATH" ENV PATH="/tools/riscv-none-elf-gcc/bin:$PATH"
# SPARC toolchain # SPARC toolchain
COPY --from=nuttx-toolchain-sparc /tools/sparc-gaisler-elf-gcc/ sparc-gaisler-elf-gcc/ COPY --from=nuttx-toolchain-sparc /tools/sparc-gaisler-elf-gcc/ sparc-gaisler-elf-gcc/
@ -393,8 +393,8 @@ RUN mkdir -p /tools/ccache/bin && \
ln -sf `which ccache` /tools/ccache/bin/g++ && \ ln -sf `which ccache` /tools/ccache/bin/g++ && \
ln -sf `which ccache` /tools/ccache/bin/p32-gcc && \ ln -sf `which ccache` /tools/ccache/bin/p32-gcc && \
ln -sf `which ccache` /tools/ccache/bin/rx-elf-gcc && \ ln -sf `which ccache` /tools/ccache/bin/rx-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/riscv64-unknown-elf-gcc && \ ln -sf `which ccache` /tools/ccache/bin/riscv-none-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/riscv64-unknown-elf-g++ && \ ln -sf `which ccache` /tools/ccache/bin/riscv-none-elf-g++ && \
ln -sf `which ccache` /tools/ccache/bin/sparc-gaisler-elf-gcc && \ ln -sf `which ccache` /tools/ccache/bin/sparc-gaisler-elf-gcc && \
ln -sf `which ccache` /tools/ccache/bin/sparc-gaisler-elf-g++ && \ ln -sf `which ccache` /tools/ccache/bin/sparc-gaisler-elf-g++ && \
ln -sf `which ccache` /tools/ccache/bin/xtensa-esp32-elf-gcc && \ ln -sf `which ccache` /tools/ccache/bin/xtensa-esp32-elf-gcc && \