@elizaos/app-core 2.0.0-beta.2 → 2.0.11-beta.5

package/scripts/bun-riscv64/build.sh

@@ -0,0 +1,469 @@
+#!/usr/bin/env bash
+#
+# Bun riscv64-linux-musl cross-build driver.
+#
+# Runs INSIDE the Docker image defined by ./Dockerfile. The host-side
+# wrapper (see README.md → "Building") mounts:
+#   /opt/build.sh           this file
+#   /opt/bun-version.json   the pinned tags + commits
+#   /opt/bun-patches/       patches against oven-sh/bun
+#   /opt/webkit-patches/    patches against oven-sh/WebKit @ WEBKIT_VERSION
+#   /artifact/              host dist/ for the output zip + build log
+#
+# Inputs (env vars, all optional):
+#   BUN_TAG                 override bun.tag from bun-version.json
+#   WEBKIT_COMMIT           override webkit.fork_commit from bun-version.json
+#   BUN_RISCV64_FORCE_CLOOP=0
+#                           opt into the experimental Baseline-JIT path.
+#                           The production artifact defaults to C_LOOP until
+#                           the WebKit recipe chain is checked in as real
+#                           patch files.
+#   JOBS                    parallel build jobs. Defaults to nproc.
+#
+# Output (under /artifact):
+#   bun-linux-riscv64-musl.zip      the artifact
+#   bun-linux-riscv64-musl.zip.sha256
+#   build-log.txt                   transcript + sha256s + qemu smoke runs
+#
+# Failure model: every step is `set -euo pipefail`. The production artifact
+# defaults to ENABLE_C_LOOP=ON. Baseline-JIT attempts require the operator to
+# set BUN_RISCV64_FORCE_CLOOP=0 and must fail while recipe files remain
+# unrealized.
+
+set -euo pipefail
+
+# ENTRYPOINT runs us under `bash -l`, which sources /etc/profile and
+# resets PATH to Debian's default — wiping the Dockerfile's
+# `ENV PATH=/opt/cross/bin:/usr/local/cargo/bin:…`. Re-prepend the
+# toolchain dirs explicitly so rustup/cargo/clang stay reachable.
+export PATH="/opt/cross/bin:/usr/local/cargo/bin:${PATH}"
+export RUSTUP_HOME="${RUSTUP_HOME:-/usr/local/rustup}"
+export CARGO_HOME="/home/builder/.cargo"
+
+log() { printf '[bun-riscv64] %s\n' "$*"; }
+die() { printf '[bun-riscv64][FATAL] %s\n' "$*" >&2; exit 1; }
+
+prepare_ninja_object_dirs() {
+    local ninja_file="$1"
+    local ninja_dir
+    ninja_dir="$(dirname "$ninja_file")"
+    [ -f "$ninja_file" ] || return 0
+    awk '/^build .*\.o: / { for (i = 2; i <= NF; i++) if ($i ~ /\.o$/) print $i }' "$ninja_file" \
+        | while IFS= read -r obj; do
+            [ -n "$obj" ] || continue
+            mkdir -p "$ninja_dir/$(dirname "$obj")"
+        done
+}
+
+# ──────────────────────────────────────────────────────────────────────────
+# Resolve pins from bun-version.json
+# ──────────────────────────────────────────────────────────────────────────
+VERSION_FILE="${VERSION_FILE:-/opt/bun-version.json}"
+[ -r "$VERSION_FILE" ] || die "bun-version.json not mounted at $VERSION_FILE"
+
+# We have bun in the image, so use it as the JSON reader. jq is not
+# installed to keep the image lean.
+bun_jq() {
+    bun -e "const v = JSON.parse(require('fs').readFileSync('${VERSION_FILE}','utf8')); console.log($1);"
+}
+
+# Rust-core port (BUN_RISCV64_RUST_CORE=1, set by run-build.sh --rust-core):
+# build the post-Zig→Rust-rewrite bun from rust_core_port.target_commit + the
+# nightly it pins, instead of the last-Zig tag (bun.tag). The rust-core/ patch
+# series is mounted at /opt/bun-patches by run-build.sh in this mode.
+if [ "${BUN_RISCV64_RUST_CORE:-0}" = "1" ]; then
+    BUN_TAG="${BUN_TAG:-$(bun_jq 'v.rust_core_port.target_commit')}"
+    RUST_NIGHTLY="${RUST_NIGHTLY:-$(bun_jq 'v.rust_core_port.rust_channel')}"
+    # bun@target_commit's deps/webkit.ts pins WEBKIT_VERSION=963f8758…, distinct
+    # from the Zig-era 1.3.14 WebKit — use the version this bun expects.
+    WEBKIT_COMMIT="${WEBKIT_COMMIT:-$(bun_jq 'v.rust_core_port.webkit_commit')}"
+else
+    BUN_TAG="${BUN_TAG:-$(bun_jq 'v.bun.tag')}"
+    RUST_NIGHTLY="${RUST_NIGHTLY:-$(bun_jq 'v.toolchain.rust.channel')}"
+    WEBKIT_COMMIT="${WEBKIT_COMMIT:-$(bun_jq 'v.webkit.fork_commit')}"
+fi
+WEBKIT_FORK="$(bun_jq 'v.webkit.fork')"
+LLVM_VERSION="$(bun_jq 'v.toolchain.llvm.version')"
+ZIG_VERSION="$(bun_jq 'v.toolchain.zig.version')"
+ALPINE_BRANCH="$(bun_jq 'v.toolchain.musl.alpine_branch')"
+
+log "Pins:"
+log "  Bun tag         : $BUN_TAG"
+log "  WebKit fork     : $WEBKIT_FORK"
+log "  WebKit commit   : $WEBKIT_COMMIT"
+log "  Rust nightly    : $RUST_NIGHTLY"
+log "  LLVM            : $LLVM_VERSION"
+log "  Zig             : $ZIG_VERSION"
+log "  Alpine branch   : $ALPINE_BRANCH"
+
+JOBS="${JOBS:-$(nproc)}"
+log "  Build jobs      : $JOBS"
+
+FORCE_CLOOP="${BUN_RISCV64_FORCE_CLOOP:-1}"
+if [ "$FORCE_CLOOP" = "1" ]; then
+    log "  JIT mode        : C_LOOP (BUN_RISCV64_FORCE_CLOOP=1)"
+else
+    log "  JIT mode        : Baseline JIT"
+fi
+
+ARTIFACT_DIR="${ARTIFACT_DIR:-/artifact}"
+mkdir -p "$ARTIFACT_DIR"
+LOG_FILE="$ARTIFACT_DIR/build-log.txt"
+# Tee everything to the build log from here on.
+exec > >(tee -a "$LOG_FILE") 2>&1
+
+log "── stage 0: workspace setup ─────────────────────────────────────────"
+SRC_ROOT="${SRC_ROOT:-/work/src}"
+mkdir -p "$SRC_ROOT"
+cd "$SRC_ROOT"
+
+# Robust git transport for the multi-GB bun + WebKit fetches below: HTTP/1.1
+# (avoids HTTP/2 mid-stream "curl 92 CANCEL" resets) + a large send/recv buffer.
+git config --global http.version HTTP/1.1
+git config --global http.postBuffer 1048576000
+
+# ──────────────────────────────────────────────────────────────────────────
+# Stage 1: clone WebKit fork at the pinned commit and apply riscv64 patches.
+# ──────────────────────────────────────────────────────────────────────────
+log "── stage 1: WebKit checkout + patches ───────────────────────────────"
+
+if [ ! -d "$SRC_ROOT/WebKit" ]; then
+    log "Cloning ${WEBKIT_FORK} @ ${WEBKIT_COMMIT}"
+    # Partial clone — Bun's WebKit fork is several GB of history. We only
+    # need the tree at this one commit. `--filter=blob:none` defers blob
+    # fetches until checkout time; combined with --depth=1 from a named
+    # commit (via `git fetch <sha>`), this stays under ~1.5 GB.
+    git init --initial-branch=main "$SRC_ROOT/WebKit"
+    git -C "$SRC_ROOT/WebKit" remote add origin "https://github.com/${WEBKIT_FORK}.git"
+    # Multi-GB partial clones over HTTP/2 intermittently fail mid-stream with
+    # "curl 92 ... CANCEL" / "early EOF" / "could not fetch ... from promisor
+    # remote". Pin HTTP/1.1, enlarge the buffer, and retry fetch+checkout (the
+    # blob:none checkout lazily pulls blobs, so it can flake independently).
+    git -C "$SRC_ROOT/WebKit" config http.version HTTP/1.1
+    git -C "$SRC_ROOT/WebKit" config http.postBuffer 1048576000
+    for attempt in 1 2 3 4 5; do
+        if git -C "$SRC_ROOT/WebKit" fetch --depth=1 --filter=blob:none origin "${WEBKIT_COMMIT}" \
+           && git -C "$SRC_ROOT/WebKit" checkout "${WEBKIT_COMMIT}"; then
+            break
+        fi
+        [ "$attempt" -eq 5 ] && die "WebKit fetch/checkout failed after 5 attempts (network) @ ${WEBKIT_COMMIT}"
+        log "WebKit fetch attempt ${attempt} failed (network); retrying in $((attempt * 10))s…"
+        sleep $((attempt * 10))
+    done
+fi
+git -C "$SRC_ROOT/WebKit" reset --hard "${WEBKIT_COMMIT}" >/dev/null
+
+if compgen -G "/opt/webkit-patches/*.recipe" >/dev/null && [ "$FORCE_CLOOP" != "1" ]; then
+    # Recipe files are placeholders for cherry-pick chains the operator
+    # has not realized into actual *.patch files yet. Without those, the
+    # Baseline JIT cannot be built (LLInt + Baseline support is the whole
+    # point of webkit-patches/0001 + 0002). Force the operator to either
+    # realize the recipes or switch to C_LOOP fallback explicitly.
+    log "FATAL: webkit-patches/ contains unrealized *.recipe files:"
+    for r in /opt/webkit-patches/*.recipe; do
+        log "  - $r"
+    done
+    log "Baseline JIT bringup requires the cherry-pick chain documented in"
+    log "those recipe files to be realized into *.patch files first. Either:"
+    log "  a) realize the cherry-picks per the recipe instructions, OR"
+    log "  b) re-run with BUN_RISCV64_FORCE_CLOOP=1 to build with C_LOOP."
+    die "unrealized webkit-patches/*.recipe — refusing to build Baseline JIT"
+fi
+
+if compgen -G "/opt/webkit-patches/*.patch" >/dev/null; then
+    log "Applying webkit-patches/*.patch (in lexical order):"
+    cd "$SRC_ROOT/WebKit"
+    git config user.email "bun-riscv64@eliza.local"
+    git config user.name "bun-riscv64 build"
+    for p in $(ls /opt/webkit-patches/*.patch | sort); do
+        # In C_LOOP mode, the 0003-disable-dfg-ftl-on-riscv64 patch is
+        # unnecessary — ENABLE_C_LOOP=ON in CMake forcibly disables every
+        # JIT tier, so the upstream PlatformEnable.h ifdefs never reach
+        # the DFG/FTL paths regardless of what the patch toggles. Skip
+        # it to dodge context-drift conflicts against the upstream
+        # PlatformEnable.h header.
+        case "${p##*/}" in
+            0003-disable-dfg-ftl-on-riscv64.patch)
+                if [ "$FORCE_CLOOP" = "1" ]; then
+                    log "  -> $p (SKIPPED — C_LOOP build does not need DFG/FTL ifdefs)"
+                    continue
+                fi
+                ;;
+        esac
+        log "  -> $p"
+        if git apply --reverse --check "$p" >/dev/null 2>&1; then
+            log "     already applied; skipping"
+            continue
+        fi
+        # 3-way merge is tolerant of context drift; on hard conflict, fail
+        # rather than silently skipping.
+        git apply --3way "$p" || die "WebKit patch failed: $p — see webkit-patches/README.md for rebase guidance"
+    done
+    cd "$SRC_ROOT"
+else
+    log "No webkit-patches/*.patch present; building WebKit @ ${WEBKIT_COMMIT} as-is."
+    log "If Baseline JIT bringup fails, operator must populate webkit-patches/ — see its README.md."
+fi
+
+# ──────────────────────────────────────────────────────────────────────────
+# Stage 2: clone Bun at the pinned tag and apply patches.
+# ──────────────────────────────────────────────────────────────────────────
+log "── stage 2: Bun checkout + patches ──────────────────────────────────"
+
+# BUN_TAG may be a tag (Zig fallback, e.g. bun-v1.3.14) OR a bare commit SHA
+# (Rust-core port, e.g. rust_core_port.target_commit). `git clone --branch`
+# rejects a SHA, so fetch the ref directly — GitHub allows fetch-by-SHA
+# (allowAnySHA1InWant) — mirroring the WebKit checkout above. Works for both.
+if [ ! -d "$SRC_ROOT/bun" ]; then
+    log "Fetching oven-sh/bun @ ${BUN_TAG}"
+    git init -q "$SRC_ROOT/bun"
+    git -C "$SRC_ROOT/bun" remote add origin https://github.com/oven-sh/bun.git
+    git -C "$SRC_ROOT/bun" fetch --depth=1 --recurse-submodules origin "${BUN_TAG}"
+    git -C "$SRC_ROOT/bun" checkout -q FETCH_HEAD
+fi
+git -C "$SRC_ROOT/bun" fetch --depth=1 origin "${BUN_TAG}" >/dev/null 2>&1
+git -C "$SRC_ROOT/bun" reset --hard FETCH_HEAD >/dev/null
+git -C "$SRC_ROOT/bun" submodule update --init --recursive --depth=1
+
+if compgen -G "/opt/bun-patches/*.patch" >/dev/null; then
+    log "Applying bun-patches/*.patch (in lexical order):"
+    cd "$SRC_ROOT/bun"
+    git config user.email "bun-riscv64@eliza.local"
+    git config user.name "bun-riscv64 build"
+    for p in $(ls /opt/bun-patches/*.patch | sort); do
+        log "  -> $p"
+        if git apply --reverse --check "$p" >/dev/null 2>&1; then
+            log "     already applied; skipping"
+            continue
+        fi
+        git apply --3way "$p" || die "Bun patch failed: $p"
+    done
+    cd "$SRC_ROOT"
+else
+    die "No bun-patches/*.patch present — Bun's build system needs riscv64 awareness (Arch type, cpu flags, WebKit pin, etc.). Populate bun-patches/ before running build.sh."
+fi
+
+# ──────────────────────────────────────────────────────────────────────────
+# Stage 3: cargo dependencies and rust target.
+# ──────────────────────────────────────────────────────────────────────────
+log "── stage 3: cargo prefetch ──────────────────────────────────────────"
+cd "$SRC_ROOT/bun"
+rustup target add --toolchain "${RUST_NIGHTLY}" riscv64gc-unknown-linux-musl
+# Pre-fetch cargo deps so a later `cargo build --offline` works even if
+# the registry hiccups mid-build. This is a best-effort optimization only.
+#
+# The Rust-core workspace consumes some vendored C libraries as PATH
+# dependencies (e.g. `vendor/lolhtml/c-api`, declared in src/lolhtml_sys),
+# and `vendor/` is .gitignore'd — those trees are populated by Bun's own
+# build system (scripts/build/deps/*.ts) during stage 5, NOT by the git
+# checkout. So `cargo fetch` cannot resolve the workspace manifest yet and
+# fails with "failed to read vendor/.../Cargo.toml". That is expected: the
+# real cargo build in stage 5 runs after dep population and fetches what it
+# needs. Keep the prefetch non-fatal so it never blocks the build.
+if [ -f Cargo.toml ]; then
+    cargo +"${RUST_NIGHTLY}" fetch --target riscv64gc-unknown-linux-musl \
+        || log "stage 3: cargo prefetch skipped — vendored path deps are populated by build.ts in stage 5; registry deps will fetch then."
+fi
+
+# ──────────────────────────────────────────────────────────────────────────
+# Stage 4: configure + build WebKit for riscv64.
+# ──────────────────────────────────────────────────────────────────────────
+log "── stage 4: WebKit build ────────────────────────────────────────────"
+
+WEBKIT_BUILD_DIR="$SRC_ROOT/WebKit/WebKitBuild/riscv64-Release"
+mkdir -p "$WEBKIT_BUILD_DIR"
+cd "$WEBKIT_BUILD_DIR"
+
+# JIT switches. WebKit's CMake exposes ENABLE_JIT (umbrella, implies
+# LLInt + Baseline tiers), ENABLE_DFG_JIT, ENABLE_FTL_JIT, and
+# ENABLE_C_LOOP. There is no `ENABLE_BASELINE_JIT` option — Baseline is
+# always built when ENABLE_JIT=ON and the target arch has a Baseline
+# backend (riscv64 does, via WebKit bug #239708 r293316).
+#
+# - Default: ENABLE_JIT=ON (LLInt + Baseline), DFG/FTL OFF.
+# - BUN_RISCV64_FORCE_CLOOP=1: ENABLE_C_LOOP=ON, ENABLE_JIT=OFF (mutually
+#   exclusive per WebKit's WEBKIT_OPTION_CONFLICT).
+if [ "$FORCE_CLOOP" = "1" ]; then
+    WK_JIT_FLAGS=(
+        -DENABLE_C_LOOP=ON
+        -DENABLE_JIT=OFF
+        -DENABLE_DFG_JIT=OFF
+        -DENABLE_FTL_JIT=OFF
+        # WebKit enforces ENABLE_WEBASSEMBLY conflicts with ENABLE_C_LOOP, so a
+        # JIT-less build cannot include WebAssembly. This is why wasm is off here.
+        -DENABLE_WEBASSEMBLY=OFF
+        -DENABLE_WEBASSEMBLY_BBQJIT=OFF
+        -DENABLE_WEBASSEMBLY_OMGJIT=OFF
+    )
+else
+    WK_JIT_FLAGS=(
+        -DENABLE_C_LOOP=OFF
+        -DENABLE_JIT=ON
+        -DENABLE_DFG_JIT=OFF
+        -DENABLE_FTL_JIT=OFF
+    )
+fi
+
+# Linker selection: the riscv64-linux-musl-clang wrapper sets --target and
+# --sysroot but does not force a linker. Debian's default linker for
+# clang's driver is `/usr/bin/ld` (GNU binutils, x86_64-only), which
+# rejects the riscv64 `elf64lriscv` emulation and aborts the very first
+# CMake C-compiler probe. Force lld via -fuse-ld=lld on every link line.
+# We do this through CMAKE_*_LINKER_FLAGS (not C/CXX flags) so the flag
+# never reaches a compile-only invocation where clang would warn it is
+# unused.
+WK_LINKER_FLAGS="-fuse-ld=lld"
+
+cmake \
+    -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SYSTEM_NAME=Linux \
+    -DCMAKE_SYSTEM_PROCESSOR=riscv64 \
+    -DCMAKE_SYSROOT=/sysroot \
+    -DCMAKE_FIND_ROOT_PATH=/sysroot \
+    -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \
+    -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+    -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
+    -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \
+    -DCMAKE_C_COMPILER=/opt/cross/bin/riscv64-linux-musl-clang \
+    -DCMAKE_CXX_COMPILER=/opt/cross/bin/riscv64-linux-musl-clang++ \
+    -DCMAKE_AR=/usr/local/bin/llvm-ar \
+    -DCMAKE_RANLIB=/usr/local/bin/llvm-ranlib \
+    -DCMAKE_LINKER=/usr/local/bin/ld.lld \
+    -DCMAKE_C_FLAGS="-march=rv64gc -mabi=lp64d -O3 -I$SRC_ROOT/WebKit/Source/bmalloc/mimalloc/mimalloc/include" \
+    -DCMAKE_CXX_FLAGS="-march=rv64gc -mabi=lp64d -O3 -I$SRC_ROOT/WebKit/Source/bmalloc/mimalloc/mimalloc/include" \
+    -DCMAKE_EXE_LINKER_FLAGS_INIT="${WK_LINKER_FLAGS}" \
+    -DCMAKE_SHARED_LINKER_FLAGS_INIT="${WK_LINKER_FLAGS}" \
+    -DCMAKE_MODULE_LINKER_FLAGS_INIT="${WK_LINKER_FLAGS}" \
+    -DPORT=JSCOnly \
+    -DENABLE_STATIC_JSC=ON \
+    -DUSE_BUN_JSC_ADDITIONS=ON \
+    -DUSE_THIN_ARCHIVES=OFF \
+    -DUSE_SYSTEM_MALLOC=OFF \
+    "${WK_JIT_FLAGS[@]}" \
+    "$SRC_ROOT/WebKit" \
+    || die "WebKit cmake configure failed. If Baseline JIT, retry with BUN_RISCV64_FORCE_CLOOP=1."
+
+ninja -j"$JOBS" jsc \
+    || die "WebKit ninja build failed. See webkit-patches/README.md if the failure is in offlineasm or LLInt."
+prepare_ninja_object_dirs "$WEBKIT_BUILD_DIR/build.ninja"
+
+# ──────────────────────────────────────────────────────────────────────────
+# Stage 5: configure + build Bun.
+# ──────────────────────────────────────────────────────────────────────────
+log "── stage 5: Bun build ───────────────────────────────────────────────"
+
+cd "$SRC_ROOT/bun"
+
+# Bun's build entrypoint is `bun bd` (build driver). Force flags through
+# env so the bun-patches/ series can stay smaller — anything we can pass
+# at invocation time, we do.
+export BUN_WEBKIT_PATH="$SRC_ROOT/WebKit"
+export BUN_RUST_TARGET=riscv64gc-unknown-linux-musl
+export BUN_CC=/opt/cross/bin/riscv64-linux-musl-clang
+export BUN_CXX=/opt/cross/bin/riscv64-linux-musl-clang++
+export BUN_AR=/usr/local/bin/llvm-ar
+export BUN_RANLIB=/usr/local/bin/llvm-ranlib
+export BUN_LD=/usr/local/bin/ld.lld
+export BUN_STRIP=/usr/local/bin/llvm-strip
+export BUN_SYSROOT=/sysroot
+export BUN_DISABLE_TINYCC=1
+
+BUN_BUILD_DIR="$SRC_ROOT/bun/build/release"
+rm -rf "$BUN_BUILD_DIR"
+mkdir -p "$BUN_BUILD_DIR/deps"
+ln -s "$WEBKIT_BUILD_DIR" "$BUN_BUILD_DIR/deps/WebKit"
+
+# Configure Bun without letting its dependency graph reconfigure WebKit. The
+# riscv64 patch series marks WebKit as an external, prebuilt dependency, so the
+# completed C_LOOP build above is consumed from build/release/deps/WebKit.
+bun scripts/build.ts \
+    --configure-only \
+    --profile=release \
+    --arch=riscv64 \
+    --abi=musl \
+    --webkit=local \
+    || die "Bun configure failed. See bun-patches/README.md."
+
+configure_targets="$(ninja -C "$BUN_BUILD_DIR" -t targets all | awk -F: '/^configure-/ && $1 != "configure-WebKit" {print $1}')"
+if [ -n "$configure_targets" ]; then
+    # shellcheck disable=SC2086
+    ninja -C "$BUN_BUILD_DIR" -j"$JOBS" $configure_targets \
+        || die "Bun dependency configure failed."
+fi
+
+prepare_ninja_object_dirs "$BUN_BUILD_DIR/build.ninja"
+find "$BUN_BUILD_DIR/deps" -name build.ninja -print \
+    | while IFS= read -r ninja_file; do
+        prepare_ninja_object_dirs "$ninja_file"
+    done
+
+ninja -C "$BUN_BUILD_DIR" -j"$JOBS" \
+    || die "Bun build failed. See bun-patches/README.md."
+
+# ──────────────────────────────────────────────────────────────────────────
+# Stage 6: package + smoke-test under QEMU.
+# ──────────────────────────────────────────────────────────────────────────
+log "── stage 6: package + smoke test ────────────────────────────────────"
+
+BUN_BIN="$SRC_ROOT/bun/build/release/bun"
+[ -x "$BUN_BIN" ] || die "Built bun not found at $BUN_BIN"
+
+file "$BUN_BIN"
+# musl-static link: should report "statically linked" or "interpreter
+# /lib/ld-musl-riscv64.so.1". We do not enforce one or the other — Bun's
+# upstream zips are dynamically linked against musl on Alpine, so we
+# match that.
+"$BUN_BIN" --help >/dev/null 2>&1 || true  # parse-only sanity (host can't exec it directly)
+
+log "Smoke test: qemu-riscv64-static --version"
+qemu-riscv64-static --version | head -1
+
+log "Smoke test: qemu-riscv64-static bun --version"
+# QEMU needs to find ld-musl-riscv64.so.1; -L /sysroot provides that.
+QEMU_OUT="$(qemu-riscv64-static -L /sysroot "$BUN_BIN" --version 2>&1)" || \
+    die "qemu-riscv64-static bun --version failed: $QEMU_OUT"
+log "  → bun reports: $QEMU_OUT"
+
+log "Smoke test: qemu-riscv64-static bun -e"
+QEMU_EVAL_OUT="$(qemu-riscv64-static -L /sysroot "$BUN_BIN" -e 'console.log("bun-riscv64-eval-ok", process.arch)' 2>&1)" || \
+    die "qemu-riscv64-static bun -e failed: $QEMU_EVAL_OUT"
+case "$QEMU_EVAL_OUT" in
+    *"bun-riscv64-eval-ok riscv64"*) ;;
+    *) die "qemu-riscv64-static bun -e returned unexpected output: $QEMU_EVAL_OUT" ;;
+esac
+log "  → eval reports: $QEMU_EVAL_OUT"
+
+log "Smoke test: qemu-riscv64-static bun <script.js>"
+SMOKE_DIR="$(mktemp -d /tmp/bun-riscv64-smoke.XXXXXX)"
+trap 'rm -rf "$SMOKE_DIR"' EXIT
+SMOKE_JS="$SMOKE_DIR/entrypoint.js"
+printf '%s\n' 'console.log("bun-riscv64-script-ok", process.arch);' > "$SMOKE_JS"
+QEMU_SCRIPT_OUT="$(qemu-riscv64-static -L /sysroot "$BUN_BIN" "$SMOKE_JS" 2>&1)" || \
+    die "qemu-riscv64-static bun script entrypoint failed: $QEMU_SCRIPT_OUT"
+case "$QEMU_SCRIPT_OUT" in
+    *"bun-riscv64-script-ok riscv64"*) ;;
+    *) die "qemu-riscv64-static bun script entrypoint returned unexpected output: $QEMU_SCRIPT_OUT" ;;
+esac
+log "  → script reports: $QEMU_SCRIPT_OUT"
+
+# Layout matches upstream's bun-linux-x64-musl.zip:
+#   bun-linux-riscv64-musl/
+#     bun
+STAGE_DIR="$SRC_ROOT/stage/bun-linux-riscv64-musl"
+mkdir -p "$STAGE_DIR"
+install -m 0755 "$BUN_BIN" "$STAGE_DIR/bun"
+
+ZIP_NAME="bun-linux-riscv64-musl.zip"
+ZIP_PATH="$ARTIFACT_DIR/$ZIP_NAME"
+cd "$SRC_ROOT/stage"
+rm -f "$ZIP_PATH"
+zip -q -r "$ZIP_PATH" "bun-linux-riscv64-musl"
+
+SHA="$(sha256sum "$ZIP_PATH" | awk '{print $1}')"
+echo "$SHA  $ZIP_NAME" > "$ZIP_PATH.sha256"
+
+log "── done ─────────────────────────────────────────────────────────────"
+log "Artifact: $ZIP_PATH"
+log "SHA256  : $SHA"
+log "bun --version: $QEMU_OUT"

package/scripts/bun-riscv64/bun-patches/0001-config-add-riscv64-arch.patch

@@ -0,0 +1,74 @@
+diff --git a/scripts/build/config.ts b/scripts/build/config.ts
+index fd527a2..00fea58 100644
+--- a/scripts/build/config.ts
++++ b/scripts/build/config.ts
+@@ -18,7 +18,7 @@ import { cyan, dim, green } from "./tty.ts";
+ import { ZIG_COMMIT } from "./zig.ts";
+ 
+ export type OS = "linux" | "darwin" | "windows" | "freebsd";
+-export type Arch = "x64" | "aarch64";
++export type Arch = "x64" | "aarch64" | "riscv64";
+ export type Abi = "gnu" | "musl" | "android";
+ export type BuildType = "Debug" | "Release" | "RelWithDebInfo" | "MinSizeRel";
+ export type BuildMode = "full" | "cpp-only" | "zig-only" | "link-only";
+@@ -79,6 +79,8 @@ export interface Config {
+   kqueue: boolean;
+   x64: boolean;
+   arm64: boolean;
++  /** RISC-V 64 (rv64gc/lp64d). Cross-compile only — no host build. */
++  riscv64: boolean;
+ 
+   /**
+    * What's running the build. Differs from os/arch/windows (target) in
+@@ -365,9 +367,13 @@ export function detectHost(): Host {
+       ? "x64"
+       : a === "arm64"
+         ? "aarch64"
+-        : (() => {
+-            throw new BuildError(`Unsupported host architecture: ${a}`, { hint: "Bun builds on x64 or arm64" });
+-          })();
++        : a === "riscv64"
++          ? "riscv64"
++          : (() => {
++              throw new BuildError(`Unsupported host architecture: ${a}`, {
++                hint: "Bun builds on x64, arm64, or riscv64",
++              });
++            })();
+ 
+   return { os, arch, exeSuffix: os === "windows" ? ".exe" : "" };
+ }
+@@ -542,6 +548,7 @@ export function resolveConfig(partial: PartialConfig, toolchain: Toolchain): Con
+   const kqueue = darwin || freebsd;
+   const x64 = arch === "x64";
+   const arm64 = arch === "aarch64";
++  const riscv64 = arch === "riscv64";
+ 
+   // Platform file conventions — MSVC style on Windows, Unix everywhere else.
+   const exeSuffix = windows ? ".exe" : "";
+@@ -619,7 +626,7 @@ export function resolveConfig(partial: PartialConfig, toolchain: Toolchain): Con
+   // TinyCC: off on Windows ARM64 (not supported), Android (no upstream
+   // bionic support; FFI cc() falls back to dlopen-only), and FreeBSD
+   // (oven-sh/tinycc has no FreeBSD target).
+-  const tinycc = partial.tinycc ?? !((windows && arm64) || abi === "android" || freebsd);
++  const tinycc = partial.tinycc ?? !((windows && arm64) || abi === "android" || freebsd || riscv64);
+ 
+   const valgrind = partial.valgrind ?? false;
+   const fuzzilli = partial.fuzzilli ?? false;
+@@ -652,6 +659,9 @@ export function resolveConfig(partial: PartialConfig, toolchain: Toolchain): Con
+ 
+   // ─── Validation ───
+   assert(!baseline || x64, "baseline=true requires arch=x64 (baseline disables AVX which is x64-only)");
++  // riscv64 only supported on linux-musl right now (cross-compile target
++  // for the Android agent; Alpine v3.21 sysroot). Reassess when adding glibc.
++  assert(!riscv64 || (linux && abi === "musl"), "arch=riscv64 currently requires os=linux abi=musl");
+   assert(!valgrind || linux, "valgrind=true requires os=linux");
+   assert(!(asan && valgrind), "Cannot enable both asan and valgrind simultaneously");
+   assert(os !== "linux" || abi !== undefined, "Linux builds require an abi (gnu, musl, or android)");
+@@ -762,6 +772,7 @@ export function resolveConfig(partial: PartialConfig, toolchain: Toolchain): Con
+     kqueue,
+     x64,
+     arm64,
++    riscv64,
+     host,
+     exeSuffix,
+     objSuffix,

package/scripts/bun-riscv64/bun-patches/0002-flags-add-riscv64-march-mabi.patch

@@ -0,0 +1,16 @@
+diff --git a/scripts/build/flags.ts b/scripts/build/flags.ts
+index df55580..b05828d 100644
+--- a/scripts/build/flags.ts
++++ b/scripts/build/flags.ts
+@@ -56,6 +56,11 @@ export const cpuTargetFlags: Flag[] = [
+     when: c => c.windows && c.arm64,
+     desc: "ARM64 Windows: clang-cl prefix required (/clang: passes to clang)",
+   },
++  {
++    flag: ["-march=rv64gc", "-mabi=lp64d"],
++    when: c => c.linux && c.riscv64,
++    desc: "RISC-V 64 Linux: rv64gc (IMAFDC + Zicsr/Zifencei) + lp64d ABI",
++  },
+   {
+     flag: "-march=nehalem",
+     when: c => c.x64 && c.baseline,

package/scripts/bun-riscv64/bun-patches/0003-zig-add-riscv64-target-triple-and-cpu.patch

@@ -0,0 +1,26 @@
+diff --git a/scripts/build/zig.ts b/scripts/build/zig.ts
+index 2e0129e..25bf5a7 100644
+--- a/scripts/build/zig.ts
++++ b/scripts/build/zig.ts
+@@ -89,7 +89,7 @@ export function zigObjectPaths(cfg: Config): string[] {
+  * not `x64`/`arm64`.
+  */
+ export function zigTarget(cfg: Config): string {
+-  const arch = cfg.x64 ? "x86_64" : "aarch64";
++  const arch = cfg.x64 ? "x86_64" : cfg.riscv64 ? "riscv64" : "aarch64";
+   if (cfg.darwin) return `${arch}-macos-none`;
+   if (cfg.windows) return `${arch}-windows-msvc`;
+   if (cfg.freebsd) {
+@@ -196,6 +196,12 @@ export function zigCpu(cfg: Config): string {
+     if (cfg.windows) return "cortex_a76";
+     return "native";
+   }
++  if (cfg.riscv64) {
++    // baseline_rv64 = imafdc (rv64gc). zig's generic_rv64 omits Zalrsc which
++    // musl's atomic_arch.h requires. Native target would let the build host
++    // (x86_64) pick — wrong for cross-compile.
++    return "baseline_rv64";
++  }
+   // x64
+   return cfg.baseline ? "nehalem" : "haswell";
+ }

package/scripts/bun-riscv64/bun-patches/0004-webkit-force-local-mode-on-riscv64.patch

@@ -0,0 +1,33 @@
+diff --git a/scripts/build/config.ts b/scripts/build/config.ts
+index 00fea58..64f50f9 100644
+--- a/scripts/build/config.ts
++++ b/scripts/build/config.ts
+@@ -802,7 +802,11 @@ export function resolveConfig(partial: PartialConfig, toolchain: Toolchain): Con
+     timeTrace: partial.timeTrace ?? false,
+     ci,
+     buildkite,
+-    webkit: partial.webkit ?? "prebuilt",
++    // WebKit mode:
++    //   riscv64: force local (no prebuilt tarball exists for riscv64;
++    //            BUN_WEBKIT_PATH must point at a built WebKitBuild dir).
++    //   else:    prebuilt unless overridden.
++    webkit: partial.webkit ?? (riscv64 ? "local" : "prebuilt"),
+     cwd,
+     buildDir,
+     codegenDir,
+diff --git a/scripts/build/deps/webkit.ts b/scripts/build/deps/webkit.ts
+index c940da8..c5210de 100644
+--- a/scripts/build/deps/webkit.ts
++++ b/scripts/build/deps/webkit.ts
+@@ -70,6 +70,11 @@ function prebuiltSuffix(cfg: Config): string {
+ }
+ 
+ function prebuiltUrl(cfg: Config): string {
++  if (cfg.riscv64) {
++    throw new Error(
++      "deps/webkit: no prebuilt WebKit tarball for riscv64. Use --webkit=local with BUN_WEBKIT_PATH set.",
++    );
++  }
+   const os = cfg.windows ? "windows" : cfg.darwin ? "macos" : cfg.freebsd ? "freebsd" : "linux";
+   const arch = cfg.arm64 ? "arm64" : "amd64";
+   const name = `bun-webkit-${os}-${arch}${prebuiltSuffix(cfg)}`;

package/scripts/bun-riscv64/bun-patches/0005-tinycc-disable-on-riscv64.patch

@@ -0,0 +1,16 @@
+diff --git a/scripts/build/deps/tinycc.ts b/scripts/build/deps/tinycc.ts
+index 499a83b..2b3544f 100644
+--- a/scripts/build/deps/tinycc.ts
++++ b/scripts/build/deps/tinycc.ts
+@@ -31,6 +31,11 @@ export const tinycc: Dependency = {
+   patches: ["patches/tinycc/tcc.h.patch"],
+ 
+   build: cfg => {
++    if (cfg.riscv64) {
++      throw new Error(
++        "deps/tinycc: oven-sh/tinycc has no riscv64 backend. Build with --tinycc=off (default on riscv64).",
++      );
++    }
+     const sources = ["libtcc.c", "tccpp.c", "tccgen.c", "tccdbg.c", "tccelf.c", "tccasm.c", "tccrun.c"];
+     if (cfg.arm64) sources.push("arm64-gen.c", "arm64-link.c", "arm64-asm.c");
+     else sources.push("x86_64-gen.c", "x86_64-link.c", "i386-asm.c");

package/scripts/bun-riscv64/bun-patches/0006-build-add-riscv64-cli-validation.patch

@@ -0,0 +1,15 @@
+diff --git a/scripts/build.ts b/scripts/build.ts
+index f8a3787..98b7ed2 100644
+--- a/scripts/build.ts
++++ b/scripts/build.ts
+@@ -3,6 +3,10 @@
+  *
+  *   bun scripts/build.ts --profile=debug
+  *   bun scripts/build.ts --profile=release
++ *   bun scripts/build.ts --profile=release --arch=riscv64 --abi=musl
++ *     # cross-compile to linux-riscv64-musl. Requires:
++ *     #   - $BUN_WEBKIT_PATH pointing at a built WebKitBuild dir
++ *     #   - cross-clang + riscv64-linux-musl sysroot in PATH
+  *   bun scripts/build.ts --asan=off test foo.test.ts    # override + build + run
+  *   bun scripts/build.ts --target tinycc                # build one dep
+  *   bun scripts/build.ts --configure-only               # emit ninja, don't run