microblaze: fix __syscall_cancel_arch (BZ 33547)

The __syscall_cancel_arch function has an epilogue that does not match
the prologue. The stack is not used and the return address still lies in
r15 when reaching the epilogue. Fix the epilogue by simply returning
from the function.

Signed-off-by: Luc Michel <luc.michel@amd.com>
Tested-by: gopi@sankhya.com
Reviewed-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

diff --git a/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S b/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S
index 38150e6a941c74a53dc65692a788716f9ac84051..3e8dc96a93ee7c64cb6e714a4f7f99fec4a44022 100644 (file)
--- a/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S
+++ b/sysdeps/unix/sysv/linux/microblaze/syscall_cancel.S
@@ -50,9 +50,8 @@ __syscall_cancel_arch_start:
 __syscall_cancel_arch_end:
 
        nop
-       lwi     r15,r1,0
        rtsd    r15,8
-       addik   r1,r1,28
+       nop
 
 1:
        brlid   r15, __syscall_do_cancel