diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/ChangeLog | 2 | ||||
| -rw-r--r-- | nptl/sysdeps/i386/tcb-offsets.sym | 1 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/vfork.S | 73 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S | 31 | ||||
| -rw-r--r-- | nptl/sysdeps/x86_64/tcb-offsets.sym | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/vfork.S | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/vfork.S | 8 |
8 files changed, 67 insertions, 64 deletions
@@ -1,5 +1,10 @@ 2004-03-08 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/i386/vfork.S: If SAVE_PID and + RESTORE_PID are defined, use it. + * sysdeps/unix/sysv/linux/x86_64/vfork.S: Likewise. + * sysdeps/posix/gai_strerror.c: Add error string for EAI_IDN_ENCODE. * Makerules: Use extra-modules.mk if modules-names is defined. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 4d44b67d0b..793349126e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,7 +1,9 @@ 2004-03-08 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/tcb-offsets.sym: Add PID. + * sysdeps/x86_64/tcb-offsets.sym: Likewise. * sysdeps/unix/sysv/linux/i386/vfork.S: New file. + * sysdeps/unix/sysv/linux/x86_64/vfork.S: New file. 2004-03-08 Steven Munroe <sjmunroe@us.ibm.com> diff --git a/nptl/sysdeps/i386/tcb-offsets.sym b/nptl/sysdeps/i386/tcb-offsets.sym index a83c3c9a9b..4e0444ba38 100644 --- a/nptl/sysdeps/i386/tcb-offsets.sym +++ b/nptl/sysdeps/i386/tcb-offsets.sym @@ -3,6 +3,7 @@ RESULT offsetof (struct pthread, result) TID offsetof (struct pthread, tid) +PID offsetof (struct pthread, pid) CANCELHANDLING offsetof (struct pthread, cancelhandling) CLEANUP_JMP_BUF offsetof (struct pthread, cleanup_jmp_buf) MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads) diff --git a/nptl/sysdeps/unix/sysv/linux/i386/vfork.S b/nptl/sysdeps/unix/sysv/linux/i386/vfork.S index 787453427b..2b60a5ea5e 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/vfork.S +++ b/nptl/sysdeps/unix/sysv/linux/i386/vfork.S @@ -1,6 +1,5 @@ /* Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Andreas Schwab <schwab@gnu.org>. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,71 +16,19 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <sysdep.h> -#define _ERRNO_H 1 -#include <bits/errno.h> -#include <kernel-features.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 - - /* Pop the return PC value into ECX. */ - popl %ecx - - /* Save the PID value. */ - movl %gs:PID, %edx +/* Save the PID value. */ +#define SAVE_PID \ + movl %gs:PID, %edx; \ movl $-1, %gs:PID - /* Stuff the syscall number in EAX and enter into the kernel. */ - movl $SYS_ify (vfork), %eax - int $0x80 - - /* Jump to the return PC. Don't jump directly since this - disturbs the branch target cache. Instead push the return - address back on the stack. */ - pushl %ecx - - /* Restore the old PID value in the parent. In the child store 0. */ - testl %eax, %eax - je 1f - movl %edx, %gs:PID - -1: cmpl $-4095, %eax - /* Branch forward if it failed. */ -# ifdef __ASSUME_VFORK_SYSCALL - jae SYSCALL_ERROR_LABEL -.Lpseudo_end: -# else - jae .Lerror -# endif - ret - -# ifndef __ASSUME_VFORK_SYSCALL -.Lerror: - /* Check if vfork syscall is known at all. */ - cmpl $-ENOSYS, %eax - jne SYSCALL_ERROR_LABEL -# endif -#endif - -#ifndef __ASSUME_VFORK_SYSCALL - /* If we don't have vfork, fork is close enough. */ +/* Restore the old PID value in the parent. In the child store 0. */ +#define RESTORE_PID \ + testl %eax, %eax; \ + je 1f; \ + movl %edx, %gs:PID; \ +1: - movl $SYS_ify (fork), %eax - int $0x80 - cmpl $-4095, %eax - jae SYSCALL_ERROR_LABEL -.Lpseudo_end: - ret -#endif -PSEUDO_END (__vfork) -libc_hidden_def (__vfork) -weak_alias (__vfork, vfork) +#include <sysdeps/unix/sysv/linux/i386/vfork.S> diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S b/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S new file mode 100644 index 0000000000..9e348683f3 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/vfork.S @@ -0,0 +1,31 @@ +/* Copyright (C) 2004 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 + 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <tcb-offsets.h> + +#define SAVE_PID \ + movl %fs:PID, %esi; \ + movl $-1, %fs:PID + +#define RESTORE_PID \ + testq %rax, %rax; \ + je 1f; \ + movl %esi, %fs:PID; \ +1: + +#include <sysdeps/unix/sysv/linux/x86_64/vfork.S> diff --git a/nptl/sysdeps/x86_64/tcb-offsets.sym b/nptl/sysdeps/x86_64/tcb-offsets.sym index f91dd39703..8118d2df8b 100644 --- a/nptl/sysdeps/x86_64/tcb-offsets.sym +++ b/nptl/sysdeps/x86_64/tcb-offsets.sym @@ -3,6 +3,7 @@ RESULT offsetof (struct pthread, result) TID offsetof (struct pthread, tid) +PID offsetof (struct pthread, pid) CANCELHANDLING offsetof (struct pthread, cancelhandling) CLEANUP_JMP_BUF offsetof (struct pthread, cleanup_jmp_buf) CLEANUP offsetof (struct pthread, cleanup) diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S index e1f6df0998..e660e6b70e 100644 --- a/sysdeps/unix/sysv/linux/i386/vfork.S +++ b/sysdeps/unix/sysv/linux/i386/vfork.S @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Schwab <schwab@gnu.org>. @@ -34,6 +34,10 @@ ENTRY (__vfork) /* Pop the return PC value into ECX. */ popl %ecx +#ifdef SAVE_PID + SAVE_PID +#endif + /* Stuff the syscall number in EAX and enter into the kernel. */ movl $SYS_ify (vfork), %eax int $0x80 @@ -43,6 +47,10 @@ ENTRY (__vfork) address back on the stack. */ pushl %ecx +#ifdef RESTORE_PID + RESTORE_PID +#endif + cmpl $-4095, %eax /* Branch forward if it failed. */ # ifdef __ASSUME_VFORK_SYSCALL diff --git a/sysdeps/unix/sysv/linux/x86_64/vfork.S b/sysdeps/unix/sysv/linux/x86_64/vfork.S index 193b0bdff6..4bad38892b 100644 --- a/sysdeps/unix/sysv/linux/x86_64/vfork.S +++ b/sysdeps/unix/sysv/linux/x86_64/vfork.S @@ -32,6 +32,10 @@ ENTRY (__vfork) popq %rdi cfi_adjust_cfa_offset(-8) +#ifdef SAVE_PID + SAVE_PID +#endif + /* Stuff the syscall number in RAX and enter into the kernel. */ movl $SYS_ify (vfork), %eax syscall @@ -40,6 +44,10 @@ ENTRY (__vfork) pushq %rdi cfi_adjust_cfa_offset(8) +#ifdef RESTORE_PID + RESTORE_PID +#endif + cmpl $-4095, %eax jae SYSCALL_ERROR_LABEL /* Branch forward if it failed. */ |