Conversation
…uffix, bump deps version to 12
|
The CI fails because I haven't uploaded preview |
|
Building the NaCl loader with MinGW requires JWasm: I wonder if we can extend the script to build specific host tools. I actually suspect that some macOS tools are meant to be built for the host as well (nasm, pkg-config…), and that we were lucky to be able to reuse the ones built for the target because we weren't cross-compiling… |
|
I'm very proud of this: build_naclruntime() {
local nacl_arch_list=()
case "${PLATFORM}" in
windows-amd64-*)
nacl_arch_list+=('amd64')
;;
windows-i686-*)
nacl_arch_list+=('i686')
nacl_arch_list+=('amd64')
;;
linux-amd64-*)
nacl_arch_list+=('amd64')
;;
linux-i686-*)
nacl_arch_list+=('i686')
;;
linux-arm64-*)
nacl_arch_list+=('armhf')
;;
linux-armhf-*)
nacl_arch_list+=('armhf')
;;
macos-amd64-*)
nacl_arch_list+=('amd64')
;;
macos-arm64-*)
nacl_arch_list+=('amd64')
;;
*)
log ERROR 'Unsupported platform for naclruntime'
;;
esac
local dir_name="DaemonEngine-native_client-${NACLRUNTIME_REVISION:0:7}"
local archive_name="native_client-${NACLRUNTIME_REVISION}.zip"
download_extract naclruntime "${archive_name}" \
"{$NACLRUNTIME_BASEURL}/${NACLRUNTIME_REVISION}"
"${download_only}" && return
cd "${dir_name}"
for nacl_arch in "${nacl_arch_list[@]}"
do
(
setup_platform "${PLATFORM_SYSTEM}-${nacl_arch}-${PLATFORM_COMPILER}"
cmake_build
)
case "${PLATFORM}" in
linux-*)
mv "${PREFIX}/bin/nacl_helper_bootstrap" "${PREFIX}/nacl_helper_bootstrap-${nacl_arch}"
;;
esac
mv "${PREFIX}/bin/sel_ldr${EXE_EXT}" "${PREFIX}/nacl_loader-${nacl_arch}${EXE_EXT}"
done |
1506732 to
56101b2
Compare
Yes, So we better refactor this and reuse the mechanism for JWasm. |
eb0893d to
6d2955a
Compare
6d2955a to
71dc995
Compare
71dc995 to
58b2967
Compare
…back, detect armhf multiarch support
bd56fb3 to
7179f26
Compare
Now done. Those “packages“:
Are now guaranteed to be compiled the native way and stored in their own native prefix that is not packaged. The building of the NaCl client is now working out of the box with MinGW. Well, at least on Ubuntu 24.04 Noble. On Debian 13 Trixie I get some “-Wincompatible-pointer-types” errors, to be fixed in Native Client upstream. The build tooling is fine. |
8db6365 to
c456a3f
Compare
|
Something annoying is that both the NASM build we download (2.16.03) and the latest stable one (3.01 from October 2025) provide a macOS fat binary of i386 and amd64, no arm64… So we can compile macOS deps for both amd64 and arm64 from amd64, but we can only build arm64 deps from arm64. That's not a big deal because I build on amd64, but that is annoying. |
c456a3f to
c0fa777
Compare
4f241c0 to
b00fbd9
Compare
…s to the NaCl subinvocation It's used by Unvanquished to pass CBSE_PYTHON_PATH. Also delete DAEMON_CBSE_PYTHON_PATH (already moved to the game as CBSE_PYTHON_PATH).
feb9da6 to
56b8708
Compare
78d544b to
cb12ca8
Compare
Set up the chdir and environment variable in posix_spawn. Fixes #1336. Co-authored-by: Thomas Debesse <dev@illwieckz.net>
Remove cvars controlling whether the Linux bootstrap loader is used. Never use bootstrap with the amd64 loader. Always use bootstrap with 32-bit loaders. Remove amd64 bootstrap usage from deps. Closes #1327. Co-authored-by: Thomas Debesse <dev@illwieckz.net>
When creating a NaCl (or native exe) VM on Windows, block evironment variables from being passed through to the subprocess as is done on *nix. Probably we do this since there are NACL* variables that can disable secure sandboxing. inheritEnvironment is always false on Windows, but I implemented the true case anyway since it's less code than having the Q_UNUSED and asserting it's false.
Check the Linux sysctl vm.mmap_min_addr only when using the NaCl bootstrap (rather than always when using NaCl). Or equivalently, check it only with 32-bit NaCl runtimes. The bootstrap fails to start when the value is too high to due low fixed address mappings. On ARM at least, sel_ldr proper would also fail with a too-high min address since that disturbs the address space layout. On 64-bit there is neither the bootstrap nor 0-based address space layout so it always works. Co-authored-by: Thomas Debesse <dev@illwieckz.net>
Co-authored-by: Thomas Debesse <dev@illwieckz.net>
783665a to
5590945
Compare
This introduces a big change: the NaCl loader and bootstrap executables are now suffixed with their architecture, like the IRT:
nacl_loader-amd64,nacl_helper_bootstrap-amd4.To avoid name collision, the armhf loader wrapper for running armhf on arm64 is now named
nacl_helper_bootstrap-ldarmhf, it chainloads what is nownacl_helper_bootstrap-armhf.This change genericizes what already existed for loading the amd64 loader on windows-amd64 when running the i686 engine, except now that's all the loaders that have a suffix, not just the non-native one.
This makes things very easy to manage, for example the external_deps script just loops over all the different nexe architecture an engine architecture can support and builds the nacl_loader for it. This already works for the windows-i686 deps build: it builds both the i686 and amd64 loaders using MinGW.
This same mechanism would be usable in the future to build for the linux-arm64 deps both the armhf loader and the amd64 loader (purposed to be running on box64 when armhf support isn't there in hardware).
With that loader suffix thing I deeply rewrote the NaCl startup code in
VirtualMachine.cpp, which is then already shaped for the ability to chose between armhf or amd64 on box64 at run time. The integration of box64 (CMake code, etc.) isn't there, but theVirtualMachine.cppcode is ready. That rework is deep and deduplicate and refactor intensively the binary name construction and the command construction.I started adding the
macos-arm64-defaultdeps configuration. For now not everything works, but it already successfully builds the amd64 loader.The IRT was previously fetched as part of the naclsdk, which is not removed yet, so the IRT is still shipped the old way at this point.
For Saigo it uses the recent release I packaged:
For the NaCl loader it uses my
illwieckz/stagingbranch that contains all my unmerged code: