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

[rsn8887]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
fcc94728f8 PSP2: Use psp2rela without objdump and remove ASLR for plugins


Commit: fcc94728f8dd6b3d0d0c029189bcbe01904453fa
    https://github.com/scummvm/scummvm/commit/fcc94728f8dd6b3d0d0c029189bcbe01904453fa
Author: William Bonnaventure (william.bonnaventure at gmail.com)
Date: 2025-08-02T20:30:21-05:00

Commit Message:
PSP2: Use psp2rela without objdump and remove ASLR for plugins

Changed paths:
    backends/platform/sdl/psp2/psp2.mk


diff --git a/backends/platform/sdl/psp2/psp2.mk b/backends/platform/sdl/psp2/psp2.mk
index 001c55e4a7a..6c9cea8cb1e 100644
--- a/backends/platform/sdl/psp2/psp2.mk
+++ b/backends/platform/sdl/psp2/psp2.mk
@@ -13,12 +13,8 @@ psp2vpk: $(PSP2_EXE_STRIPPED) $(PLUGINS)
 # 	Disable ASLR with -na to support profiling, also it can slow things down
 	vita-make-fself -na -s -c $(EXECUTABLE).velf psp2pkg/eboot.bin
 ifdef DYNAMIC_MODULES
-	# Use psp2rela to convert the main binary to static, this allows plugins to use functions from it without any relocation
-	# TODO: Use psp2rela -fetch_base flag instead of using objdump when the change is widespread
-	set -e ;\
-	textaddr=$$($(OBJDUMP) -p $(EXECUTABLE) | awk '/ LOAD / { vaddr=$$5; getline; if ($$6 == "r-x") print vaddr; }') ;\
-	dataaddr=$$($(OBJDUMP) -p $(EXECUTABLE) | awk '/ LOAD / { vaddr=$$5; getline; if ($$6 == "rw-") print vaddr; }') ;\
-	psp2rela -src=psp2pkg/eboot.bin -dst=psp2pkg/eboot.bin -static_mode -text_addr=$$textaddr -data_addr=$$dataaddr
+#	Use psp2rela to convert the main binary to static, this allows plugins to use functions from it without any relocation
+	psp2rela -src=psp2pkg/eboot.bin -dst=psp2pkg/eboot.bin -static_mode -fetch_base
 endif
 	vita-mksfoex -s TITLE_ID=VSCU00001 -d ATTRIBUTE2=12 "$(EXECUTABLE)" psp2pkg/sce_sys/param.sfo
 	cp $(srcdir)/dists/psp2/icon0.png psp2pkg/sce_sys/
@@ -37,14 +33,14 @@ ifdef DIST_FILES_VKEYBD
 endif
 ifdef DYNAMIC_MODULES
 	mkdir -p psp2pkg/plugins
-	# Each plugin is built as ELF with .suprx extension in main directory because of PLUGIN_SUFFIX variable
-	# Then it's stripped and converted here to Vita ELF and SELF inside the package directory
+#	Each plugin is built as ELF with .suprx extension in main directory because of PLUGIN_SUFFIX variable
+#	Then it's stripped and converted here to Vita ELF and SELF inside the package directory
 	set -e ;\
 	for p in $(PLUGINS); do \
 		p=$${p%.suprx} ;\
 		$(STRIP) --strip-debug $$p.suprx -o $$p.stripped.elf ;\
 		vita-elf-create -n -e $(srcdir)/backends/plugins/psp2/plugin.yml $$p.stripped.elf $$p.velf ;\
-		vita-make-fself -s $$p.velf psp2pkg/plugins/$$(basename "$$p").suprx ;\
+		vita-make-fself -na -s $$p.velf psp2pkg/plugins/$$(basename "$$p").suprx ;\
 	done
 endif
 	cp $(DIST_FILES_DOCS) psp2pkg/doc/