Merge pull request #568 from ChinYikMing/macOS-xPack-toolchain

Enable installing xPack toolchain on macOS/arm64

Author: jserv

.ci/common.sh

@@ -1,20 +1,22 @@
-# Expect host is Linux/x86_64
+# Expect host is Linux/x86_64, Linux/aarch64, macOS/arm64
+
+MACHINE_TYPE=$(uname -m)
+OS_TYPE=$(uname -s)
+
 check_platform()
 {
-    MACHINE_TYPE=`uname -m`
-    OS_TYPE=`uname -s`
-
     case "${MACHINE_TYPE}/${OS_TYPE}" in
-        x86_64/Linux | aarch64/Linux)
-            ;;
-        Arm64/Darwin)
-            echo "Apple Silicon is not supported yet"
-            exit 1
+        x86_64/Linux | aarch64/Linux | arm64/Darwin)
             ;;
         *)
             echo "Unsupported platform: ${MACHINE_TYPE}/${OS_TYPE}"
             exit 1
             ;;
     esac
-
 }
+
+if [[ "${OS_TYPE}" == "Linux" ]]; then
+  PARALLEL=-j$(nproc)
+else
+  PARALLEL=-j$(sysctl -n hw.logicalcpu)
+fi

.ci/riscv-tests.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
+. .ci/common.sh
+
 set -e -u -o pipefail
 
 # Install RISCOF
 pip3 install -r requirements.txt
 
 set -x
 
-export PATH=`pwd`/toolchain/bin:$PATH
-
-PARALLEL=-j$(nproc)
+export PATH=$(pwd)/toolchain/bin:$PATH
 
 make distclean
 # Rebuild with all RISC-V extensions

.ci/riscv-toolchain-install.sh

@@ -5,20 +5,26 @@ set -e -u -o pipefail
 . .ci/common.sh
 
 check_platform
-
 mkdir -p toolchain
 
 if [[ "$#" == "0" ]] || [[ "$1" != "riscv-collab" ]]; then
     GCC_VER=14.2.0-3
     TOOLCHAIN_REPO=https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack
 
-    if [[ ${MACHINE_TYPE} == "x86_64" ]]; then
-        TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-x64.tar.gz
-    elif [[ ${MACHINE_TYPE} == "aarch64" ]]; then
-        TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-arm64.tar.gz
+    if [[ "${OS_TYPE}" == "Linux" ]]; then
+        case "${MACHINE_TYPE}" in
+            "x86_64")
+                TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-x64.tar.gz
+                ;;
+            "aarch64")
+                TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-linux-arm64.tar.gz
+                ;;
+        esac
+    else # Darwin
+        TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/v${GCC_VER}/xpack-riscv-none-elf-gcc-${GCC_VER}-darwin-arm64.tar.gz
     fi
 else
-    UBUNTU_VER=`lsb_release -r | cut -f2`
+    UBUNTU_VER=$(lsb_release -r | cut -f2)
     GCC_VER=2025.01.20
     TOOLCHAIN_REPO=https://github.com/riscv-collab/riscv-gnu-toolchain
     TOOLCHAIN_URL=${TOOLCHAIN_REPO}/releases/download/${GCC_VER}/riscv32-elf-ubuntu-${UBUNTU_VER}-gcc-nightly-${GCC_VER}-nightly.tar.xz