andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use links for copies of patches.

This commit is contained in:
rick-masters 2023-04-05 11:59:39 +00:00
parent 9c016405ef
commit c1ceabb9c4
2 changed files with 2 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sysa/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch
View File

@ -1,59 +0,0 @@
# SPDX-FileCopyrightText: 2023 Richard Masters <grick23@gmail.com>
# SPDX-License-Identifier: MIT
diff -r -u musl-1.1.24.orig/arch/i386/pthread_arch.h musl-1.1.24/arch/i386/pthread_arch.h
--- arch/i386/pthread_arch.h 2019-10-13 21:58:27.000000000 +0000
+++ arch/i386/pthread_arch.h 2023-02-28 14:06:10.700603762 +0000
@@ -1,8 +1,18 @@
+#define BOOTSTRAP
+
+#ifdef BOOTSTRAP
+extern pthread_t g_pthread;
+#endif
+
static inline struct pthread *__pthread_self()
{
+#ifndef BOOTSTRAP
struct pthread *self;
__asm__ ("movl %%gs:0,%0" : "=r" (self) );
return self;
+#else
+ return g_pthread;
+#endif
}
#define TP_ADJ(p) (p)
diff -r -u musl-1.1.24.orig/src/env/__init_tls.c musl-1.1.24/src/env/__init_tls.c
--- src/env/__init_tls.c 2019-10-13 21:58:27.000000000 +0000
+++ src/env/__init_tls.c 2023-02-28 14:07:04.956604831 +0000
@@ -8,22 +8,31 @@
#include "libc.h"
#include "atomic.h"
#include "syscall.h"
+#define BOOTSTRAP
volatile int __thread_list_lock;
+#ifdef BOOTSTRAP
+pthread_t g_pthread;
+#endif
int __init_tp(void *p)
{
pthread_t td = p;
td->self = td;
+#ifndef BOOTSTRAP
int r = __set_thread_area(TP_ADJ(p));
if (r < 0) return -1;
if (!r) libc.can_do_threads = 1;
+#endif
td->detach_state = DT_JOINABLE;
td->tid = __syscall(SYS_set_tid_address, &__thread_list_lock);
td->locale = &libc.global_locale;
td->robust_list.head = &td->robust_list.head;
td->sysinfo = __sysinfo;
td->next = td->prev = td;
+#ifdef BOOTSTRAP
+ g_pthread = td;
+#endif
return 0;
}

1
sysa/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch Symbolic link
View File

@ -0,0 +1 @@
../patches/avoid_set_thread_area.patch

30
sysa/musl-1.1.24/patches-pass3/avoid_sys_clone.patch
View File

@ -1,30 +0,0 @@
# SPDX-FileCopyrightText: 2023 Richard Masters <grick23@gmail.com>
# SPDX-License-Identifier: MIT
diff -r -u musl-1.1.24.orig/src/process/posix_spawn.c musl-1.1.24/src/process/posix_spawn.c
--- src/process/posix_spawn.c 2019-10-13 21:58:27.000000000 +0000
+++ src/process/posix_spawn.c 2023-02-28 14:08:18.636606282 +0000
@@ -8,6 +8,7 @@
#include "syscall.h"
#include "pthread_impl.h"
#include "fdop.h"
+#define BOOTSTRAP
struct args {
int p[2];
@@ -182,8 +183,16 @@
args.envp = envp;
pthread_sigmask(SIG_BLOCK, SIGALL_SET, &args.oldmask);
+#ifndef BOOTSTRAP
pid = __clone(child, stack+sizeof stack,
CLONE_VM|CLONE_VFORK|SIGCHLD, &args);
+#else
+ pid = fork();
+ if (pid == 0) {
+ _exit(child(&args));
+ }
+#endif
+
close(args.p[1]);
if (pid > 0) {

1
sysa/musl-1.1.24/patches-pass3/avoid_sys_clone.patch Symbolic link
View File

@ -0,0 +1 @@
../patches/avoid_sys_clone.patch