From ade7dd835d07ebed3f874fad0390f5a7a235e315 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 5 Jun 2007 00:27:39 +0000 Subject: [PATCH] * embedspu.sh: Handle R_SPU_PPU* relocs with no symbol. --- binutils/ChangeLog | 4 ++++ binutils/embedspu.sh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index e56701abad..4d575e0fe6 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2007-06-05 Alan Modra + + * embedspu.sh: Handle R_SPU_PPU* relocs with no symbol. + 2007-05-30 Alan Modra * objcopy.c (copy_object): Revert 2007-05-11 change. Don't diff --git a/binutils/embedspu.sh b/binutils/embedspu.sh index 49776b00d7..62b5bf72ee 100644 --- a/binutils/embedspu.sh +++ b/binutils/embedspu.sh @@ -198,17 +198,17 @@ $7 != "'${toe}'" && ! $7 in sec_off { \ } \ $3 ~ /R_SPU_PPU/ { \ print "#ifdef _LP64"; \ - print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] ", R_PPC64_ADDR" substr($3, 10) ", " $5 "+0x" $7; \ + print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] ", R_PPC64_ADDR" substr($3, 10) ", " ($5 != "" ? $5 "+0x" $7 : "__speelf__ + 0x" $4); \ print "#else"; \ - print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] + (substr($3, 10) == "64" ? 4 : 0)", R_PPC_ADDR32, " $5 "+0x" $7; \ + print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] + (substr($3, 10) == "64" ? 4 : 0)", R_PPC_ADDR32, " ($5 != "" ? $5 "+0x" $7 : "__speelf__ + 0x" $4); \ print "#endif"; \ if (!donedef) { print "#define HAS_RELOCS 1"; donedef = 1; }; \ } \ $3 ~ /unrecognized:/ { \ print "#ifdef _LP64"; \ - print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] ", R_PPC64_ADDR" ($4 == "f" ? "64" : "32") ", " $6 "+0x" $8; \ + print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] ", R_PPC64_ADDR" ($4 == "f" ? "64" : "32") ", " ($6 != "" ? $6 "+0x" $8 : "__speelf__ + 0x" $5); \ print "#else"; \ - print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] + ($4 == "f" ? 4 : 0)", R_PPC_ADDR32, " $6 "+0x" $8; \ + print " .reloc __speelf__+" strtonum ("0x" $1) + sec_off[rela[sec]] + ($4 == "f" ? 4 : 0)", R_PPC_ADDR32, " ($6 != "" ? $6 "+0x" $8 : "__speelf__ + 0x" $5); \ print "#endif"; \ if (!donedef) { print "#define HAS_RELOCS 1"; donedef = 1; }; \ } \ -- 2.11.0