120 lines
4.3 KiB
Plaintext
120 lines
4.3 KiB
Plaintext
From 2b37f1b93f948c7921467b8d1f9bb0032991570c Mon Sep 17 00:00:00 2001
|
|
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
|
|
Date: Sun, 14 Feb 2021 10:30:30 +0000
|
|
Subject: Haiku-specific patches for Rust 1.50.0
|
|
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index 89ac858..bca63e3 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -4705,13 +4705,12 @@ checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"
|
|
|
|
[[package]]
|
|
name = "socket2"
|
|
-version = "0.3.16"
|
|
+version = "0.3.19"
|
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
-checksum = "7fd8b795c389288baa5f355489c65e71fd48a02104600d15c4cfbc561e9e429d"
|
|
+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
|
|
dependencies = [
|
|
- "cfg-if 0.1.10",
|
|
+ "cfg-if 1.0.0",
|
|
"libc",
|
|
- "redox_syscall",
|
|
"winapi 0.3.9",
|
|
]
|
|
|
|
diff --git a/library/std/src/sys/unix/thread.rs b/library/std/src/sys/unix/thread.rs
|
|
index cda17eb..d9131e6 100644
|
|
--- a/library/std/src/sys/unix/thread.rs
|
|
+++ b/library/std/src/sys/unix/thread.rs
|
|
@@ -176,7 +176,7 @@ impl Thread {
|
|
unsafe {
|
|
let ret = libc::pthread_join(self.id, ptr::null_mut());
|
|
mem::forget(self);
|
|
- assert!(ret == 0, "failed to join thread: {}", io::Error::from_raw_os_error(ret));
|
|
+ debug_assert_eq!(ret, 0);
|
|
}
|
|
}
|
|
|
|
diff --git a/library/std/src/sys/windows/c.rs b/library/std/src/sys/windows/c.rs
|
|
index 2b1bc92..1ed90ae 100644
|
|
--- a/library/std/src/sys/windows/c.rs
|
|
+++ b/library/std/src/sys/windows/c.rs
|
|
@@ -270,7 +270,6 @@ pub const FILE_END: DWORD = 2;
|
|
|
|
pub const WAIT_OBJECT_0: DWORD = 0x00000000;
|
|
pub const WAIT_TIMEOUT: DWORD = 258;
|
|
-pub const WAIT_FAILED: DWORD = 0xFFFFFFFF;
|
|
|
|
pub const PIPE_ACCESS_INBOUND: DWORD = 0x00000001;
|
|
pub const PIPE_ACCESS_OUTBOUND: DWORD = 0x00000002;
|
|
diff --git a/library/std/src/sys/windows/thread.rs b/library/std/src/sys/windows/thread.rs
|
|
index 38839ea..7bb8c95 100644
|
|
--- a/library/std/src/sys/windows/thread.rs
|
|
+++ b/library/std/src/sys/windows/thread.rs
|
|
@@ -70,10 +70,7 @@ impl Thread {
|
|
}
|
|
|
|
pub fn join(self) {
|
|
- let rc = unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE) };
|
|
- if rc == c::WAIT_FAILED {
|
|
- panic!("failed to join on thread: {}", io::Error::last_os_error());
|
|
- }
|
|
+ unsafe { c::WaitForSingleObject(self.handle.raw(), c::INFINITE); }
|
|
}
|
|
|
|
pub fn yield_now() {
|
|
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs
|
|
index 5d65f96..8358b3b 100644
|
|
--- a/library/std/src/thread/mod.rs
|
|
+++ b/library/std/src/thread/mod.rs
|
|
@@ -1351,11 +1351,6 @@ impl<T> JoinHandle<T> {
|
|
/// [`Err`]: crate::result::Result::Err
|
|
/// [atomic memory orderings]: crate::sync::atomic
|
|
///
|
|
- /// # Panics
|
|
- ///
|
|
- /// This function may panic on some platforms if a thread attempts to join
|
|
- /// itself or otherwise may create a deadlock with joining threads.
|
|
- ///
|
|
/// # Examples
|
|
///
|
|
/// ```
|
|
diff --git a/src/llvm-project/llvm/lib/Support/CMakeLists.txt b/src/llvm-project/llvm/lib/Support/CMakeLists.txt
|
|
index 17bef02..e36da10 100644
|
|
--- a/src/llvm-project/llvm/lib/Support/CMakeLists.txt
|
|
+++ b/src/llvm-project/llvm/lib/Support/CMakeLists.txt
|
|
@@ -36,6 +36,10 @@ elseif( CMAKE_HOST_UNIX )
|
|
if( FUCHSIA )
|
|
set(system_libs ${system_libs} zircon)
|
|
endif()
|
|
+ if ( HAIKU )
|
|
+ add_definitions(-D_BSD_SOURCE)
|
|
+ set(system_libs ${system_libs} bsd)
|
|
+ endif()
|
|
endif( MSVC OR MINGW )
|
|
|
|
# Delay load shell32.dll if possible to speed up process startup.
|
|
diff --git a/src/llvm-project/llvm/lib/Support/Unix/Program.inc b/src/llvm-project/llvm/lib/Support/Unix/Program.inc
|
|
index 8f41fc0..950416d 100644
|
|
--- a/src/llvm-project/llvm/lib/Support/Unix/Program.inc
|
|
+++ b/src/llvm-project/llvm/lib/Support/Unix/Program.inc
|
|
@@ -448,8 +448,12 @@ ProcessInfo llvm::sys::Wait(const ProcessInfo &PI, unsigned SecondsToWait,
|
|
if (ProcStat) {
|
|
std::chrono::microseconds UserT = toDuration(Info.ru_utime);
|
|
std::chrono::microseconds KernelT = toDuration(Info.ru_stime);
|
|
+#ifndef __HAIKU__
|
|
uint64_t PeakMemory = static_cast<uint64_t>(Info.ru_maxrss);
|
|
*ProcStat = ProcessStatistics{UserT + KernelT, UserT, PeakMemory};
|
|
+#else
|
|
+ *ProcStat = ProcessStatistics{UserT + KernelT, UserT, 0};
|
|
+#endif
|
|
}
|
|
|
|
// Return the proper exit status. Detect error conditions
|
|
--
|
|
2.26.0
|
|
|