mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Add a riscv64 cross build, generalizing the loongarch64 one
The pieces were nearly all in place already - CMakeLists has detected riscv64 and set RISCV64 since the backend landed - so this is mostly a matter of not hardcoding loongarch64 in the cross-build plumbing: - setup-loongarch64-cross.sh becomes setup-cross.sh <target>, taking the triple and dynamic linker name from the argument. - b.sh gains --riscv64, and the GL stub block is keyed off a compiler variable rather than a loongarch64-only flag. - New cmake/Toolchains/riscv64-linux-gnu.cmake, mirroring the existing one. The SDL carve-out moves from LOONGARCH64_DEVICE to a new HEADLESS_CROSS option set by b.sh. That flag was keyed off the target architecture, which is also true when building natively on such a machine - harmless so far, but riscv64 hardware that people actually build PPSSPP on exists, and it should still get the normal SDL frontend. Both toolchain files now find qemu rather than assuming the static build: Debian ships the static binaries in qemu-user-static and the dynamic ones in qemu-user, and only the latter is available on some releases. Neither being present is fine too - it just means no compile-check programs run. Verified by a clean loongarch64 build; riscv64 is untested so far, the toolchain isn't installed here yet. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
This commit is contained in:
Henrik RydgårdandClaude Opus 5 committed
1 parent
ba06b454f3
commit
9a29bf84d8
6 files changed
+129
-46
No files matched your search
@@ -17,8 +17,8 @@ set(USING_X11_VULKAN OFF CACHE BOOL "" FORCE)
|
||||
# Use legacy GL preference so find_package(OpenGL) looks for a single libGL.so
|
||||
# rather than the GLVND split (libOpenGL.so + libGLX.so), which we don't have.
|
||||
# A stub libGL.so + GL headers must be present in the sysroot; they are placed
|
||||
# there by cmake/scripts/setup-loongarch64-cross.sh (run once with sudo, or
|
||||
# automatically by the CI install step).
|
||||
# there by cmake/scripts/setup-cross.sh (run once with sudo, or automatically
|
||||
# by the CI install step).
|
||||
set(OpenGL_GL_PREFERENCE LEGACY CACHE STRING "" FORCE)
|
||||
|
||||
# b.sh also creates a stub in <build-dir>/stublibs/ as a local fallback so the
|
||||
@@ -27,14 +27,18 @@ set(CMAKE_EXE_LINKER_FLAGS
|
||||
"${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_BINARY_DIR}/stublibs"
|
||||
CACHE STRING "" FORCE)
|
||||
|
||||
# Allow CMake's compile-check programs to run via QEMU.
|
||||
# The /lib64 symlink is created by the setup script; without it, pass -L
|
||||
# explicitly so QEMU can find the loongarch64 dynamic linker.
|
||||
if(EXISTS "/lib64/ld-linux-loongarch-lp64d.so.1")
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR "qemu-loongarch64-static"
|
||||
CACHE STRING "" FORCE)
|
||||
else()
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR
|
||||
"qemu-loongarch64-static;-L;/usr/loongarch64-linux-gnu"
|
||||
CACHE STRING "" FORCE)
|
||||
# Allow CMake's compile-check programs to run via QEMU, if it's installed.
|
||||
# Debian/Ubuntu ship the static binaries in qemu-user-static and the dynamic
|
||||
# ones in qemu-user; either will do, so take whichever is present.
|
||||
find_program(QEMU_LOONGARCH64 NAMES qemu-loongarch64-static qemu-loongarch64)
|
||||
if(QEMU_LOONGARCH64)
|
||||
# The /lib64 symlink is created by the setup script; without it, pass -L
|
||||
# explicitly so QEMU can find the loongarch64 dynamic linker.
|
||||
if(EXISTS "/lib64/ld-linux-loongarch-lp64d.so.1")
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR "${QEMU_LOONGARCH64}" CACHE STRING "" FORCE)
|
||||
else()
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR
|
||||
"${QEMU_LOONGARCH64};-L;/usr/loongarch64-linux-gnu"
|
||||
CACHE STRING "" FORCE)
|
||||
endif()
|
||||
endif()
|
||||
@@ -0,0 +1,44 @@
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_PROCESSOR riscv64)
|
||||
|
||||
set(CMAKE_C_COMPILER riscv64-linux-gnu-gcc-14)
|
||||
set(CMAKE_CXX_COMPILER riscv64-linux-gnu-g++-14)
|
||||
set(CMAKE_ASM_COMPILER riscv64-linux-gnu-gcc-14)
|
||||
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/riscv64-linux-gnu)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
|
||||
# No X11 in the sysroot; disable the X11 Vulkan path to avoid include-dir errors.
|
||||
set(USING_X11_VULKAN OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# Use legacy GL preference so find_package(OpenGL) looks for a single libGL.so
|
||||
# rather than the GLVND split (libOpenGL.so + libGLX.so), which we don't have.
|
||||
# A stub libGL.so + GL headers must be present in the sysroot; they are placed
|
||||
# there by cmake/scripts/setup-cross.sh (run once with sudo, or automatically
|
||||
# by the CI install step).
|
||||
set(OpenGL_GL_PREFERENCE LEGACY CACHE STRING "" FORCE)
|
||||
|
||||
# b.sh also creates a stub in <build-dir>/stublibs/ as a local fallback so the
|
||||
# linker can resolve GL/GLX calls from GLEW's static archive via PLT entries.
|
||||
set(CMAKE_EXE_LINKER_FLAGS
|
||||
"${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_BINARY_DIR}/stublibs"
|
||||
CACHE STRING "" FORCE)
|
||||
|
||||
# Allow CMake's compile-check programs to run via QEMU, if it's installed.
|
||||
# Debian/Ubuntu ship the static binaries in qemu-user-static and the dynamic
|
||||
# ones in qemu-user; either will do, so take whichever is present.
|
||||
find_program(QEMU_RISCV64 NAMES qemu-riscv64-static qemu-riscv64)
|
||||
if(QEMU_RISCV64)
|
||||
# The /lib64 symlink is created by the setup script; without it, pass -L
|
||||
# explicitly so QEMU can find the riscv64 dynamic linker.
|
||||
if(EXISTS "/lib64/ld-linux-riscv64-lp64d.so.1")
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR "${QEMU_RISCV64}" CACHE STRING "" FORCE)
|
||||
else()
|
||||
set(CMAKE_CROSSCOMPILING_EMULATOR
|
||||
"${QEMU_RISCV64};-L;/usr/riscv64-linux-gnu"
|
||||
CACHE STRING "" FORCE)
|
||||
endif()
|
||||
endif()
|
||||
@@ -1,15 +1,34 @@
|
||||
#!/bin/bash
|
||||
# Sets up the loongarch64 cross-compilation environment.
|
||||
# Run once with sudo. After this, ./b.sh --loongarch64 works on a fresh checkout.
|
||||
# Sets up a cross-compilation environment for one of the headless-only targets.
|
||||
# Run once with sudo. After this, ./b.sh --<target> works on a fresh checkout.
|
||||
#
|
||||
# Usage: sudo cmake/scripts/setup-cross.sh <loongarch64|riscv64>
|
||||
|
||||
set -e
|
||||
|
||||
SYSROOT=/usr/loongarch64-linux-gnu
|
||||
CROSS_GCC=loongarch64-linux-gnu-gcc-14
|
||||
TARGET="$1"
|
||||
|
||||
case "$TARGET" in
|
||||
loongarch64)
|
||||
TRIPLE=loongarch64-linux-gnu
|
||||
LD_SO=ld-linux-loongarch-lp64d.so.1
|
||||
;;
|
||||
riscv64)
|
||||
TRIPLE=riscv64-linux-gnu
|
||||
LD_SO=ld-linux-riscv64-lp64d.so.1
|
||||
;;
|
||||
*)
|
||||
echo "Usage: sudo $0 <loongarch64|riscv64>"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
SYSROOT=/usr/$TRIPLE
|
||||
CROSS_GCC=$TRIPLE-gcc-14
|
||||
|
||||
if ! command -v $CROSS_GCC &>/dev/null; then
|
||||
echo "Error: $CROSS_GCC not found. Install it first:"
|
||||
echo " sudo apt install gcc-14-loongarch64-linux-gnu g++-14-loongarch64-linux-gnu binutils-loongarch64-linux-gnu"
|
||||
echo " sudo apt install gcc-14-$TRIPLE g++-14-$TRIPLE binutils-$TRIPLE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -18,6 +37,8 @@ if [ "$(id -u)" -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
HOST_MULTIARCH=$(gcc -print-multiarch 2>/dev/null || dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
|
||||
|
||||
# ── OpenGL headers ───────────────────────────────────────────────────────────
|
||||
# GL headers are platform-independent C headers; copy from the host.
|
||||
echo "Installing GL headers into sysroot..."
|
||||
@@ -27,13 +48,11 @@ for h in gl.h glext.h glcorearb.h glu.h; do
|
||||
done
|
||||
|
||||
# ── GL stub library ──────────────────────────────────────────────────────────
|
||||
# Generate a loongarch64 libGL.so that exports all symbols from the host
|
||||
# Generate a libGL.so for the target that exports all symbols from the host
|
||||
# libGL so that GLEW's static archive can be linked via PLT entries (a direct
|
||||
# B26 branch to address 0 would overflow on LoongArch).
|
||||
# branch to address 0 would overflow the relocation on these targets).
|
||||
echo "Generating libGL.so stub..."
|
||||
|
||||
HOST_MULTIARCH=$(gcc -print-multiarch 2>/dev/null || dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
|
||||
|
||||
HOST_GL=""
|
||||
for candidate in \
|
||||
/usr/lib/$HOST_MULTIARCH/libGL.so.1 \
|
||||
@@ -43,8 +62,8 @@ for candidate in \
|
||||
done
|
||||
|
||||
STUB_C=$(mktemp /tmp/gl_stub_XXXXXX.c)
|
||||
echo "/* Loongarch64 GL/GLX stub - for cross-compilation only */" > "$STUB_C"
|
||||
echo "void __loongarch64_gl_placeholder(void) {}" >> "$STUB_C"
|
||||
echo "/* $TARGET GL/GLX stub - for cross-compilation only */" > "$STUB_C"
|
||||
echo "void __cross_gl_placeholder(void) {}" >> "$STUB_C"
|
||||
|
||||
if [ -n "$HOST_GL" ]; then
|
||||
nm -D "$HOST_GL" 2>/dev/null | awk '/^[0-9a-f]+ T /{ print "void "$3"(void){}" }' >> "$STUB_C"
|
||||
@@ -62,16 +81,16 @@ rm "$STUB_C"
|
||||
echo " Installed to $SYSROOT/lib/libGL.so"
|
||||
|
||||
# ── Dynamic linker symlink ───────────────────────────────────────────────────
|
||||
# Without this, binfmt_misc can't find the loongarch64 dynamic linker.
|
||||
LD_LINUX=$SYSROOT/lib/ld-linux-loongarch-lp64d.so.1
|
||||
# Without this, binfmt_misc can't find the target's dynamic linker.
|
||||
LD_LINUX=$SYSROOT/lib/$LD_SO
|
||||
if [ -f "$LD_LINUX" ]; then
|
||||
mkdir -p /lib64
|
||||
ln -sf "$LD_LINUX" /lib64/ld-linux-loongarch-lp64d.so.1
|
||||
echo "Created /lib64/ld-linux-loongarch-lp64d.so.1 -> $LD_LINUX"
|
||||
ln -sf "$LD_LINUX" /lib64/$LD_SO
|
||||
echo "Created /lib64/$LD_SO -> $LD_LINUX"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Setup complete."
|
||||
echo "Build: ./b.sh --loongarch64"
|
||||
echo "Run: qemu-loongarch64-static -L $SYSROOT <binary>"
|
||||
echo " (after setup the /lib64 symlink lets you run loongarch64 binaries directly)"
|
||||
echo "Build: ./b.sh --$TARGET"
|
||||
echo "Run: qemu-$TARGET -L $SYSROOT <binary>"
|
||||
echo " (after setup the /lib64 symlink lets you run $TARGET binaries directly)"
|
||||
Reference in new issue
Block a user