Add x64 MacOS build of OpenOCD and Risc-V toolchain

Author: will-v-pi

.github/workflows/build.yml

@@ -49,8 +49,8 @@ jobs:
             bin/openocd-*-x64-win.zip
             bin/riscv-toolchain-*-x64-win.zip
 
-  build_macos:
-    name: Build MacOS
+  build_macos_arm64:
+    name: Build MacOS Arm64
     # runs-on: [self-hosted, macOS]
     runs-on: 'macos-latest'
 
@@ -75,7 +75,7 @@ jobs:
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: tools-mac
+          name: tools-mac-arm64
           path: |
             bin/picotool-*-mac.zip
             bin/pico-sdk-tools-*-mac.zip
@@ -90,6 +90,37 @@ jobs:
             bin/pico-sdk-tools-*-mac.zip
             bin/openocd-*-mac.zip
             bin/riscv-toolchain-*.zip
+  
+  build_macos_x64:
+    name: Build MacOS x64
+    runs-on: 'macos-13'
+    env:
+      # Universal picotool is built on arm64
+      SKIP_PICOTOOL: 1
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Homebrew
+        if: runner.environment == 'github-hosted'
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+      - name: Build
+        run: ./build_macos.sh
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: tools-mac-x64
+          path: |
+            bin/openocd-*-mac.zip
+            bin/riscv-toolchain-*.zip
+      - name: Add Release Asset
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            bin/openocd-*-mac.zip
+            bin/riscv-toolchain-*.zip
 
   build_linux:
     name: Build Linux

build_macos.sh

@@ -5,10 +5,13 @@ set -euo pipefail
 # Defaults
 SKIP_RISCV=${SKIP_RISCV-0}
 SKIP_OPENOCD=${SKIP_OPENOCD-0}
+SKIP_PICOTOOL=${SKIP_PICOTOOL-0}
 
 # Install prerequisites
 arch -x86_64 /usr/local/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
-arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+if [[ $(uname -m) == 'arm64' ]]; then
+    arch -arm64 /opt/homebrew/bin/brew install jq libtool libusb automake hidapi jimtcl --quiet
+fi
 # RISC-V prerequisites
 echo "Listing local"
 ls /usr/local/bin
@@ -17,7 +20,9 @@ rm /usr/local/bin/idle3* || true
 rm /usr/local/bin/pip* || true
 rm /usr/local/bin/py* || true
 arch -x86_64 /usr/local/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
-arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
+if [[ $(uname -m) == 'arm64' ]]; then
+    arch -arm64 /opt/homebrew/bin/brew install python3 gawk gnu-sed make gmp mpfr libmpc isl zlib expat texinfo flock libslirp --quiet
+fi
 
 repos=$(cat config/repositories.json | jq -c '.repositories.[]')
 export version=$(cat ./version.txt)
@@ -51,83 +56,89 @@ done < <(echo "$repos")
 
 
 cd $builddir
-if [[ "$SKIP_OPENOCD" != 1 ]] && [[ $(uname -m) == 'arm64' ]]; then
+if [[ "$SKIP_OPENOCD" != 1 ]]; then
     if ! ../packages/macos/openocd/build-openocd.sh; then
         echo "::error title=openocd-fail-macos::OpenOCD Build Failed on macOS"
         SKIP_OPENOCD=1
     fi
+    echo "OpenOCD Build Complete"
 fi
 if [[ "$SKIP_RISCV" != 1 ]]; then
     # Takes ages to build
     ../packages/macos/riscv/build-riscv-gcc.sh
+    echo "RISC-V Build Complete"
+fi
+if [[ "$SKIP_PICOTOOL" != 1 ]]; then
+    arch -x86_64 ../packages/macos/picotool/build-picotool.sh
+    if [[ $(uname -m) == 'arm64' ]]; then
+        arch -arm64 ../packages/macos/picotool/build-picotool.sh
+    fi
+    echo "Picotool Build Complete"
+
+    ../packages/macos/make-universal.sh "pico-sdk-tools" "pioasm" "pioasm"
+    echo "Pioasm Universal Merge Complete"
+    ../packages/macos/make-universal.sh "picotool-install" "picotool" "picotool"
+    echo "Picotool Universal Merge Complete"
 fi
-arch -x86_64 ../packages/macos/picotool/build-picotool.sh
-arch -arm64 ../packages/macos/picotool/build-picotool.sh
-../packages/macos/picotool/merge-picotool.sh
 cd ..
 
 topd=$PWD
-if [ ${version:0:1} -ge 2 ]; then
-    # Package pico-sdk-tools separately as well
 
-    filename="pico-sdk-tools-${version}-${suffix}.zip"
+if [[ "$SKIP_PICOTOOL" != 1 ]]; then
+    echo "Packaging picotool"
+    if [ ${version:0:1} -ge 2 ]; then
+        # Package pico-sdk-tools separately as well
 
-    echo "Saving pico-sdk-tools package to $filename"
-    pushd "$builddir/pico-sdk-tools/"
-    tar -a -cf "$topd/bin/$filename" * .keep
-    popd
-fi
+        filename="pico-sdk-tools-${version}-${suffix}.zip"
 
-# Package picotool separately as well
-version=$("./$builddir/picotool-install/picotool/picotool" version -s)
-echo "Picotool version $version"
+        echo "Saving pico-sdk-tools package to $filename"
+        pushd "$builddir/pico-sdk-tools/"
+        tar -a -cf "$topd/bin/$filename" * .keep
+        popd
+    fi
 
-filename="picotool-${version}-${suffix}.zip"
+    # Package picotool separately as well
+    version=$("./$builddir/picotool-install/picotool/picotool" version -s)
+    echo "Picotool version $version"
 
