aboutsummaryrefslogtreecommitdiff
path: root/testing/sbcl/0002-Fix-threads-on-musl-libc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/sbcl/0002-Fix-threads-on-musl-libc.patch')
-rw-r--r--testing/sbcl/0002-Fix-threads-on-musl-libc.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/testing/sbcl/0002-Fix-threads-on-musl-libc.patch b/testing/sbcl/0002-Fix-threads-on-musl-libc.patch
deleted file mode 100644
index 7561e9182c..0000000000
--- a/testing/sbcl/0002-Fix-threads-on-musl-libc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1#2020/01/30 Patch has not yet been accepted upstream
2From 51ee0c90068ef7d88a23d86579cc1f73c2f6055f Mon Sep 17 00:00:00 2001
3From: Eric Timmons <etimmons@mit.edu>
4Date: Sat, 1 Feb 2020 17:33:38 -0500
5Subject: [PATCH 2/5] Do not require _CS_GNU_LIBPTHREAD_VERSION at runtime
6 start
7
8If there is no content in confstr for _CS_GNU_LIBPTHREAD_VERSION (i.e., on a
9non GNU libc) then assume the thread implementation is good enough and let the
10user deal with any fallout.
11---
12 src/runtime/linux-os.c | 7 ++++++-
13 1 file changed, 6 insertions(+), 1 deletion(-)
14
15diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c
16index 89244e793..0ff55653d 100644
17--- a/src/runtime/linux-os.c
18+++ b/src/runtime/linux-os.c
19@@ -186,8 +186,13 @@ isnptl (void)
20 if (strstr (buf, "NPTL")) {
21 return 1;
22 }
23+ return 0;
24+ }
25+ else {
26+ /* This libc does not expose the libpthread version. Just assume we have
27+ * a good enough thread implementation. */
28+ return 1;
29 }
30- return 0;
31 }
32 #endif
33
34--
352.25.0
36