Fix issues with CI RISC-V build

Author: dgarske

.github/workflows/test-build-riscv.yml

@@ -80,26 +80,30 @@ jobs:
       - name: Update repository
         run: sudo apt-get update -o Acquire::Retries=3
 
-      - name: Download and install RISC-V toolchains
+      # ============================================================
+      # Prebuilt RISC-V toolchains from riscv-collab
+      # https://github.com/riscv-collab/riscv-gnu-toolchain/releases
+      # Extracts to: riscv/bin/riscv{32,64}-unknown-elf-*
+      # ============================================================
+      - name: Download and install RISC-V toolchain (riscv32)
         if: ${{ inputs.arch == 'riscv' }}
         run: |
-          # Download SiFive prebuilt toolchain with newlib
-          wget -q 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
-          tar xzf riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14.tar.gz
-          echo "$GITHUB_WORKSPACE/riscv64-unknown-elf-toolchain-10.2.0-2020.12.8-x86_64-linux-ubuntu14/bin" >> $GITHUB_PATH
-
-          # Download latest prebuilt RISC-V toolchains
-          #wget -q https://github.com/RISCV-Tools/riscv-gnu-toolchain/releases/latest/download/riscv32-elf-ubuntu-24.04-gcc.tar.xz
-          #tar -xf riscv32-elf-ubuntu-24.04-gcc.tar.xz
-          #echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
+          wget -q https://github.com/riscv-collab/riscv-gnu-toolchain/releases/latest/download/riscv32-elf-ubuntu-24.04-gcc.tar.xz
+          tar -xf riscv32-elf-ubuntu-24.04-gcc.tar.xz
+          echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
+          $GITHUB_WORKSPACE/riscv/bin/riscv32-unknown-elf-gcc --version
 
-      - name: Download and install RISC-V toolchains
+      - name: Download and install RISC-V toolchain (riscv64)
         if: ${{ inputs.arch == 'riscv64' }}
         run: |
-          wget -q https://github.com/RISCV-Tools/riscv-gnu-toolchain/releases/latest/download/riscv64-elf-ubuntu-24.04-gcc.tar.xz
+          wget -q https://github.com/riscv-collab/riscv-gnu-toolchain/releases/latest/download/riscv64-elf-ubuntu-24.04-gcc.tar.xz
           tar -xf riscv64-elf-ubuntu-24.04-gcc.tar.xz
           echo "$GITHUB_WORKSPACE/riscv/bin" >> $GITHUB_PATH
+          $GITHUB_WORKSPACE/riscv/bin/riscv64-unknown-elf-gcc --version
 
+      # ============================================================
+      # Build wolfboot
+      # ============================================================
       - name: make clean
         run: |
           make distclean
@@ -115,10 +119,9 @@ jobs:
       - name: Build wolfboot (riscv32)
         if: ${{ inputs.arch == 'riscv' }}
         run: |
-          # using riscv64 for now since riscv32-unknown-elf- is missing "zicsr" extension
-          make CROSS_COMPILE=riscv64-unknown-elf- FREEDOM_E_SDK=$GITHUB_WORKSPACE/freedom-e-sdk ${{inputs.make-args}}
+          make CROSS_COMPILE=riscv32-unknown-elf- FREEDOM_E_SDK=$GITHUB_WORKSPACE/freedom-e-sdk ${{inputs.make-args}}
 
-      - name: Build wolfboot (riscv64))
+      - name: Build wolfboot (riscv64)
         if: ${{ inputs.arch == 'riscv64' }}
         run: |
           make CROSS_COMPILE=riscv64-unknown-elf- ${{inputs.make-args}}

arch.mk

@@ -564,8 +564,10 @@ endif
 ifeq ($(ARCH),RISCV)
   CROSS_COMPILE?=riscv32-unknown-elf-
   # GCC 12+ requires explicit zicsr/zifencei extensions
-  RISCV32_ZICSR := $(shell echo "" | $(CC) -march=rv32imac_zicsr -x c -c - -o /dev/null 2>/dev/null && echo _zicsr)
-  RISCV32_ZIFENCEI := $(shell echo "" | $(CC) -march=rv32imac_zifencei -x c -c - -o /dev/null 2>/dev/null && echo _zifencei)
+  # Note: use $(CROSS_COMPILE)gcc directly because CC is not yet defined
+  # at this point in the Makefile (it's set later in the USE_GCC block).
+  RISCV32_ZICSR := $(shell echo "" | $(CROSS_COMPILE)gcc -march=rv32imac_zicsr -x c -c - -o /dev/null 2>/dev/null && echo _zicsr)
+  RISCV32_ZIFENCEI := $(shell echo "" | $(CROSS_COMPILE)gcc -march=rv32imac_zifencei -x c -c - -o /dev/null 2>/dev/null && echo _zifencei)
   ARCH_FLAGS=-march=rv32imac$(RISCV32_ZICSR)$(RISCV32_ZIFENCEI) -mabi=ilp32 -mcmodel=medany
   CFLAGS+=-fno-builtin-printf -DUSE_M_TIME -g -nostartfiles -DARCH_RISCV
   CFLAGS+=$(ARCH_FLAGS)
@@ -610,8 +612,10 @@ ifeq ($(ARCH),RISCV64)
 
   # GCC 12+ / binutils 2.38+ split CSR and fence.i instructions into
   # separate extensions (zicsr, zifencei). Detect and add if supported.
-  RISCV64_ZICSR := $(shell echo "" | $(CC) -march=rv64imac_zicsr -x c -c - -o /dev/null 2>/dev/null && echo _zicsr)
-  RISCV64_ZIFENCEI := $(shell echo "" | $(CC) -march=rv64imac_zifencei -x c -c - -o /dev/null 2>/dev/null && echo _zifencei)
+  # Note: use $(CROSS_COMPILE)gcc directly because CC is not yet defined
+  # at this point in the Makefile (it's set later in the USE_GCC block).
+  RISCV64_ZICSR := $(shell echo "" | $(CROSS_COMPILE)gcc -march=rv64imac_zicsr -x c -c - -o /dev/null 2>/dev/null && echo _zicsr)
+  RISCV64_ZIFENCEI := $(shell echo "" | $(CROSS_COMPILE)gcc -march=rv64imac_zifencei -x c -c - -o /dev/null 2>/dev/null && echo _zifencei)
 
   ifeq ($(RISCV_MMODE),1)
     # E51 core: rv64imac (no FPU, no crypto extensions)