From 83d7d24b966188e901600e2abf23ef819d847b22 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 25 Jun 2014 14:33:52 -0700 Subject: MicroBlaze: Consolidate NPTL/non versions of vfork --- sysdeps/unix/sysv/linux/microblaze/nptl/pt-vfork.S | 21 ---------- sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S | 45 ---------------------- sysdeps/unix/sysv/linux/microblaze/pt-vfork.S | 1 + sysdeps/unix/sysv/linux/microblaze/vfork.S | 45 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 66 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/microblaze/nptl/pt-vfork.S delete mode 100644 sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S create mode 100644 sysdeps/unix/sysv/linux/microblaze/pt-vfork.S create mode 100644 sysdeps/unix/sysv/linux/microblaze/vfork.S (limited to 'sysdeps/unix/sysv') diff --git a/sysdeps/unix/sysv/linux/microblaze/nptl/pt-vfork.S b/sysdeps/unix/sysv/linux/microblaze/nptl/pt-vfork.S deleted file mode 100644 index 603cf566cb..0000000000 --- a/sysdeps/unix/sysv/linux/microblaze/nptl/pt-vfork.S +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 2009-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 - 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 - . */ - -#include - -#include "vfork.S" diff --git a/sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S b/sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S deleted file mode 100644 index dfeb54a15e..0000000000 --- a/sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 2005-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 - 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 - . */ - -#include -#define _ERRNO_H 1 -#include -#include - -/* 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 - DO_CALL (vfork, 0) -#else - DO_CALL (fork, 0) -#endif - addik r12,r0,-4095 - cmpu r12,r12,r3 - bgei r12,SYSCALL_ERROR_LABEL - rtsd r15,8 - nop - -PSEUDO_END (__vfork) -libc_hidden_def (__vfork) - -weak_alias (__vfork, vfork) diff --git a/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S b/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S new file mode 100644 index 0000000000..65cc3823ac --- /dev/null +++ b/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S @@ -0,0 +1 @@ +#include diff --git a/sysdeps/unix/sysv/linux/microblaze/vfork.S b/sysdeps/unix/sysv/linux/microblaze/vfork.S new file mode 100644 index 0000000000..dfeb54a15e --- /dev/null +++ b/sysdeps/unix/sysv/linux/microblaze/vfork.S @@ -0,0 +1,45 @@ +/* Copyright (C) 2005-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 + 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 + . */ + +#include +#define _ERRNO_H 1 +#include +#include + +/* 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 + DO_CALL (vfork, 0) +#else + DO_CALL (fork, 0) +#endif + addik r12,r0,-4095 + cmpu r12,r12,r3 + bgei r12,SYSCALL_ERROR_LABEL + rtsd r15,8 + nop + +PSEUDO_END (__vfork) +libc_hidden_def (__vfork) + +weak_alias (__vfork, vfork) -- cgit v1.2.3