diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-06-02 14:29:19 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-06-02 14:29:19 -0700 |
| commit | d936d379eb1837c35e390b6293f15f75b634db6e (patch) | |
| tree | 1f6f5f4a4baee13fa98cf504ae97d97f49263548 /sysdeps/unix/sysv/linux/sh | |
| parent | 9fa76613d0df2a23e2b979e2303b12d617d6729d (diff) | |
| download | glibc-d936d379eb1837c35e390b6293f15f75b634db6e.tar.gz glibc-d936d379eb1837c35e390b6293f15f75b634db6e.tar.xz glibc-d936d379eb1837c35e390b6293f15f75b634db6e.zip | |
SH: Consolidate NPTL/non versions of vfork
Diffstat (limited to 'sysdeps/unix/sysv/linux/sh')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/pt-vfork.S | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/vfork.S | 61 |
2 files changed, 33 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/sh/pt-vfork.S b/sysdeps/unix/sysv/linux/sh/pt-vfork.S new file mode 100644 index 0000000000..65cc3823ac --- /dev/null +++ b/sysdeps/unix/sysv/linux/sh/pt-vfork.S @@ -0,0 +1 @@ +#include <sysdeps/unix/sysv/linux/alpha/pt-vfork.S> diff --git a/sysdeps/unix/sysv/linux/sh/vfork.S b/sysdeps/unix/sysv/linux/sh/vfork.S index 436e4fb491..76326f5048 100644 --- a/sysdeps/unix/sysv/linux/sh/vfork.S +++ b/sysdeps/unix/sysv/linux/sh/vfork.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999-2014 Free Software Foundation, Inc. +/* Copyright (C) 2004-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -18,53 +18,56 @@ #include <sysdep.h> #define _ERRNO_H 1 #include <bits/errno.h> +#include <tcb-offsets.h> /* Clone the calling process, but without copying the whole address space. The calling process is suspended until the new process exits or is replaced by a call to `execve'. Return -1 for errors, 0 to the new process, and the process ID of the new process to the old process. */ -ENTRY (__vfork) - -#ifdef __NR_vfork - mov.w .L3, r3 - trapa #0x10 - mov r0, r1 - mov #-12, r2 - shad r2, r1 - not r1, r1 // r1=0 means r0 = -1 to -4095 - tst r1, r1 // i.e. error in linux +ENTRY (__libc_vfork) + /* Save the PID value. */ + stc gbr, r2 + mov.w .L2, r0 + mov.l @(r0,r2), r4 + neg r4, r1 + tst r1, r1 bf 1f - mov.w .L1, r1 - cmp/eq r1, r0 - bt 2f - bra .Lsyscall_error - nop -.L1: - .word -ENOSYS -.L3: .word __NR_vfork + mov #1, r1 + rotr r1 1: - rts - nop -2: -#endif + mov.l r1, @(r0,r2) - /* If we don't have vfork, fork is close enough. */ - mov #+__NR_fork, r3 + mov.w .L1, r3 trapa #0x10 mov r0, r1 + + /* Restore the old PID value in the parent. */ + tst r0, r0 + bt.s 2f + stc gbr, r2 + mov.w .L2, r0 + mov.l r4, @(r0,r2) + mov r1, r0 +2: mov #-12, r2 shad r2, r1 not r1, r1 // r1=0 means r0 = -1 to -4095 tst r1, r1 // i.e. error in linux bf .Lpseudo_end -.Lsyscall_error: SYSCALL_ERROR_HANDLER .Lpseudo_end: rts nop +.L1: + .word __NR_vfork +.L2: + .word PID - TLS_PRE_TCB_SIZE + .align 2 +PSEUDO_END (__libc_vfork) -PSEUDO_END (__vfork) +#if !NOT_IN_libc +weak_alias (__libc_vfork, vfork) +strong_alias (__libc_vfork, __vfork) libc_hidden_def (__vfork) - -weak_alias (__vfork, vfork) +#endif |