lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

m68k: Consolidate NPTL/non versions of clone

Browse Source
This commit is contained in:
Andreas Schwab
2014-06-14 15:04:16 +02:00
parent 11b9e55b67
commit 1d2a049204
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2014-06-14 Andreas Schwab <schwab@linux-m68k.org> 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/pt-vfork.c: New file.
* sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S: Remove file. * sysdeps/unix/sysv/linux/m68k/nptl/pt-vfork.S: Remove file.
* sysdeps/unix/sysv/linux/m68k/vfork.S: Include <tcb-offsets.h>. * sysdeps/unix/sysv/linux/m68k/vfork.S: Include <tcb-offsets.h>.

4
sysdeps/unix/sysv/linux/m68k/clone.S
View File

@ -22,9 +22,7 @@
#include <sysdep.h> #include <sysdep.h>
#define _ERRNO_H 1 #define _ERRNO_H 1
#include <bits/errno.h> #include <bits/errno.h>
#ifdef RESET_PID
#include <tls.h> #include <tls.h>
#endif
#define CLONE_VM 0x00000100 #define CLONE_VM 0x00000100
#define CLONE_THREAD 0x00010000 #define CLONE_THREAD 0x00010000
@ -101,7 +99,6 @@ thread_start:
cfi_startproc cfi_startproc
cfi_undefined (pc) /* Mark end of stack */ cfi_undefined (pc) /* Mark end of stack */
subl %fp, %fp /* terminate the stack frame */ subl %fp, %fp /* terminate the stack frame */
#ifdef RESET_PID
/* Check and see if we need to reset the PID. */ /* Check and see if we need to reset the PID. */
movel %d1, %a1 movel %d1, %a1
andl #CLONE_THREAD, %d1 andl #CLONE_THREAD, %d1
@ -121,7 +118,6 @@ gotpid:
movel %d0, TID_OFFSET(%a0) movel %d0, TID_OFFSET(%a0)
movel (%sp)+, %a0 movel (%sp)+, %a0
donepid: donepid:
#endif
jsr (%a0) jsr (%a0)
movel %d0, %d1 movel %d0, %d1
movel #SYS_ify (exit), %d0 movel #SYS_ify (exit), %d0

2
sysdeps/unix/sysv/linux/m68k/nptl/clone.S
View File

@ -1,2 +0,0 @@
#define RESET_PID
#include "../clone.S"