From 4a4e641b23a5a6440123deeb1d3e86f676e0e438 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Tue, 11 Dec 2018 08:02:47 -0700
Subject: [PATCH] Update pthreads-emb
---
pthreads-emb | 2 +-
src/start.rs | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/pthreads-emb b/pthreads-emb
index 6720dfdc9..4b87ab0dc 160000
--- a/pthreads-emb
+++ b/pthreads-emb
@@ -1 +1 @@
-Subproject commit 6720dfdc95246f85aeb1e867e0105d4eb43ad759
+Subproject commit 4b87ab0dcdbc58910b9683e3ce561fccea05386d
diff --git a/src/start.rs b/src/start.rs
index 5489bfad7..a83607367 100644
--- a/src/start.rs
+++ b/src/start.rs
@@ -44,13 +44,6 @@ unsafe fn copy_string_array(array: *const *const c_char, len: usize) -> Vec<*mut
vec
}
-// In the case that pthread is not linked, pthread_init can be replaced
-#[linkage = "weak"]
-#[no_mangle]
-extern "C" fn pthread_init() -> c_int {
- 0
-}
-
#[inline(never)]
#[no_mangle]
pub unsafe extern "C" fn relibc_start(sp: &'static Stack) -> ! {
@@ -85,9 +78,6 @@ pub unsafe extern "C" fn relibc_start(sp: &'static Stack) -> ! {
stdio::stdout = stdio::default_stdout.get();
stdio::stderr = stdio::default_stderr.get();
- // Initialize pthreads
- pthread_init();
-
// Call init section
_init();
--
GitLab