diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
| commit | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch) | |
| tree | 5466406472918d3adb63398f5fb9ea1511a5e73f /libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h | |
| parent | 4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff) | |
| parent | 5dea871ac73ef4608022c058b50adc946917f9b9 (diff) | |
Merge commit 'origin/master' into prelink
Conflicts:
ldso/include/dl-hash.h
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h')
| -rw-r--r-- | libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h index 1fff78239..b2c0dfe89 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/mips/sysdep-cancel.h @@ -28,7 +28,8 @@ # undef PSEUDO # define PSEUDO(name, syscall_name, args) \ .align 2; \ - 99: la t9,__syscall_error; \ + 99: move a0, v0; \ + la t9,__syscall_error; \ jr t9; \ ENTRY (name) \ .set noreorder; \ |