m68k: Consolidate NPTL/non versions of vfork
This commit is contained in:
Andreas Schwab
parent
0f6901d0a1
commit
11b9e55b67
|
|
@ -1,3 +1,12 @@
|
|||
2014-06-14 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/m68k/pt-vfork.c: New file.
|
||||
* sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S: Remove file.
|
||||
* sysdeps/unix/sysv/linux/m68k/vfork.S: Include <tcb-offsets.h>.
|
||||
(__vfork): Incorporate save/restore of PID from nptl/vfork.S here.
|
||||
(__libc_vfork): New strong alias.
|
||||
* sysdeps/unix/sysv/linux/m68k/nptl/vfork.S: Remove file.
|
||||
|
||||
2014-06-14 Andi Kleen <ak@linux.intel.com>
|
||||
|
||||
* sysdeps/generic/elide.h: New file.
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
/* Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library. If not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <tcb-offsets.h>
|
||||
|
||||
#define SAVE_PID \
|
||||
bsrl __m68k_read_tp@PLTPC ; /* Get the thread pointer. */ \
|
||||
movel %a0, %a1 ; /* Save TP for RESTORE_PID. */ \
|
||||
movel PID_OFFSET(%a1), %d0 ; /* Get the PID. */ \
|
||||
movel %d0, %d1 ; /* Save PID for RESTORE_PID. */ \
|
||||
negl %d0 ; /* Negate the PID. */ \
|
||||
movel %d0, PID_OFFSET(%a1) ; /* Store the temporary PID. */
|
||||
|
||||
#define RESTORE_PID \
|
||||
tstl %d0 ; \
|
||||
beq 1f ; /* If we are the parent... */ \
|
||||
movel %d1, PID_OFFSET(%a1) ; /* Restore the PID. */ \
|
||||
1:
|
||||
|
||||
#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
/* Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with the GNU C Library. If not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <tcb-offsets.h>
|
||||
|
||||
#define SAVE_PID \
|
||||
bsrl __m68k_read_tp@PLTPC ; /* Get the thread pointer. */ \
|
||||
movel %a0, %a1 ; /* Save TP for RESTORE_PID. */ \
|
||||
movel PID_OFFSET(%a1), %d0 ; /* Get the PID. */ \
|
||||
movel %d0, %d1 ; /* Save PID for RESTORE_PID. */ \
|
||||
negl %d0 ; /* Negate the PID. */ \
|
||||
bne 1f ; /* If it was zero... */ \
|
||||
movel #0x80000000, %d0 ; /* use 0x80000000 instead. */ \
|
||||
1: movel %d0, PID_OFFSET(%a1) ; /* Store the temporary PID. */
|
||||
|
||||
#define RESTORE_PID \
|
||||
tstl %d0 ; \
|
||||
beq 1f ; /* If we are the parent... */ \
|
||||
movel %d1, PID_OFFSET(%a1) ; /* Restore the PID. */ \
|
||||
1:
|
||||
|
||||
#include <sysdeps/unix/sysv/linux/m68k/vfork.S>
|
||||
|
|
@ -0,0 +1 @@
|
|||
#include <sysdeps/unix/sysv/linux/aarch64/pt-vfork.c>
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue