From 1d2a0492040bf698f2644f217195c68bb293fb60 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 14 Jun 2014 15:04:16 +0200 Subject: [PATCH] m68k: Consolidate NPTL/non versions of clone --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/m68k/clone.S | 4 ---- sysdeps/unix/sysv/linux/m68k/nptl/clone.S | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/m68k/nptl/clone.S diff --git a/ChangeLog b/ChangeLog index bb46fd2..5c14adf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-06-14 Andreas Schwab + * 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 . diff --git a/sysdeps/unix/sysv/linux/m68k/clone.S b/sysdeps/unix/sysv/linux/m68k/clone.S index 764f572..e3480f6 100644 --- a/sysdeps/unix/sysv/linux/m68k/clone.S +++ b/sysdeps/unix/sysv/linux/m68k/clone.S @@ -22,9 +22,7 @@ #include #define _ERRNO_H 1 #include -#ifdef RESET_PID #include -#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 e7388fe..0000000 --- a/sysdeps/unix/sysv/linux/m68k/nptl/clone.S +++ /dev/null @@ -1,2 +0,0 @@ -#define RESET_PID -#include "../clone.S" -- 2.7.4