[nuttx] branch master updated: cibuild.sh: Using GCC from xPack for riscv

[pk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d3f11af1f cibuild.sh: Using GCC from xPack for riscv
7d3f11af1f is described below

commit 7d3f11af1f3f900d33d1a16302e715c014b7021f
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Tue Sep 19 14:13:42 2023 +0800

    cibuild.sh: Using GCC from xPack for riscv
    
    Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
 tools/ci/cibuild.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index b4ae9c55d5..a53b45cafa 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -324,26 +324,26 @@ function python-tools {
 }
 
 function riscv-gcc-toolchain {
-  add_path "${tools}"/riscv64-unknown-elf-gcc/bin
+  add_path "${tools}"/riscv-none-elf-gcc/bin
 
-  if [ ! -f "${tools}/riscv64-unknown-elf-gcc/bin/riscv64-unknown-elf-gcc" ]; then
+  if [ ! -f "${tools}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
     local flavor
     case ${os} in
       Darwin)
-        flavor=x86_64-apple-darwin
+        flavor=darwin-x64
         ;;
       Linux)
-        flavor=x86_64-linux-ubuntu14
+        flavor=linux-x64
         ;;
     esac
     cd "${tools}"
-    wget --quiet https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.12/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-${flavor}.tar.gz
-    tar zxf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-${flavor}.tar.gz
-    mv riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-${flavor} riscv64-unknown-elf-gcc
-    rm riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-${flavor}.tar.gz
+    wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v12.3.0-1/xpack-riscv-none-elf-gcc-12.3.0-1-${flavor}.tar.gz
+    tar zxf xpack-riscv-none-elf-gcc-12.3.0-1-${flavor}.tar.gz
+    mv xpack-riscv-none-elf-gcc-12.3.0-1 riscv-none-elf-gcc
+    rm xpack-riscv-none-elf-gcc-12.3.0-1-${flavor}.tar.gz
   fi
 
-  command riscv64-unknown-elf-gcc --version
+  command riscv-none-elf-gcc --version
 }
 
 function rust {