diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2014-06-14 15:04:16 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2014-06-14 21:37:49 +0200 |
| commit | 1d2a0492040bf698f2644f217195c68bb293fb60 (patch) | |
| tree | 4eb5d59cf4c504628ac172d3079e7f997271dc76 | |
| parent | 11b9e55b6768241150f31626eddacc4ee7737c4e (diff) | |
| download | glibc-1d2a0492040bf698f2644f217195c68bb293fb60.tar glibc-1d2a0492040bf698f2644f217195c68bb293fb60.tar.gz glibc-1d2a0492040bf698f2644f217195c68bb293fb60.tar.bz2 glibc-1d2a0492040bf698f2644f217195c68bb293fb60.zip | |
m68k: Consolidate NPTL/non versions of clone
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/clone.S | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/nptl/clone.S | 2 |
3 files changed, 4 insertions, 6 deletions
@@ -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>. diff --git a/sysdeps/unix/sysv/linux/m68k/clone.S b/sysdeps/unix/sysv/linux/m68k/clone.S index 764f572e89..e3480f6ccc 100644 --- a/sysdeps/unix/sysv/linux/m68k/clone.S +++ b/sysdeps/unix/sysv/linux/m68k/clone.S @@ -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 diff --git a/sysdeps/unix/sysv/linux/m68k/nptl/clone.S b/sysdeps/unix/sysv/linux/m68k/nptl/clone.S deleted file mode 100644 index e7388fee71..0000000000 --- a/sysdeps/unix/sysv/linux/m68k/nptl/clone.S +++ /dev/null @@ -1,2 +0,0 @@ -#define RESET_PID -#include "../clone.S" |