[Scummvm-git-logs] scummvm master -> 8366119da3ff867621b9164575c9df36225eabcd

[bluegr]

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:
8366119da3 AMIGAOS: clean up compiler flags


Commit: 8366119da3ff867621b9164575c9df36225eabcd
    https://github.com/scummvm/scummvm/commit/8366119da3ff867621b9164575c9df36225eabcd
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-03-13T20:12:20+02:00

Commit Message:
AMIGAOS: clean up compiler flags

Changed paths:
    configure


diff --git a/configure b/configure
index 68bbe453188..a49fecf067a 100755
--- a/configure
+++ b/configure
@@ -2841,14 +2841,9 @@ case $_host_os in
 		append_var LIBS "-lcitro3d"
 		;;
 	amigaos*)
-		# Leave out resources by default to save binary size
-		_builtin_resources=no
 		# AmigaOS (PPC) target
 		_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
 		add_line_to_config_mk 'AMIGAOS = 1'
-		append_var CXXFLAGS "-mlongcall"
-		# Dependencies might also be compiled with stack protection
-		append_var LDFLAGS "-fstack-protector"
 		# Enable full optimizations for non-debug builds
 		if test "$_debug_build" = no; then
 			_optimization_level=-O3
@@ -2856,19 +2851,25 @@ case $_host_os in
 			_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
-		# except detection_features (see bug #13603)
+		# and leave out resources by default to save binary size
 		if test "$_dynamic_modules" = yes ; then
-			_detection_features_static=yes
+			_builtin_resources=no
+			_detection_features_static=no
 			_plugins_default=dynamic
+		else
+			_static_build=yes
 		fi
 		# 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
-		type_4_byte='long'
 		append_var CXXFLAGS "-Wno-format"
+		type_4_byte='long'
 		;;
 	android)
 		case $_host in
@@ -4821,7 +4822,6 @@ PLUGIN_LDFLAGS		+= -Wl,-T$(srcdir)/backends/plugins/3ds/plugin.ld -march=armv6k
 		append_var CXXFLAGS "-fPIC"
 		append_var LIBS "-use-dynld"
 		append_var LIBS "-lauto"
-		append_var _strip "-x"
 _mak_plugins='
 PLUGIN_EXTRA_DEPS =
 PLUGIN_LDFLAGS  += -shared
@@ -7233,7 +7233,6 @@ case $_host_os in
 		# and dead code elimination to reduce binary size
 		if test "$_release_build" = yes; then
 			append_var CXXFLAGS "-flto"
-			append_var CXXFLAGS "-ffunction-sections -fdata-sections"
 			append_var PLUGIN_LDFLAGS "-flto=jobserver"
 		fi
 		;;