picnoir
/
glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update. 

2004-12-07  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/clone2.S (__clone2): Add support for
	NPTL where the PID is stored at userlevel and needs to be reset when
	CLONE_THREAD is not used.  Restore gp before calling _exit.
This commit is contained in:
Ulrich Drepper 2004-12-07 20:34:18 +00:00
parent 2da9a6a1a7
commit 484cc8018b
8 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-12-07 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/clone2.S (__clone2): Add support for
NPTL where the PID is stored at userlevel and needs to be reset when
CLONE_THREAD is not used. Restore gp before calling _exit.
2004-12-07 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/clone.S: Clear the frame pointer when

10
nptl/ChangeLog
View File

@ -1,3 +1,13 @@
2004-12-07 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ia64/tcb-offsets.sym (TID): Add.
* sysdeps/unix/sysv/linux/ia64/clone2.S: New file.
* Makefile (tests): Add tst-getpid2.
* tst-getpid1.c (TEST_CLONE_FLAGS): Define.
(do_test): Use it. Use __clone2 instead of clone on ia64.
* tst-getpid2.c: New test.
2004-12-07 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/clone.S: New file.

2
nptl/Makefile
View File

@ -241,7 +241,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 \
tst-backtrace1 \
tst-oddstacklimit \
tst-vfork1 tst-vfork2 tst-vfork1x tst-vfork2x \
tst-getpid1
tst-getpid1 tst-getpid2
xtests = tst-setuid1 tst-setuid1-static
# Files which must not be linked with libpthread.

1
nptl/sysdeps/ia64/tcb-offsets.sym
View File

@ -2,5 +2,6 @@
#include <tls.h>
PID offsetof (struct pthread, pid) - sizeof (struct pthread)
TID offsetof (struct pthread, tid) - sizeof (struct pthread)
MULTIPLE_THREADS_OFFSET offsetof (struct pthread, header.multiple_threads) - sizeof (struct pthread)
SYSINFO_OFFSET offsetof (tcbhead_t, private)

2
nptl/sysdeps/unix/sysv/linux/ia64/clone2.S Normal file
View File

@ -0,0 +1,2 @@
#define RESET_PID
#include <sysdeps/unix/sysv/linux/ia64/clone2.S>

14
nptl/tst-getpid1.c
View File

@ -5,6 +5,10 @@
#include <sys/types.h>
#include <sys/wait.h>
#ifndef TEST_CLONE_FLAGS
#define TEST_CLONE_FLAGS 0
#endif
static int sig;
static int
@ -35,8 +39,16 @@ do_test (void)
return 1;
}
#ifdef __ia64__
extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
size_t __child_stack_size, int __flags,
void *__arg, ...);
char st[256 * 1024];
pid_t p = __clone2 (f, st, sizeof (st), TEST_CLONE_FLAGS, 0);
#else
char st[128 * 1024];
pid_t p = clone (f, st + sizeof (st), 0, 0);
pid_t p = clone (f, st + sizeof (st), TEST_CLONE_FLAGS, 0);
#endif
if (p == -1)
{
printf("clone failed: %m\n");

2
nptl/tst-getpid2.c Normal file
View File

@ -0,0 +1,2 @@
#define TEST_CLONE_FLAGS CLONE_VM
#include "tst-getpid1.c"

25
sysdeps/unix/sysv/linux/ia64/clone2.S
View File

@ -30,7 +30,7 @@
ENTRY(__clone2)
.prologue
alloc r2=ar.pfs,8,0,6,0
alloc r2=ar.pfs,8,1,6,0
cmp.eq p6,p0=0,in0
mov r8=EINVAL
mov out0=in3 /* Flags are first syscall argument. */
@ -63,15 +63,34 @@ ENTRY(__clone2)
cmp.eq CHILD,PARENT=0,r8 /* Are we the child? */
(p6) br.cond.spnt.many __syscall_error
;;
(CHILD) ld8 out1=[in0],8 /* Retrieve code pointer. */
(CHILD) mov out0=in4 /* Pass proper argument to fn */
(CHILD) mov loc0=gp
(PARENT) ret
;;
#ifdef RESET_PID
tbit.nz p6,p0=in3,16 /* CLONE_THREAD */
tbit.z p7,p10=in3,8 /* CLONE_VM */
(p6) br.cond.dptk 1f
;;
mov r15=SYS_ify (getpid)
(p10) addl r8=-1,r0
(p7) break __BREAK_SYSCALL
;;
add r9=PID,r13
add r10=TID,r13
;;
st4 [r9]=r8
st4 [r10]=r8
;;
#endif
1: ld8 out1=[in0],8 /* Retrieve code pointer. */
mov out0=in4 /* Pass proper argument to fn */
;;
ld8 gp=[in0] /* Load function gp. */
mov b6=out1
br.call.dptk.many rp=b6 /* Call fn(arg) in the child */
;;
mov out0=r8 /* Argument to _exit */
mov gp=loc0
.globl HIDDEN_JUMPTARGET(_exit)
br.call.dpnt.many rp=HIDDEN_JUMPTARGET(_exit)
/* call _exit with result from fn. */