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

digitall dgturner at iee.org
Thu Oct 25 05:20:54 CEST 2018


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:
016ddd4899 BUILD: Remove flags from translation cc_check
a307d88f43 BUILD: Fix Dreamcast crt0 link order


Commit: 016ddd4899da0878e8910707b3bb0d1301368424
    https://github.com/scummvm/scummvm/commit/016ddd4899da0878e8910707b3bb0d1301368424
Author: Thomas Sowell (tom at shmat.org)
Date: 2018-10-25T04:20:51+01:00

Commit Message:
BUILD: Remove flags from translation cc_check

Remove $LDFLAGS and $CXXFLAGS from cc_check call in translation support
check.  Both variables are redundant because they are already expanded
in cc_check, and expanding LDFLAGS twice causes duplicate symbol errors
for targets that include crt0.o in LDFLAGS.

Changed paths:
    configure


diff --git a/configure b/configure
index 2f84601..5794d86 100755
--- a/configure
+++ b/configure
@@ -5037,7 +5037,7 @@ else
 int main(void) { setlocale(LC_ALL, ""); return 0; }
 EOF
 		_detectlang=no
-		cc_check $LDFLAGS $CXXFLAGS && _detectlang=yes
+		cc_check && _detectlang=yes
 	fi
 
 	define_in_config_h_if_yes $_detectlang 'USE_DETECTLANG'


Commit: a307d88f437aabe53824feb5a735e570edf12579
    https://github.com/scummvm/scummvm/commit/a307d88f437aabe53824feb5a735e570edf12579
Author: Thomas Sowell (tom at shmat.org)
Date: 2018-10-25T04:20:51+01:00

Commit Message:
BUILD: Fix Dreamcast crt0 link order

Correct a regression introduced in 7557f17ed2 which caused the Dreamcast
to hang at the license screen when running SCUMMVM.BIN from a CD.
7557f17ed2 fixed configure's feature detection by moving crt0.o from
LDFLAGS to LIBS, but that changed the linking order resulting in the
start symbol from crt0 being located at an address other than
0x8c010000.  ELF binaries loaded over serial or TCP/IP were unaffected
(presumably because the loaders use the start address from the ELF
header instead of a fixed address) which is probably why this went
unnoticed.

This commit corrects the link order by moving crt0 back into LDFLAGS and
adds "-lronin -lm" to LDFLAGS to ensure that configure checks continue
to work.

Changed paths:
    configure


diff --git a/configure b/configure
index 5794d86..f590fe6 100755
--- a/configure
+++ b/configure
@@ -3424,12 +3424,14 @@ case $_backend in
 		append_var LDFLAGS "-Wl,-Ttext,0x8c010000"
 		append_var LDFLAGS "-nostartfiles"
 		append_var LDFLAGS "-L$RONINDIR/lib"
-		append_var LIBS "$RONINDIR/lib/crt0.o"
+		append_var LDFLAGS "$RONINDIR/lib/crt0.o"
 		# Enable serial debugging output only when --enable-debug is passed
 		if test "$_release_build" = yes -o "$_debug_build" != yes; then
 			append_var LIBS "-lronin-noserial -lm"
+			append_var LDFLAGS "-lronin-noserial -lm"
 		else
 			append_var LIBS "-lronin -lm"
+			append_var LDFLAGS "-lronin -lm"
 		fi
 		;;
 	dingux)





More information about the Scummvm-git-logs mailing list