mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
m68k: Consolidate NPTL/non versions of clone
This commit is contained in:
parent
11b9e55b67
commit
1d2a049204
@ -1,5 +1,9 @@
|
||||
2014-06-14 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/m68k/clone.S: Deconditionalize the code
|
||||
that was previously under [RESET_PID].
|
||||
* sysdeps/unix/sysv/linux/m68k/nptl/clone.S: Remove file.
|
||||
|
||||
* 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>.
|
||||
|
@ -22,9 +22,7 @@
|
||||
#include <sysdep.h>
|
||||
#define _ERRNO_H 1
|
||||
#include <bits/errno.h>
|
||||
#ifdef RESET_PID
|
||||
#include <tls.h>
|
||||
#endif
|
||||
|
||||
#define CLONE_VM 0x00000100
|
||||
#define CLONE_THREAD 0x00010000
|
||||
@ -101,7 +99,6 @@ thread_start:
|
||||
cfi_startproc
|
||||
cfi_undefined (pc) /* Mark end of stack */
|
||||
subl %fp, %fp /* terminate the stack frame */
|
||||
#ifdef RESET_PID
|
||||
/* Check and see if we need to reset the PID. */
|
||||
movel %d1, %a1
|
||||
andl #CLONE_THREAD, %d1
|
||||
@ -121,7 +118,6 @@ gotpid:
|
||||
movel %d0, TID_OFFSET(%a0)
|
||||
movel (%sp)+, %a0
|
||||
donepid:
|
||||
#endif
|
||||
jsr (%a0)
|
||||
movel %d0, %d1
|
||||
movel #SYS_ify (exit), %d0
|
||||
|
@ -1,2 +0,0 @@
|
||||
#define RESET_PID
|
||||
#include "../clone.S"
|
Loading…
Reference in New Issue
Block a user