aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-06 17:34:54 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-06 17:34:54 +0000
commitc3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9 (patch)
tree1164126ce1a33b340459c03a100011566853ed9b /linuxthreads
parent3a370de88f9ca928a90d1fa88afaf5d17d939fb6 (diff)
downloadglibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.tar
glibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.tar.gz
glibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.tar.bz2
glibc-c3f90e26a5160c3fe287c4283e7a2bc1ff54b1a9.zip
Update.
* sysdeps/unix/sysv/linux/sleep.c (__sleep): Use nanosleep syscall directly to avoid cancellation in the regular nanosleep implementation.
Diffstat (limited to 'linuxthreads')
-rw-r--r--linuxthreads/ChangeLog6
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h14
2 files changed, 14 insertions, 6 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 9dee60ff23..a7d422e837 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-06 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: New sequences for
+ 5+ arg syscalls only needed for PIC.
+ Patch by Ralph Siemsen <ralphs@netwinder.org>.
+
2003-06-05 Richard Henderson <rth@redhat.com>
* sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h (PSEUDO): Use
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index d2043aad91..92d8460e26 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -26,12 +26,14 @@
/* We push lr onto the stack, so we have to use ldmib instead of ldmia
to find the saved arguments. */
-#undef DOARGS_5
-#undef DOARGS_6
-#undef DOARGS_7
-#define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8];
-#define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5};
-#define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6};
+# ifdef PIC
+# undef DOARGS_5
+# undef DOARGS_6
+# undef DOARGS_7
+# define DOARGS_5 str r4, [sp, $-4]!; ldr r4, [sp, $8];
+# define DOARGS_6 mov ip, sp; stmfd sp!, {r4, r5}; ldmib ip, {r4, r5};
+# define DOARGS_7 mov ip, sp; stmfd sp!, {r4, r5, r6}; ldmib ip, {r4, r5, r6};
+# endif
# undef PSEUDO_RET
# define PSEUDO_RET \