From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 11 Sep 2018 19:26:51 +0000 (-0400)
Subject: remove __vfork alias
X-Git-Tag: v1.1.21~106
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ced75472d7e3d73d5b057e36ccbc7b7fcba95104;p=oweals%2Fmusl.git

remove __vfork alias

this was added so that posix_spawn and possibly other functionality
could be implemented in terms of vfork, but that turned out to be
unsafe. any such usage needs __clone with proper handling of stack
lifetime.
---

diff --git a/src/process/arm/vfork.s b/src/process/arm/vfork.s
index ed1f87a6..d7ec41b3 100644
--- a/src/process/arm/vfork.s
+++ b/src/process/arm/vfork.s
@@ -1,9 +1,6 @@
 .syntax unified
-.global __vfork
-.weak vfork
-.type __vfork,%function
+.global vfork
 .type vfork,%function
-__vfork:
 vfork:
 	mov ip, r7
 	mov r7, 190
diff --git a/src/process/i386/vfork.s b/src/process/i386/vfork.s
index a3d76ae6..3d0e6d6b 100644
--- a/src/process/i386/vfork.s
+++ b/src/process/i386/vfork.s
@@ -1,8 +1,5 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
+.global vfork
 .type vfork,@function
-__vfork:
 vfork:
 	pop %edx
 	mov $190,%eax
diff --git a/src/process/s390x/vfork.s b/src/process/s390x/vfork.s
index 2fb4022a..744f9d78 100644
--- a/src/process/s390x/vfork.s
+++ b/src/process/s390x/vfork.s
@@ -1,8 +1,5 @@
-	.global __vfork
-	.weak vfork
-	.type __vfork,%function
+	.global vfork
 	.type vfork,%function
-__vfork:
 vfork:
 	svc 190
 	.hidden __syscall_ret
diff --git a/src/process/sh/vfork.s b/src/process/sh/vfork.s
index 48cc9396..91dbde7b 100644
--- a/src/process/sh/vfork.s
+++ b/src/process/sh/vfork.s
@@ -1,8 +1,5 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
+.global vfork
 .type vfork,@function
-__vfork:
 vfork:
 	mov #95, r3
 	add r3, r3
diff --git a/src/process/vfork.c b/src/process/vfork.c
index ac954651..d430c13f 100644
--- a/src/process/vfork.c
+++ b/src/process/vfork.c
@@ -2,9 +2,8 @@
 #include <unistd.h>
 #include <signal.h>
 #include "syscall.h"
-#include "libc.h"
 
-pid_t __vfork(void)
+pid_t vfork(void)
 {
 	/* vfork syscall cannot be made from C code */
 #ifdef SYS_fork
@@ -13,5 +12,3 @@ pid_t __vfork(void)
 	return syscall(SYS_clone, SIGCHLD, 0);
 #endif
 }
-
-weak_alias(__vfork, vfork);
diff --git a/src/process/x32/vfork.s b/src/process/x32/vfork.s
index 8df00582..0f0ca3ee 100644
--- a/src/process/x32/vfork.s
+++ b/src/process/x32/vfork.s
@@ -1,8 +1,5 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
+.global vfork
 .type vfork,@function
-__vfork:
 vfork:
 	pop %rdx
 	mov $0x4000003a,%eax /* SYS_vfork */
diff --git a/src/process/x86_64/vfork.s b/src/process/x86_64/vfork.s
index 2cad8052..91144390 100644
--- a/src/process/x86_64/vfork.s
+++ b/src/process/x86_64/vfork.s
@@ -1,8 +1,5 @@
-.global __vfork
-.weak vfork
-.type __vfork,@function
+.global vfork
 .type vfork,@function
-__vfork:
 vfork:
 	pop %rdx
 	mov $58,%eax