[Scummvm-git-logs] scummvm master -> 57abc6b86f092c352158d675130eeae402273d1a

[rsn8887]

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:
57abc6b86f PSP: Remove .MIPS.abiflags* sections from plugins


Commit: 57abc6b86f092c352158d675130eeae402273d1a
    https://github.com/scummvm/scummvm/commit/57abc6b86f092c352158d675130eeae402273d1a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-04-29T13:29:25-05:00

Commit Message:
PSP: Remove .MIPS.abiflags* sections from plugins

Changed paths:
    backends/plugins/elf/elf-loader.cpp
    backends/plugins/psp/plugin.ld


diff --git a/backends/plugins/elf/elf-loader.cpp b/backends/plugins/elf/elf-loader.cpp
index a849c7c89bd..1d917a68c0e 100644
--- a/backends/plugins/elf/elf-loader.cpp
+++ b/backends/plugins/elf/elf-loader.cpp
@@ -157,7 +157,7 @@ bool DLObject::readProgramHeaders(Elf32_Ehdr *ehdr, Elf32_Phdr *phdr, Elf32_Half
 
 	// Check program header values
 	if (phdr->p_type != PT_LOAD  || phdr->p_filesz > phdr->p_memsz) {
-		warning("elfloader: Invalid program header.");
+		warning("elfloader: Invalid program header %x", phdr->p_type);
 		return false;
 	}
 
diff --git a/backends/plugins/psp/plugin.ld b/backends/plugins/psp/plugin.ld
index a3c8acbeec4..d78128427d5 100644
--- a/backends/plugins/psp/plugin.ld
+++ b/backends/plugins/psp/plugin.ld
@@ -208,7 +208,7 @@ SECTIONS
   .debug_typenames 0 : { *(.debug_typenames) }
   .debug_varnames  0 : { *(.debug_varnames) }
   /DISCARD/ : { *(.comment) *(.pdr) }
-  /DISCARD/ : { *(.note.GNU-stack) }
+  /DISCARD/ : { *(.note.GNU-stack) *(.MIPS.abiflags*) }
 
   . = __plugin_hole_start;
   .got            : { *(.got.plt) *(.got) } : shorts