clone: make clone a wrapper around __clone

The architecture-specific assembly versions of clone did not set errno on
failure, which is inconsistent with glibc.  __clone still returns the error
via its return value, and clone is now a wrapper that sets errno as needed.
The public clone has also been moved to src/linux, as it's not directly
related to the pthreads API.

__clone is called by pthread_create, which does not report errors via
errno.  Though not strictly necessary, it's nice to avoid clobbering errno
here.

diff --git a/src/linux/clone.c b/src/linux/clone.c
new file mode 100644 (file)
index 0000000..b9e5594
--- /dev/null
+++ b/src/linux/clone.c
@@ -0,0 +1,19 @@
+#include <stdarg.h>
+#include <unistd.h>
+#include "pthread_impl.h"
+#include "syscall.h"
+
+int clone(int (*func)(void *), void *stack, int flags, void *arg, ...)
+{
+       va_list ap;
+       pid_t *ptid, *ctid;
+       void  *tls;
+
+       va_start(ap, arg);
+       ptid = va_arg(ap, pid_t *);
+       tls  = va_arg(ap, void *);
+       ctid = va_arg(ap, pid_t *);
+       va_end(ap);
+
+       return __syscall_ret(__clone(func, stack, flags, arg, ptid, tls, ctid));
+}

diff --git a/src/thread/arm/clone.s b/src/thread/arm/clone.s
index daf8f5562ab3568422da38b3b98206ac12ce31fb..d146999bda7bc3f86b1ebc5e20f9b334d17f350c 100644 (file)
--- a/src/thread/arm/clone.s
+++ b/src/thread/arm/clone.s
@@ -1,10 +1,7 @@
 .text
 .global __clone
-.weak clone
 .type   __clone,%function
-.type   clone,%function
 __clone:
-clone:
        stmfd sp!,{r4,r5,r6,r7}
        mov r7,#120
        mov r6,r3

diff --git a/src/thread/clone.c b/src/thread/clone.c
index 339e28a3fe6fb2b12c41921183dd08c819aa8018..be80c8ea4800d58f50526b842d864bb2e2e0804e 100644 (file)
--- a/src/thread/clone.c
+++ b/src/thread/clone.c
@@ -1,10 +1,7 @@
 #include <errno.h>
-#include "libc.h"
+#include "pthread_impl.h"
 
 int __clone(int (*func)(void *), void *stack, int flags, void *arg, ...)
 {
-       errno = ENOSYS;
-       return -1;
+       return -ENOSYS;
 }
-
-weak_alias(__clone, clone);

diff --git a/src/thread/i386/clone.s b/src/thread/i386/clone.s
index bebf01a3a16f03df03831e78bb7ff662cdcf8606..52fe7efbd442ca561bc9ddac05216433c9665a45 100644 (file)
--- a/src/thread/i386/clone.s
+++ b/src/thread/i386/clone.s
@@ -1,10 +1,7 @@
 .text
 .global __clone
-.weak clone
 .type   __clone,@function
-.type   clone,@function
 __clone:
-clone:
        push %ebp
        mov %esp,%ebp
        push %ebx

diff --git a/src/thread/microblaze/clone.s b/src/thread/microblaze/clone.s
index 030a9c314e717735b1e0982017e48c950805a047..13448a33a81acb005ceb61ddf4ec462a6dcb396d 100644 (file)
--- a/src/thread/microblaze/clone.s
+++ b/src/thread/microblaze/clone.s
@@ -1,14 +1,11 @@
 .global __clone
-.weak clone
 .type   __clone,@function
-.type   clone,@function
 
 # r5, r6, r7, r8, r9, r10, stack
 # fn, st, fl, ar, pt, tl, ct
 # fl, st, __, pt, ct, tl
 
 __clone:
-clone:
        andi    r6, r6, -16
        addi    r6, r6, -16
        swi     r5, r6, 0
@@ -23,7 +20,7 @@ clone:
        beqi    r3, 1f
        rtsd    r15, 8
        nop
-       
+
 1:     lwi     r3, r1, 0
        lwi     r5, r1, 4
        brald   r15, r3

diff --git a/src/thread/x86_64/clone.s b/src/thread/x86_64/clone.s
index 4db081cd26f17c3de3e655c08d9586cce1e17220..ee59903a2e336d2049c876e3bce7d78c1975dfe4 100644 (file)
--- a/src/thread/x86_64/clone.s
+++ b/src/thread/x86_64/clone.s
@@ -1,10 +1,7 @@
 .text
 .global __clone
-.weak clone
 .type   __clone,@function
-.type   clone,@function
 __clone:
-clone:
        xor %eax,%eax
        mov $56,%al
        mov %rdi,%r11