alpha: Merge standard and nptl clone.S

diff --git a/ChangeLog b/ChangeLog
index 689613e..83b3599 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-23  Richard Henderson  <rth@twiddle.net>
 
+       * sysdeps/unix/sysv/linux/alpha/clone.S: Deconditionalize the code
+       that was previously under [RESET_PID].
+       * sysdeps/unix/sysv/linux/alpha/nptl/clone.S: File removed.
+
        * sysdeps/unix/sysv/linux/alpha/nptl/fork.c: Remove file.
 
 2014-05-23  Joseph Myers  <joseph@codesourcery.com>

diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S
index c5c3300..f4e2e1c 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/clone.S
+++ b/sysdeps/unix/sysv/linux/alpha/clone.S
@@ -57,9 +57,7 @@ __clone:
        subq    a1, 32, a1
        stq     a0, 0(a1)
        stq     a3, 8(a1)
-#ifdef RESET_PID
        stq     a2, 16(a1)
-#endif
 
        /* The syscall is of the form clone(flags, usp, ptid, ctid, tls).
           Shift the flags, ptid, ctid, tls arguments into place; the
@@ -86,6 +84,7 @@ PSEUDO_END(__clone)
    its own function so that we can terminate the stack trace with our
    debug info.  */
 
+       .align  4
        .ent thread_start
        cfi_startproc
 thread_start:
@@ -93,14 +92,12 @@ thread_start:
        cfi_def_cfa_register(fp)
        cfi_undefined(ra)
 
-#ifdef RESET_PID
        /* Check and see if we need to reset the PID.  */
        ldq     t0, 16(sp)
        lda     t1, CLONE_THREAD
        and     t0, t1, t2
        beq     t2, 2f
 1:
-#endif
 
        /* Load up the arguments.  */
        ldq     pv, 0(sp)
@@ -120,9 +117,10 @@ thread_start:
 #endif
 
        /* Die horribly.  */
+       .align  4
        halt
 
-#ifdef RESET_PID
+       .align  4
 2:
        rduniq
        lda     t1, CLONE_VM
@@ -136,7 +134,6 @@ thread_start:
        stl     v0, PID_OFFSET(s0)
        stl     v0, TID_OFFSET(s0)
        br      1b
-#endif
        cfi_endproc
        .end thread_start
 

diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/clone.S b/sysdeps/unix/sysv/linux/alpha/nptl/clone.S
deleted file mode 100644 (file)
index 675a997..0000000
--- a/sysdeps/unix/sysv/linux/alpha/nptl/clone.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/* We want an #include_next, but we are the main source file.
-   So, #include ourselves and in that incarnation we can use #include_next.  */
-#ifndef INCLUDED_SELF
-# define INCLUDED_SELF
-# include <clone.S>
-#else
-# define RESET_PID
-# include_next <clone.S>
-#endif