2026-09-28 14:39:30

Signed-off-by: lizzie <lizzie@eden-emu.dev>

.patch/openssl-cmake/0005-cross-compile.patch

@@ -0,0 +1,40 @@
+diff --git a/cmake/ConfigureOpenSSL.cmake b/cmake/ConfigureOpenSSL.cmake
+index 3012e05..2ae23ff 100644
+--- a/cmake/ConfigureOpenSSL.cmake
++++ b/cmake/ConfigureOpenSSL.cmake
+@@ -108,7 +108,8 @@ function(configure_openssl)
+     )
+ 
+     if(NOT "${CONFIGURE_OPTIONS_OLD}" STREQUAL "")
+-        if(CONFIGURE_OPTIONS STREQUAL CONFIGURE_OPTIONS_OLD)
++        # TODO(lizzie): Emscripten has issues with rebuilding due to the wrapper it uses
++        if(CMAKE_SYSTEM_NAME MATCHES "Emscripten" OR CONFIGURE_OPTIONS STREQUAL CONFIGURE_OPTIONS_OLD)
+             message(STATUS "Found previous configure results. Don't perform configuration")
+             return()
+         endif()
+@@ -134,10 +135,24 @@ function(configure_openssl)
+         set(VERBOSE_OPTION OUTPUT_QUIET)
+     endif()
+ 
++    if (CMAKE_SYSTEM_NAME MATCHES "Emscripten")
++        set(EMSCRIPTEN_CMAKE_WRAPPER "emcmake")
++        find_program(EMCC emcc REQUIRED)
++        set(EMSCRIPTEN_LINKER ${EMCC})
++        list(APPEND CONFIGURE_COMMAND wasm64)
++    else()
++        set(EMSCRIPTEN_CMAKE_WRAPPER "")
++        set(EMSCRIPTEN_LINKER ${CMAKE_LINKER})
++    endif ()
++
+     execute_process(
+-        COMMAND ${CMAKE_COMMAND} -E env
++        COMMAND ${EMSCRIPTEN_CMAKE_WRAPPER} ${CMAKE_COMMAND} -E env
+             "CFLAGS=${CMAKE_C_FLAGS}"
+             "CXXFLAGS=${CMAKE_CXX_FLAGS}"
++            "LDFLAGS=${CMAKE_CXX_LINK_FLAGS}"
++            "CC=${CMAKE_C_COMPILER}"
++            "CXX=${CMAKE_CXX_COMPILER}"
++            "LD=${EMSCRIPTEN_LINKER}"
+             ${CONFIGURE_COMMAND}
+         WORKING_DIRECTORY ${CONFIGURE_BUILD_DIR}
+         ${VERBOSE_OPTION}

cpmfile.json

@@ -202,7 +202,8 @@
             "0001-cpmutil-compat.patch",
             "0002-use-ccache.patch",
             "0003-use-cmake-compiler-flags.patch",
-            "0004-use-shell-wrapper.patch"
+            "0004-use-shell-wrapper.patch",
+            "0005-cross-compile.patch"
         ],
         "repo": "jimmy-park/openssl-cmake",
         "version": "3.6.2"

docs/CrossCompile.md

@@ -6,10 +6,31 @@ General guide for cross compiling.
 
 A painless guide for cross compilation (or to test NCE) from a x86_64 system without polluting your main.
 
-- Install QEMU: `sudo pkg install qemu`
-- Download Debian 13: `wget https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-13.0.0-arm64-netinst.iso`
-- Create a system disk: `qemu-img create -f qcow2 debian-13-arm64-ci.qcow2 30G`
-- Run the VM: `qemu-system-aarch64 -M virt -m 2G -cpu max -bios /usr/local/share/qemu/edk2-aarch64-code.fd -drive if=none,file=debian-13.0.0-arm64-netinst.iso,format=raw,id=cdrom -device scsi-cd,drive=cdrom -drive if=none,file=debian-13-arm64-ci.qcow2,id=hd0,format=qcow2 -device virtio-blk-device,drive=hd0 -device virtio-gpu-pci -device usb-ehci -device usb-kbd -device intel-hda -device hda-output -nic user,model=virtio-net-pci`
+```sh
+#!/bin/sh
+ISO_FILE="debian-13.0.0-arm64-netinst.iso"
+DISK_FILE="debian-13-arm64-ci.qcow2"
+which -- qemu-system-aarch64 || sudo pkg install qemu
+[ -f "$ISO_FILE" ] || wget https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/$ISO_FILE
+[ -f "$DISK_FILE" ] || qemu-img create -f qcow2 "$DISK_FILE" 30G
+QEMU_FLAGS=(
+    -M virt
+    -m 2G
+    -cpu max
+    -bios /usr/local/share/qemu/edk2-aarch64-code.fd
+    -drive if=none,file=$ISO_FILE,format=raw,id=cdrom
+    -drive if=none,file=$DISK_FILE,id=hd0,format=qcow2
+    -device scsi-cd,drive=cdrom
+    -device virtio-blk-device,drive=hd0
+    -device virtio-gpu-pci
+    -device usb-ehci
+    -device usb-kbd
+    -device intel-hda
+    -device hda-output
+    -nic user,model=virtio-net-pci
+)
+qemu-system-aarch64 "${QEMU_FLAGS[@]}"
+```
 
 ## Gentoo
 

