AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate sparc clone, fork, and vfork implementations.

Browse Source 
* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Delete.
	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S: Delete.
	* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Moved ...
	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: ... here.
	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Delete.
	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S: Delete.
	* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Moved ...
	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: ... here.
	* sysdeps/unix/sysv/linux/sparc/fork.S: Delete.
	* sysdeps/unix/sysv/linux/sparc/pt-vfork.S: New file.
	* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__thread_start):
	Remove RESET_PID cpp guards.
	* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (__thread_start):
	Remove RESET_PID cpp guards.
	* sysdeps/unix/sysv/linux/sparc/vfork.S: Delete.
This commit is contained in:
David S. Miller 2014-06-13 14:41:58 -07:00
parent f5d71e140d
commit f6fdf53382
12 changed files with 21 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2014-06-13 David S. Miller <davem@davemloft.net>
* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Delete.
* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S: Delete.
* nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Moved ...
* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: ... here.
* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Delete.
* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S: Delete.
* nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Moved ...
* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: ... here.
* sysdeps/unix/sysv/linux/sparc/fork.S: Delete.
* sysdeps/unix/sysv/linux/sparc/pt-vfork.S: New file.
* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S (__thread_start):
Remove RESET_PID cpp guards.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S (__thread_start):
Remove RESET_PID cpp guards.
* sysdeps/unix/sysv/linux/sparc/vfork.S: Delete.
2014-06-13 Andreas Schwab <schwab@linux-m68k.org> 2014-06-13 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_UNWINDS, _jmpbuf_sp): Cast * sysdeps/m68k/jmpbuf-unwind.h (_JMPBUF_UNWINDS, _jmpbuf_sp): Cast

9
nptl/sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
View File

@ -1,9 +0,0 @@
/* We want an #include_next, but we are the main source file.
So, #include ourselves and in that incarnation we can use #include_next. */
#ifndef INCLUDED_SELF
# define INCLUDED_SELF
# include <clone.S>
#else
# define RESET_PID
# include_next <clone.S>
#endif

44
nptl/sysdeps/unix/sysv/linux/sparc/sparc32/pt-vfork.S
View File

@ -1,44 +0,0 @@
/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
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 <sysdep.h>
#include <tcb-offsets.h>
.text
.globl __syscall_error
ENTRY(__vfork)
ld [%g7 + PID], %o5
sub %g0, %o5, %o4
st %o4, [%g7 + PID]
LOADSYSCALL(vfork)
ta 0x10
bcc 2f
mov %o7, %g1
st %o5, [%g7 + PID]
call __syscall_error
mov %g1, %o7
2: sub %o1, 1, %o1
andcc %o0, %o1, %o0
bne,a 1f
st %o5, [%g7 + PID]
1: retl
nop
END(__vfork)
weak_alias (__vfork, vfork)

9
nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
View File

@ -1,9 +0,0 @@
/* We want an #include_next, but we are the main source file.
So, #include ourselves and in that incarnation we can use #include_next. */
#ifndef INCLUDED_SELF
# define INCLUDED_SELF
# include <clone.S>
#else
# define RESET_PID
# include_next <clone.S>
#endif

44
nptl/sysdeps/unix/sysv/linux/sparc/sparc64/pt-vfork.S
View File

@ -1,44 +0,0 @@
/* Copyright (C) 2004-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
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 <sysdep.h>
#include <tcb-offsets.h>
.text
.globl __syscall_error
ENTRY(__vfork)
ld [%g7 + PID], %o5
sub %g0, %o5, %o4
st %o4, [%g7 + PID]
LOADSYSCALL(vfork)
ta 0x6d
bcc,pt %xcc, 2f
mov %o7, %g1
st %o5, [%g7 + PID]
call __syscall_error
mov %g1, %o7
2: sub %o1, 1, %o1
andcc %o0, %o1, %o0
bne,a,pt %icc, 1f
st %o5, [%g7 + PID]
1: retl
nop
END(__vfork)
weak_alias (__vfork, vfork)

29
sysdeps/unix/sysv/linux/sparc/fork.S
View File

@ -1,29 +0,0 @@
/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, 1997.
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 <sysdep.h>
PSEUDO (__libc_fork, fork, 0)
sub %o1, 1, %o1
retl
and %o0, %o1, %o0
PSEUDO_END (__libc_fork)
weak_alias (__libc_fork, __fork)
libc_hidden_def (__fork)
weak_alias (__libc_fork, fork)

1
sysdeps/unix/sysv/linux/sparc/pt-vfork.S Normal file
View File

@ -0,0 +1 @@
#include <sysdeps/unix/sysv/linux/alpha/pt-vfork.S>

2
sysdeps/unix/sysv/linux/sparc/sparc32/clone.S
View File

@ -80,7 +80,6 @@ END(__clone)
.type __thread_start,@function .type __thread_start,@function
__thread_start: __thread_start:
#ifdef RESET_PID
sethi %hi(CLONE_THREAD), %l0 sethi %hi(CLONE_THREAD), %l0
andcc %g4, %l0, %g0 andcc %g4, %l0, %g0
bne 1f bne 1f
@ -93,7 +92,6 @@ __thread_start:
st %o0,[%g7 + PID] st %o0,[%g7 + PID]
st %o0,[%g7 + TID] st %o0,[%g7 + TID]
1: 1:
#endif
mov %g0, %fp /* terminate backtrace */ mov %g0, %fp /* terminate backtrace */
call %g2 call %g2
mov %g3,%o0 mov %g3,%o0

1
nptl/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S → sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
View File

@ -46,3 +46,4 @@ END(__vfork)
libc_hidden_def (__vfork) libc_hidden_def (__vfork)
weak_alias (__vfork, vfork) weak_alias (__vfork, vfork)
strong_alias (__vfork, __libc_vfork)

2
sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
View File

@ -77,7 +77,6 @@ END(__clone)
.type __thread_start,@function .type __thread_start,@function
__thread_start: __thread_start:
#ifdef RESET_PID
sethi %hi(CLONE_THREAD), %l0 sethi %hi(CLONE_THREAD), %l0
andcc %g4, %l0, %g0 andcc %g4, %l0, %g0
bne,pt %icc, 1f bne,pt %icc, 1f
@ -89,7 +88,6 @@ __thread_start:
2: st %o0,[%g7 + PID] 2: st %o0,[%g7 + PID]
st %o0,[%g7 + TID] st %o0,[%g7 + TID]
1: 1:
#endif
mov %g0, %fp /* terminate backtrace */ mov %g0, %fp /* terminate backtrace */
call %g2 call %g2
mov %g3,%o0 mov %g3,%o0

1
nptl/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S → sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
View File

@ -46,3 +46,4 @@ END(__vfork)
libc_hidden_def (__vfork) libc_hidden_def (__vfork)
weak_alias (__vfork, vfork) weak_alias (__vfork, vfork)
strong_alias (__vfork, __libc_vfork)

28
sysdeps/unix/sysv/linux/sparc/vfork.S
View File

@ -1,28 +0,0 @@
/* Copyright (C) 1999-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
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 <sysdep.h>
PSEUDO (__vfork, vfork, 0)
sub %o1, 1, %o1
retl
and %o0, %o1, %o0
PSEUDO_END (__vfork)
libc_hidden_def (__vfork)
weak_alias (__vfork, vfork)