[Scummvm-git-logs] scummvm master -> be82c63d77a5bcd08dcfed7835fef08f1a388569

[ccawley2011]

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:
05a5e44729 RISCOS: Add log10f and strcoll to functions to link
be82c63d77 RISCOS: Improve flags when building with plugins


Commit: 05a5e44729913aa9f6d1644580f6b774faa53e95
    https://github.com/scummvm/scummvm/commit/05a5e44729913aa9f6d1644580f6b774faa53e95
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-06-19T00:34:58+01:00

Commit Message:
RISCOS: Add log10f and strcoll to functions to link

Changed paths:
    backends/plugins/riscos/riscos-provider.cpp


diff --git a/backends/plugins/riscos/riscos-provider.cpp b/backends/plugins/riscos/riscos-provider.cpp
index 6399c030c29..52446199805 100644
--- a/backends/plugins/riscos/riscos-provider.cpp
+++ b/backends/plugins/riscos/riscos-provider.cpp
@@ -37,11 +37,13 @@
 void pluginHack() {
 	volatile float f = 0.0f;
 	volatile double d = 0.0;
+	volatile int i = 0;
 
 	byte *b = new (std::nothrow) byte[100];
 
 	f = tanhf(f);
 	f = logf(f);
+	f = log10f(f);
 	f = lroundf(f);
 	f = expf(f);
 	f = frexpf(f, NULL);
@@ -52,6 +54,8 @@ void pluginHack() {
 
 	d = nearbyint(d);
 
+	i = strcoll("dummyA", "dummyB");
+
 	rename("dummyA", "dummyB");
 
 	delete[] b;


Commit: be82c63d77a5bcd08dcfed7835fef08f1a388569
    https://github.com/scummvm/scummvm/commit/be82c63d77a5bcd08dcfed7835fef08f1a388569
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-06-19T00:36:25+01:00

Commit Message:
RISCOS: Improve flags when building with plugins

Changed paths:
    configure


diff --git a/configure b/configure
index bd3429bbed3..c82ba4f9beb 100755
--- a/configure
+++ b/configure
@@ -3096,6 +3096,12 @@ EOF
 		_sdlconfig=sdl-config
 		# RiscOS has no OpenGL support at all even though it's SDL based
 		_opengl_mode=none
+		if test "$_dynamic_modules" = yes ; then
+			_detection_features_static=no
+			_plugins_default=dynamic
+		else
+			_detection_features_full=no
+		fi
 		;;
 	solaris*)
 		append_var DEFINES "-DSOLARIS"
@@ -4244,6 +4250,7 @@ PLUGIN_LDFLAGS		+= -Wl,-T$(srcdir)/backends/plugins/psp/plugin.ld -Wl,-zmax-page
 		append_var DEFINES "-DELF_LOADER_CXA_ATEXIT"
 		append_var CXXFLAGS "-fuse-cxa-atexit"
 		append_var DEFINES "-DUNCACHED_PLUGINS"
+		append_var DEFINES "-DELF_NO_MEM_MANAGER"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS	+= backends/plugins/riscos/plugin.o
 PLUGIN_LDFLAGS		+= -static -Wl,-T$(srcdir)/backends/plugins/riscos/plugin.ld backends/plugins/riscos/plugin.o -Wl,--wrap=__rt_stkovf_split_small -Wl,--wrap=__rt_stkovf_split_big
@@ -6245,10 +6252,10 @@ case $_host_os in
 		if test "$_debug_build" = no; then
 			append_var CXXFLAGS "-mno-poke-function-name"
 		fi
-		append_var CXXFLAGS "-ffunction-sections"
-		append_var CXXFLAGS "-fdata-sections"
 		if test "$_dynamic_modules" = no ; then
 			append_var LDFLAGS "-Wl,--gc-sections"
+			append_var CXXFLAGS "-ffunction-sections"
+			append_var CXXFLAGS "-fdata-sections"
 		else
 			# toolchain asks for gc-sections
 			append_var LDFLAGS "-Wl,--no-gc-sections"