externals/cmake-modules/DetectArchitecture.cmake

@@ -101,6 +101,11 @@ endfunction()
 # ia64 exists
 # the rest exist, but are probably less popular than ia64
 
+detect_architecture_symbols(
+    ARCH wasm
+    SYMBOLS
+        "__EMSCRIPTEN__")
+
 detect_architecture_symbols(
     ARCH arm64
     SYMBOLS
@@ -203,11 +208,6 @@ detect_architecture_symbols(
         "__loongarch__"
         "__loongarch64")
 
-detect_architecture_symbols(
-    ARCH wasm
-    SYMBOLS
-        "__EMSCRIPTEN__")
-
 # "generic" target
 # If you have reached this point, you're on some as-of-yet unsupported architecture.
 # See the docs up above for known unsupported architectures

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt

@@ -28,13 +28,13 @@ object NativeConfig {
      * Reads values in the global config file and saves them.
      */
     @Synchronized
-    external fun reloadGlobalConfig(): Boolean
+    external fun reloadGlobalConfig()
 
     /**
      * Saves global settings values in memory to disk.
      */
     @Synchronized
-    external fun saveGlobalConfig(): Boolean
+    external fun saveGlobalConfig()
 
     /**
      * Creates per-game config for the specified parameters. Must be unloaded once per-game config
@@ -54,7 +54,7 @@ object NativeConfig {
      * Saves per-game settings values in memory to disk.
      */
     @Synchronized
-    external fun savePerGameConfig(): Boolean
+    external fun savePerGameConfig()
 
     /**
      * Destroys the stored per-game config object. This does not save the config.

src/android/app/src/main/jni/native_config.cpp

@@ -58,18 +58,13 @@ void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_unloadGlobalConfig(JNIEnv* env,
     global_config.reset();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_reloadGlobalConfig(JNIEnv* env, jobject obj) {
-    if (global_config) {
-        global_config->AndroidConfig::ReloadAllValues();
-        ResetFxChainToGlobal();
-    }
-    return global_config != nullptr;
+void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_reloadGlobalConfig(JNIEnv* env, jobject obj) {
+    global_config->AndroidConfig::ReloadAllValues();
+    ResetFxChainToGlobal();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_saveGlobalConfig(JNIEnv* env, jobject obj) {
-    if (global_config)
-        global_config->AndroidConfig::SaveAllValues();
-    return global_config != nullptr;
+void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_saveGlobalConfig(JNIEnv* env, jobject obj) {
+    global_config->AndroidConfig::SaveAllValues();
 }
 
 void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv* env, jobject obj,
@@ -82,14 +77,13 @@ void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_initializePerGameConfig(JNIEnv*
         std::make_unique<AndroidConfig>(config_file_name, Config::ConfigType::PerGameConfig);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_isPerGameConfigLoaded(JNIEnv* env, jobject obj) {
+jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_isPerGameConfigLoaded(JNIEnv* env,
+                                                                          jobject obj) {
     return per_game_config != nullptr;
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_savePerGameConfig(JNIEnv* env, jobject obj) {
-    if (per_game_config)
-        per_game_config->AndroidConfig::SaveAllValues();
-    return per_game_config != nullptr;
+void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_savePerGameConfig(JNIEnv* env, jobject obj) {
+    per_game_config->AndroidConfig::SaveAllValues();
 }
 
 void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_unloadPerGameConfig(JNIEnv* env, jobject obj) {

src/dynarmic/src/dynarmic/backend/riscv64/emit_riscv64_a32.cpp

@@ -197,15 +197,15 @@ void EmitA32Terminal(biscuit::Assembler& as, EmitContext& ctx, IR::Term::CheckHa
 
 void EmitA32LeafTerminal(biscuit::Assembler& as, EmitContext& ctx, IR::Term::LeafTerminal terminal, IR::LocationDescriptor initial_location, bool is_single_step) {
     if (auto const x = std::get_if<IR::Term::ReturnToDispatch>(&terminal))
-        return EmitA32LeafTerminal(as, ctx, *x, initial_location, is_single_step);
+        return EmitA32Terminal(as, ctx, *x, initial_location, is_single_step);
     if (auto const x = std::get_if<IR::Term::LinkBlock>(&terminal))
-        return EmitA32LeafTerminal(as, ctx, *x, initial_location, is_single_step);
+        return EmitA32Terminal(as, ctx, *x, initial_location, is_single_step);
     if (auto const x = std::get_if<IR::Term::LinkBlockFast>(&terminal))
-        return EmitA32LeafTerminal(as, ctx, *x, initial_location, is_single_step);
+        return EmitA32Terminal(as, ctx, *x, initial_location, is_single_step);
     if (auto const x = std::get_if<IR::Term::PopRSBHint>(&terminal))
-        return EmitA32LeafTerminal(as, ctx, *x, initial_location, is_single_step);
+        return EmitA32Terminal(as, ctx, *x, initial_location, is_single_step);
     if (auto const x = std::get_if<IR::Term::FastDispatchHint>(&terminal))
-        return EmitA32LeafTerminal(as, ctx, *x, initial_location, is_single_step);
+        return EmitA32Terminal(as, ctx, *x, initial_location, is_single_step);
     UNREACHABLE();
 }