-echo "Saving picotool package to $filename"
-pushd "$builddir/picotool-install/"
-tar -a -cf "$topd/bin/$filename" * .keep
-popd
+    filename="picotool-${version}-${suffix}.zip"
 
-if [[ "$SKIP_OPENOCD" != 1 ]] && [[ $(uname -m) == 'arm64' ]]; then
+    echo "Saving picotool package to $filename"
+    pushd "$builddir/picotool-install/"
+    tar -a -cf "$topd/bin/$filename" * .keep
+    popd
+fi
+
+if [[ "$SKIP_OPENOCD" != 1 ]]; then
+    echo "Packaging OpenOCD"
     # Package OpenOCD separately as well
 
-    version=($("./$builddir/openocd-install/usr/local/bin/openocd" --version 2>&1))
+    version=($("./$builddir/openocd-install-$(uname -m)/usr/local/bin/openocd" --version 2>&1))
     version=${version[0]}
     version=${version[3]}
     version=$(echo $version | cut -d "-" -f 1)
 
     echo "OpenOCD version $version"
 
-    filename="openocd-${version}-arm64-${suffix}.zip"
+    filename="openocd-${version}-$(uname -m)-${suffix}.zip"
 
     echo "Saving OpenOCD package to $filename"
-    pushd "$builddir/openocd-install/usr/local/bin"
+    pushd "$builddir/openocd-install-$(uname -m)/usr/local/bin"
     tar -a -cf "$topd/bin/$filename" * -C "../share/openocd" "scripts"
     popd
 fi
 
 if [[ "$SKIP_RISCV" != 1 ]]; then
+    echo "Packaging RISC-V Toolchain"
     # Package riscv toolchain separately as well
-    version=$("./$builddir/riscv-install/bin/riscv32-unknown-elf-gcc" -dumpversion)
+    version=$("./$builddir/riscv-install-$(uname -m)/bin/riscv32-unknown-elf-gcc" -dumpversion)
     version=$(echo $version | cut -d "." -f 1)
     echo "Risc-V Toolchain version $version"
 
-    filename="riscv-toolchain-${version}-arm64-${suffix}.zip"
-
-    echo "Saving RISC-V Toolchain package to $filename"
-    pushd "$builddir/riscv-install/"
-    tar -a -cf "$topd/bin/$filename" *
-    popd
-
-    # Package x64-mac riscv toolchain separately as well
-    version="14"
-    echo "RISC-V Toolchain version $version"
-
-    filename="riscv-toolchain-${version}-x64-mac.zip"
+    filename="riscv-toolchain-${version}-$(uname -m)-${suffix}.zip"
 
     echo "Saving RISC-V Toolchain package to $filename"
-    pushd "$builddir/riscv-install-x64-mac/"
+    pushd "$builddir/riscv-install-$(uname -m)/"
     tar -a -cf "$topd/bin/$filename" *
     popd
 fi

packages/macos/make-universal.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -euo pipefail
+
+INSTALLDIR=$1
+BINDIR=$2
+BINNAME=$3
+
+rm -rf $INSTALLDIR
+mkdir -p $INSTALLDIR
+
+cp -r $INSTALLDIR-arm64/* $INSTALLDIR
+touch $INSTALLDIR/.keep
+
+lipo -create -output $INSTALLDIR/$BINDIR/$BINNAME $INSTALLDIR-x86_64/$BINDIR/$BINNAME $INSTALLDIR-arm64/$BINDIR/$BINNAME
+
+for f in $INSTALLDIR-arm64/$BINDIR/*.dylib; do
+    if [ -f $INSTALLDIR-arm64/$BINDIR/$(basename $f) ]; then
+        lipo -create -output $INSTALLDIR/$BINDIR/$(basename $f) $INSTALLDIR-x86_64/$BINDIR/$(basename $f) $INSTALLDIR-arm64/$BINDIR/$(basename $f)
+    fi
+done

packages/macos/openocd/build-openocd.sh

@@ -10,9 +10,9 @@ cd openocd
 ./configure --disable-werror
 make clean
 make
-INSTALLDIR="$PWD/../openocd-install/usr/local/bin"
-rm -rf "$PWD/../openocd-install"
-DESTDIR="$PWD/../openocd-install" make install
+INSTALLDIR="$PWD/../openocd-install-$(uname -m)/usr/local/bin"
+rm -rf "$PWD/../openocd-install-$(uname -m)"
+DESTDIR="$PWD/../openocd-install-$(uname -m)" make install
 
 libusbpath=($(otool -L $INSTALLDIR/openocd | grep libusb))
 echo ${libusbpath[0]}

packages/macos/picotool/merge-picotool.sh

@@ -2,8 +2,7 @@
 
 set -euo pipefail
 
-# INSTALLDIR="riscv-install-$(uname -m)"
-INSTALLDIR="riscv-install"
+INSTALLDIR="riscv-install-$(uname -m)"
 rm -rf $INSTALLDIR
 mkdir -p $INSTALLDIR
 
@@ -16,9 +15,3 @@ cd riscv-gnu-toolchain
 ./configure --prefix=$BUILDDIR/$INSTALLDIR --with-arch=rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb --with-abi=ilp32 --with-multilib-generator="rv32ima_zicsr_zifencei_zba_zbb_zbs_zbkb_zca_zcb-ilp32--;rv32imac_zicsr_zifencei_zba_zbb_zbs_zbkb-ilp32--"
 # 4 threads, as 8 threads runs out of memory
 gmake -j4
-
-# Make x64 and Windows toolchains, by copying multilib into existing toolchains
-cd ..
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-$SCRIPT_DIR/build-riscv-gcc-other.sh "https://buildbot.embecosm.com/job/riscv32-gcc-macos-release/21/artifact/riscv32-embecosm-macos-gcc13.3.0.zip" "x64-mac"