Merge pull request #814 from fjtrujy/srxfixup_relative-branch

uyjulian · web-flow · commit 8f8386b9efa1 · 2026-03-06T08:18:39.000-06:00
[iop]: run `srxfixup` with `--rb` during link to convert relative branches (fixes `J/JAL` reloc incompatibilities)
diff --git a/iop/Rules.make b/iop/Rules.make
@@ -146,7 +146,7 @@ $(IOP_BIN_STRIPPED_ELF): $(IOP_BIN_ELF)
 	$(IOP_STRIP) --strip-unneeded --remove-section=.pdr --remove-section=.comment --remove-section=.mdebug.abi32 --remove-section=.gnu.attributes -o $@ $<
 
 $(IOP_BIN): $(IOP_BIN_STRIPPED_ELF) $(PS2SDKSRC)/tools/srxfixup/bin/srxfixup
-	$(PS2SDKSRC)/tools/srxfixup/bin/srxfixup --irx1 -o $@ $<
+	$(PS2SDKSRC)/tools/srxfixup/bin/srxfixup --rb --irx1 -o $@ $<
 
 $(IOP_LIB)_tmp$(MAKE_CURPID): $(IOP_OBJS)
 	$(DIR_GUARD)
diff --git a/tools/srxfixup/src/srxgen.c b/tools/srxfixup/src/srxgen.c
@@ -412,6 +412,8 @@ static void fixlocation_an_rel(elf_section *relsect, unsigned int startaddr)
 		datal = &relsect->info->data[rp->rel.r_offset - relsect->info->shr.sh_addr];
 		switch ( rp->type )
 		{
+			case R_MIPS_NONE:
+				break;
 			case R_MIPS_16:
 				data_1 = startaddr + (int16_t)*(uint32_t *)datal;
 				if ( (uint16_t)(data_1 >> 16) )

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,8 @@ static void fixlocation_an_rel(elf_section *relsect, unsigned int startaddr)`
`412`	`412`	`datal = &relsect->info->data[rp->rel.r_offset - relsect->info->shr.sh_addr];`
`413`	`413`	`switch ( rp->type )`
`414`	`414`	`{`
	`415`	`+ case R_MIPS_NONE:`
	`416`	`+ break;`
`415`	`417`	`case R_MIPS_16:`
`416`	`418`	`data_1 = startaddr + (int16_t)(uint32_t )datal;`
`417`	`419`	`if ( (uint16_t)(data_1 >> 16) )`