From: Roland McGrath Date: Sat, 4 Dec 2004 21:20:30 +0000 (+0000) Subject: 2004-11-18 Daniel Jacobowitz X-Git-Tag: glibc-2.16-ports-before-merge~1089 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db87dc9e2a1f66270f3164384cfcc4e41f9731e;p=thirdparty%2Fglibc.git 2004-11-18 Daniel Jacobowitz * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Update RETINSTR use. * sysdeps/unix/sysv/linux/arm/vfork.S: Likewise. --- diff --git a/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h index 92d8460e26b..019bd549139 100644 --- a/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/arm/linuxthreads/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/sysdeps/unix/sysv/linux/arm/linuxthreads/vfork.S b/sysdeps/unix/sysv/linux/arm/linuxthreads/vfork.S index 23687342d1e..2708c701eb2 100644 --- a/sysdeps/unix/sysv/linux/arm/linuxthreads/vfork.S +++ b/sysdeps/unix/sysv/linux/arm/linuxthreads/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