aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85e4c25a85..83ef754740 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-26 Joseph Myers <joseph@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
+ [__PIC__] (PSEUDO): Use name of _nocancel entry point in
+ corresponding .cpsetup call.
+
2014-06-26 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/arm/libc-aeabi_read_tp.S: Moved ...
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
index d9e7236a37..341b9a0ba0 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/mips/mips64/nptl/sysdep-cancel.h
@@ -47,7 +47,7 @@
.globl __##syscall_name##_nocancel; \
__##syscall_name##_nocancel: \
SAVESTK; \
- .cpsetup t9, STKOFF_GP, name; \
+ .cpsetup t9, STKOFF_GP, __##syscall_name##_nocancel; \
cfi_rel_offset (gp, STKOFF_GP); \
li v0, SYS_ify(syscall_name); \
syscall; \