[Scummvm-git-logs] scummvm master -> 6cf2ea54ea66a2bcc6c1b0842348fed9b3ccd4b9

[spleen1981]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
abf706ce3f LIBRETRO: BUILD: add reduced mem flags for Miyoo
6cf2ea54ea LIBRETRO: fix duplicated switch to main thread


Commit: abf706ce3fce0b48b2f3f9e01dcc7ab2d76eb6f9
    https://github.com/scummvm/scummvm/commit/abf706ce3fce0b48b2f3f9e01dcc7ab2d76eb6f9
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-11-18T02:42:09+01:00

Commit Message:
LIBRETRO: BUILD: add reduced mem flags for Miyoo

Changed paths:
    backends/platform/libretro/Makefile


diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index 3e4e85388cd..1a4a6ac09c0 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -230,7 +230,7 @@ else ifeq ($(platform), miyoo)
    AR = /opt/miyoo/usr/bin/arm-linux-ar cru
    RANLIB = /opt/miyoo/usr/bin/arm-linux-ranlib
    DEFINES += -DDINGUX -fomit-frame-pointer -ffast-math -march=armv5te -mtune=arm926ej-s -fPIC
-   DEFINES += -ffunction-sections -fdata-sections -DDEFAULT_PERF_TUNER
+   DEFINES += -ffunction-sections -fdata-sections -DDEFAULT_PERF_TUNER -DREDUCE_MEMORY_USAGE -DUNCACHED_PLUGINS
    LDFLAGS += -shared -Wl,--gc-sections -Wl,--version-script=$(ROOT_PATH)/link.T -fPIC
    USE_VORBIS = 0
    USE_THEORADEC = 0
@@ -249,7 +249,7 @@ else ifeq ($(platform), miyoomini)
    AR = /usr/bin/arm-linux-gnueabihf-ar cru
    RANLIB = /usr/bin/arm-linux-gnueabihf-ranlib
    DEFINES += -fomit-frame-pointer -ffast-math -marm -march=armv7ve+simd -mtune=cortex-a7 -fPIC
-   DEFINES += -ffunction-sections -fdata-sections -DDEFAULT_PERF_TUNER
+   DEFINES += -ffunction-sections -fdata-sections -DDEFAULT_PERF_TUNER -DREDUCE_MEMORY_USAGE -DUNCACHED_PLUGINS
    LDFLAGS += -shared -Wl,--gc-sections -Wl,--version-script=$(ROOT_PATH)/link.T -fPIC
    USE_VORBIS = 0
    USE_THEORADEC = 0


Commit: 6cf2ea54ea66a2bcc6c1b0842348fed9b3ccd4b9
    https://github.com/scummvm/scummvm/commit/6cf2ea54ea66a2bcc6c1b0842348fed9b3ccd4b9
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-11-18T02:42:26+01:00

Commit Message:
LIBRETRO: fix duplicated switch to main thread

Changed paths:
    backends/platform/libretro/src/libretro-threads.cpp


diff --git a/backends/platform/libretro/src/libretro-threads.cpp b/backends/platform/libretro/src/libretro-threads.cpp
index ec1de4537a9..f04f8eb4f35 100644
--- a/backends/platform/libretro/src/libretro-threads.cpp
+++ b/backends/platform/libretro/src/libretro-threads.cpp
@@ -121,13 +121,6 @@ void retro_switch_to_emu_thread() {
 
 void retro_switch_to_main_thread() {
 	retro_exit_to_main_thread();
-#ifndef USE_LIBCO
-	status |= EMU_WAITING;
-	while (status & EMU_WAITING) {
-		scond_wait(emu_cond, emu_lock);
-	}
-	slock_unlock(emu_lock);
-#endif
 }
 
 bool retro_emu_thread_initialized() {