[Scummvm-git-logs] scummvm branch-2-5 -> bc2664e6b50fc9314906c805b3e16a28cac9e94b

[lephilousophe]

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:
eda7a61bf7 CONFIGURE: Don't use DWARF in nasm when linking using gold
bc2664e6b5 PSP: Fix build failures with latest PSP toolchain


Commit: eda7a61bf78771315d6741961ecd313fbc1d7c62
    https://github.com/scummvm/scummvm/commit/eda7a61bf78771315d6741961ecd313fbc1d7c62
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-01-12T13:13:20+01:00

Commit Message:
CONFIGURE: Don't use DWARF in nasm when linking using gold

This raises `internal error in relocate_section, at ../../gold/i386.cc:3683`

Changed paths:
    configure


diff --git a/configure b/configure
index 65e47314749..c2b6c757e4d 100755
--- a/configure
+++ b/configure
@@ -5676,6 +5676,10 @@ if test "$_have_x86" = yes ; then
 				;;
 				*)
 					append_var NASMFLAGS "-f elf"
+					if $LD $LDFLAGS -Wl,--version 2>/dev/null | grep -q -e 'GNU gold'; then
+						# gold throws an internal error when nasm uses dwarf, force older stabs in this case
+						append_var NASMFLAGS "-F stabs"
+					fi
 				;;
 			esac
 			_nasm=yes


Commit: bc2664e6b50fc9314906c805b3e16a28cac9e94b
    https://github.com/scummvm/scummvm/commit/bc2664e6b50fc9314906c805b3e16a28cac9e94b
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-01-12T13:14:41+01:00

Commit Message:
PSP: Fix build failures with latest PSP toolchain

The new PSP toolchain automatically links system libraries which wasn't
the case before. The ordering of libraries builtin in GCC and our spec
file collided. This fixes the order.
PSP SDK includes time.h so it needs an exemption.
A warning was emitted about a if without curly braces which are needed.

Changed paths:
    backends/fs/psp/psp-stream.cpp
    backends/platform/psp/psp.spec
    backends/plugins/psp/psp-provider.cpp


diff --git a/backends/fs/psp/psp-stream.cpp b/backends/fs/psp/psp-stream.cpp
index 7568fffcdba..c46b30dfa02 100644
--- a/backends/fs/psp/psp-stream.cpp
+++ b/backends/fs/psp/psp-stream.cpp
@@ -201,12 +201,13 @@ uint32 PspIoStream::read(void *ptr, uint32 len) {
 		PSP_DEBUG_PRINT_FUNC("suspended\n");
 
 	// check if we need to seek
-	if (_pos != _physicalPos)
+	if (_pos != _physicalPos) {
 		PSP_DEBUG_PRINT("seeking from %x to %x\n", _physicalPos, _pos);
 		if (!physicalSeekFromCur(_pos - _physicalPos)) {
 			_error = true;
 			return 0;
 		}
+	}
 
 	int ret = sceIoRead(_handle, ptr, len);
 
diff --git a/backends/platform/psp/psp.spec b/backends/platform/psp/psp.spec
index 71774133735..7a8a4dfe1c1 100644
--- a/backends/platform/psp/psp.spec
+++ b/backends/platform/psp/psp.spec
@@ -1,3 +1,3 @@
 %rename lib	old_lib
 *lib:
-%(old_lib) -lz -lstdc++ -lc -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio -lpspaudiocodec -lpspkernel -lpspnet_inet
+-lz -lstdc++ -lc %:if-exists(libcglue.a%s) -lm -lpspprof -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk -lpsputility -lpspuser -lpsppower -lpsphprm  -lpsprtc -lpspaudio -lpspaudiocodec -lpspkernel -lpspnet_inet %(old_lib)
diff --git a/backends/plugins/psp/psp-provider.cpp b/backends/plugins/psp/psp-provider.cpp
index 217a58e48da..d4037d847e8 100644
--- a/backends/plugins/psp/psp-provider.cpp
+++ b/backends/plugins/psp/psp-provider.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #include "common/scummsys.h"
 
 #if defined(DYNAMIC_MODULES) && defined(__PSP__)