diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2014-06-14 14:47:09 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2014-06-14 21:37:34 +0200 |
| commit | 11b9e55b6768241150f31626eddacc4ee7737c4e (patch) | |
| tree | 8d9ddbaed909879d46b13ccc9b70d0789db14910 /sysdeps/unix/sysv/linux/m68k/vfork.S | |
| parent | 0f6901d0a14a99b1e7c741fe694d392a259cb361 (diff) | |
| download | glibc-11b9e55b6768241150f31626eddacc4ee7737c4e.tar.gz glibc-11b9e55b6768241150f31626eddacc4ee7737c4e.tar.xz glibc-11b9e55b6768241150f31626eddacc4ee7737c4e.zip | |
m68k: Consolidate NPTL/non versions of vfork
Diffstat (limited to 'sysdeps/unix/sysv/linux/m68k/vfork.S')
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/vfork.S | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/m68k/vfork.S b/sysdeps/unix/sysv/linux/m68k/vfork.S index 3745287cbf..30fa6289b7 100644 --- a/sysdeps/unix/sysv/linux/m68k/vfork.S +++ b/sysdeps/unix/sysv/linux/m68k/vfork.S @@ -20,14 +20,7 @@ #define _ERRNO_H 1 #include <bits/errno.h> #include <kernel-features.h> - -#ifndef SAVE_PID -#define SAVE_PID -#endif - -#ifndef RESTORE_PID -#define RESTORE_PID -#endif +#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 @@ -36,10 +29,17 @@ ENTRY (__vfork) - /* SAVE_PID clobbers call-clobbered registers and - saves data in D1 and A1. */ - - SAVE_PID + /* Save the TCB-cached PID away in %d1, and then negate the TCB + field. But if it's zero, set it to 0x80000000 instead. See + raise.c for the logic that relies on this value. */ + jbsr __m68k_read_tp@PLTPC + movel %a0, %a1 + movel PID_OFFSET(%a1), %d0 + movel %d0, %d1 + negl %d0 + jne 1f + movel #0x80000000, %d0 +1: movel %d0, PID_OFFSET(%a1) /* Pop the return PC value into A0. */ movel %sp@+, %a0 @@ -50,7 +50,13 @@ ENTRY (__vfork) movel #SYS_ify (vfork), %d0 trap #0 - RESTORE_PID + /* Restore the original value of the TCB cache of the PID, if we're + the parent. But in the child (syscall return value equals zero), + leave things as they are. */ + tstl %d0 + jeq 1f + movel %d1, PID_OFFSET(%a1) +1: tstl %d0 jmi .Lerror /* Branch forward if it failed. */ @@ -72,3 +78,4 @@ PSEUDO_END (__vfork) libc_hidden_def (__vfork) weak_alias (__vfork, vfork) +strong_alias (__vfork, __libc_vfork) |