* emultempl/spu_ovl.S: Don't trash lr on tail call from one

	overlay to another.
	* emultempl/spu_ovl.o: Regenerate.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d31157e..2d44638 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-14  Alan Modra  <amodra@bigpond.net.au>
+
+       * emultempl/spu_ovl.S: Don't trash lr on tail call from one
+       overlay to another.
+       * emultempl/spu_ovl.o: Regenerate.
+
 2007-06-11  Bob Wilson  <bob.wilson@acm.org>
 
        * emulparams/elf32xtensa.sh (OTHER_READONLY_SECTIONS): Add ONLY_IF_RO

diff --git a/ld/emultempl/spu_ovl.S b/ld/emultempl/spu_ovl.S
index 0f1064b..adc6ab2 100644 (file)
--- a/ld/emultempl/spu_ovl.S
+++ b/ld/emultempl/spu_ovl.S
@@ -166,7 +166,12 @@ __ovly_backchain_loop:
        shufb           rv2, retval, lnkr, rv1
        shufb           rv3, $lr, $78, rv1
        fsmbi           rv1, 0xff
-       selb            $lr, rv2, rv3, rv1
+       selb            rv2, rv2, rv3, rv1
+/* If we have a tail call from one overlay function to another overlay,
+   then lr is already set up.  Don't change it.  */
+       ceq             rv1, $lr, retval
+       fsmb            rv1, rv1
+       selb            $lr, rv2, $lr, rv1
 
 /* Branch to $79 if non-overlay */
        brz             $78, __ovly_load_restore

diff --git a/ld/emultempl/spu_ovl.o b/ld/emultempl/spu_ovl.o
index 51a9bbd..a68eea3 100644 (file)
Binary files a/ld/emultempl/spu_ovl.o and b/ld/emultempl/spu_ovl.o differ