[Scummvm-git-logs] scummvm branch-2-8 -> c9083c822922068cabb1707aae5469ac3d5e102e

[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:
c9083c8229 PLUGINS: Implement NONE relocations


Commit: c9083c822922068cabb1707aae5469ac3d5e102e
    https://github.com/scummvm/scummvm/commit/c9083c822922068cabb1707aae5469ac3d5e102e
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-03-02T11:58:23+01:00

Commit Message:
PLUGINS: Implement NONE relocations

ARM emit them in some cases and add it to MIPS for completeness

Fixes: #14905

Changed paths:
    backends/plugins/elf/arm-loader.cpp
    backends/plugins/elf/mips-loader.cpp


diff --git a/backends/plugins/elf/arm-loader.cpp b/backends/plugins/elf/arm-loader.cpp
index 6bc61fa92bb..52c96a1e824 100644
--- a/backends/plugins/elf/arm-loader.cpp
+++ b/backends/plugins/elf/arm-loader.cpp
@@ -63,6 +63,9 @@ bool ARMDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment)
 
 		// Act differently based on the type of relocation
 		switch (REL_TYPE(rel[i].r_info)) {
+		case R_ARM_NONE:
+//		        debug(8, "elfloader: R_ARM_NONE: No relocation.");
+			break;
 		case R_ARM_ABS32:
 		case R_ARM_TARGET1:
 			if (sym->st_shndx < SHN_LOPROC) {			// Only shift for plugin section.
diff --git a/backends/plugins/elf/mips-loader.cpp b/backends/plugins/elf/mips-loader.cpp
index 3d207d8d0cc..f88f16240df 100644
--- a/backends/plugins/elf/mips-loader.cpp
+++ b/backends/plugins/elf/mips-loader.cpp
@@ -77,6 +77,8 @@ bool MIPSDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment)
 
 		// Act differently based on the type of relocation
 		switch (REL_TYPE(rel[i].r_info)) {
+		case R_MIPS_NONE:
+			break; // No relocation
 		case R_MIPS_HI16:							// Absolute addressing.
 			if (sym->st_shndx < SHN_LOPROC &&		// Only shift for plugin section (ie. has a real section index)
 				firstHi16 < 0) {					// Only process first in block of HI16s