[arm] Fix bug in _nocancel system call stubs.

diff --git a/ChangeLog.arm b/ChangeLog.arm
index 3f4ae8c..dd5767d 100644 (file)
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,5 +1,10 @@
 2011-03-21  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
+       * sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h (PSEUDO): Add
+       missing "cmn r0, $4096" for _nocancel system call stubs.
+
+2011-03-21  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
        * sysdeps/unix/sysv/arm/eabi/sysdep.h (DO_CALL): Do not save/restore
        r7 into IP.
        (DOARGS_0, UNDOARGS_0): Redefine to save/restore r7 to the stack.

diff --git a/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
index f4a8af4..3fadebd 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/sysdep-cancel.h
@@ -39,6 +39,7 @@
     .cfi_sections .debug_frame;                                                \
     cfi_startproc;                                                     \
     DO_CALL (syscall_name, args);                                      \
+    cmn r0, $4096;                                                     \
     PSEUDO_RET;                                                                \
     cfi_endproc;                                                       \
   .size __##syscall_name##_nocancel,.-__##syscall_name##_nocancel;     \