[Scummvm-git-logs] scummvm master -> 675695c7088b5d6b2b3c03a779134fab6f7f52e8

[lephilousophe]

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:
675695c708 PSP: Fix build failures with latest PSP toolchain


Commit: 675695c7088b5d6b2b3c03a779134fab6f7f52e8
    https://github.com/scummvm/scummvm/commit/675695c7088b5d6b2b3c03a779134fab6f7f52e8
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-12-31T09:50:53+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 dd11804bc48..11edff542d1 100644
--- a/backends/fs/psp/psp-stream.cpp
+++ b/backends/fs/psp/psp-stream.cpp
@@ -200,12 +200,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 984d6540aa1..733e4be3f7a 100644
--- a/backends/plugins/psp/psp-provider.cpp
+++ b/backends/plugins/psp/psp-provider.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 #include "common/scummsys.h"
 
 #if defined(DYNAMIC_MODULES) && defined(__PSP__)