diff options
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 10 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h | 2 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 79e9be1874..9e34a9768e 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2004-11-18 Daniel Jacobowitz <dan@codesourcery.com> + + * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Update RETINSTR use. + * sysdeps/unix/sysv/linux/arm/vfork.S: Likewise. + 2004-12-01 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_CPUTIME, @@ -22,11 +27,6 @@ These are now handled by generic magic from libpthread-static-only-routines being set. -2004-11-04 Roland McGrath <roland@redhat.com> - - * sysdeps/pthread/getcpuclockid.c (pthread_getcpuclockid) - [__NR_clock_getres]: Use kernel-supplied CPU clocks if available. - 2004-11-27 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/bits/posix_opt.h (_POSIX_PRIORITIZED_IO, diff --git a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h index 92d8460e26..019bd54913 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h @@ -112,7 +112,7 @@ extern int __local_multiple_threads attribute_hidden; # define MAYBE_SAVE_LR \ str lr, [sp, $-4]!; # define PSEUDO_RET_MOV \ - RETINSTR(movcc, pc, lr); \ + RETINSTR(cc, lr); \ b PLTJMP(SYSCALL_ERROR) # define PSEUDO_PROLOGUE # else diff --git a/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S b/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S index 23687342d1..2708c701eb 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S +++ b/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S @@ -46,7 +46,7 @@ ENTRY (__vfork) swi __NR_vfork cmn a1, #4096 - RETINSTR(movcc, pc, lr) + RETINSTR(cc, lr) #ifndef __ASSUME_VFORK_SYSCALL /* Check if vfork syscall is known at all. */ @@ -60,7 +60,7 @@ ENTRY (__vfork) /* If we don't have vfork, fork is close enough. */ swi __NR_fork cmn a1, #4096 - RETINSTR(movcc, pc, lr) + RETINSTR(cc, lr) #elif !defined __NR_vfork # error "__NR_vfork not available and __ASSUME_VFORK_SYSCALL defined" #endif |