[Scummvm-git-logs] scummvm master -> 53bd9f5f7332e2f131ecc74deaa0e2040e5e7851

lephilousophe noreply at scummvm.org
Mon Mar 18 11:37:40 UTC 2024


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

Summary:
53bd9f5f73 AMIGAOS: revert compiler flag


Commit: 53bd9f5f7332e2f131ecc74deaa0e2040e5e7851
    https://github.com/scummvm/scummvm/commit/53bd9f5f7332e2f131ecc74deaa0e2040e5e7851
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-03-18T12:37:36+01:00

Commit Message:
AMIGAOS: revert compiler flag

Changed paths:
    configure


diff --git a/configure b/configure
index a49fecf067a..06387cabc8d 100755
--- a/configure
+++ b/configure
@@ -2844,28 +2844,26 @@ case $_host_os in
 		# AmigaOS (PPC) target
 		_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
 		add_line_to_config_mk 'AMIGAOS = 1'
+		# -mlongcall is needed to fix relocation errors,
+		# otherwise we crash with big engines (i.e. AGS)
+		append_var CXXFLAGS "-mlongcall"
 		# Enable full optimizations for non-debug builds
 		if test "$_debug_build" = no; then
 			_optimization_level=-O3
 		else
 			_optimization_level=-O0
-			append_var CXXFLAGS "-fno-omit-frame-pointer"
-			append_var CXXFLAGS "-fno-strict-aliasing"
-			append_var CXXFLAGS "-fstack-protector"
-			# Dependencies might also be compiled with stack protection
-			append_var LDFLAGS "-fstack-protector"
 			define_in_config_if_yes "$_debug_build" 'DEBUG_BUILD'
 		fi
-		# When building dynamic, add everything possible as plugin
-		# and leave out resources by default to save binary size
+		# dynamic builds leave out resources to save binary size
+		# and detection features *must* be static
 		if test "$_dynamic_modules" = yes ; then
 			_builtin_resources=no
-			_detection_features_static=no
 			_plugins_default=dynamic
 		else
+			_plugins_default=static
 			_static_build=yes
 		fi
-		# Use 'long' for ScummVM's 4 byte typedef, because AmigaOS
+		# use 'long' for ScummVM's 4 byte typedef, because AmigaOS
 		# already typedefs (u)int32 as (unsigned) long and suppress
 		# those noisy format warnings caused by the 'long' 4 byte
 		append_var CXXFLAGS "-Wno-format"
@@ -7230,7 +7228,6 @@ case $_host_os in
 		;;
 	amigaos*)
 		# In release mode use LTO to improve performance
-		# and dead code elimination to reduce binary size
 		if test "$_release_build" = yes; then
 			append_var CXXFLAGS "-flto"
 			append_var PLUGIN_LDFLAGS "-flto=jobserver"




More information about the Scummvm-git-logs mailing list