146 lines
6.4 KiB
Plaintext
146 lines
6.4 KiB
Plaintext
From 550112375756baa31f32414774f78d13ea271115 Mon Sep 17 00:00:00 2001
|
|
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
|
|
Date: Fri, 19 Jul 2019 04:03:55 +0200
|
|
Subject: Rust: add recipe for 1.36.0
|
|
|
|
|
|
diff --git a/Cargo.lock b/Cargo.lock
|
|
index b687637..0a2ede6 100644
|
|
--- a/Cargo.lock
|
|
+++ b/Cargo.lock
|
|
@@ -1297,7 +1297,7 @@ dependencies = [
|
|
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"curl-sys 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
- "libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
+ "libssh2-sys 0.2.11 (git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04)",
|
|
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -1315,7 +1315,7 @@ dependencies = [
|
|
[[package]]
|
|
name = "libssh2-sys"
|
|
version = "0.2.11"
|
|
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
+source = "git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04#74d7f04dbee9997510bdad5608bb06970c6b4c8a"
|
|
dependencies = [
|
|
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
@@ -4164,7 +4164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6"
|
|
"checksum libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1"
|
|
"checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4"
|
|
-"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
|
|
+"checksum libssh2-sys 0.2.11 (git+https://github.com/alexcrichton/ssh2-rs?rev=74d7f04)" = "<none>"
|
|
"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
|
|
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
|
|
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
|
|
diff --git a/Cargo.toml b/Cargo.toml
|
|
index ccd7e8b..b23710f 100644
|
|
--- a/Cargo.toml
|
|
+++ b/Cargo.toml
|
|
@@ -59,6 +59,7 @@ cargo = { path = "src/tools/cargo" }
|
|
# that we're shipping as well (to ensure that the rustfmt in RLS and the
|
|
# `rustfmt` executable are the same exact version).
|
|
rustfmt-nightly = { path = "src/tools/rustfmt" }
|
|
+libssh2-sys = { git = "https://github.com/alexcrichton/ssh2-rs", rev = "74d7f04" }
|
|
|
|
# See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
|
|
# here
|
|
diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
|
|
index d2d0d19..55190ab 100644
|
|
--- a/src/librustc_interface/util.rs
|
|
+++ b/src/librustc_interface/util.rs
|
|
@@ -120,9 +120,13 @@ pub fn create_session(
|
|
}
|
|
|
|
// Temporarily have stack size set to 32MB to deal with various crates with long method
|
|
-// chains or deep syntax trees.
|
|
+// chains or deep syntax trees, except when on Haiku
|
|
// FIXME(oli-obk): get https://github.com/rust-lang/rust/pull/55617 the finish line
|
|
-const STACK_SIZE: usize = 32 * 1024 * 1024; // 32MB
|
|
+#[cfg(not(target_os = "haiku"))]
|
|
+const STACK_SIZE: usize = 32 * 1024 * 1024;
|
|
+
|
|
+#[cfg(target_os = "haiku")]
|
|
+const STACK_SIZE: usize = 16 * 1024 * 1024;
|
|
|
|
fn get_stack_size() -> Option<usize> {
|
|
// FIXME: Hacks on hacks. If the env is trying to override the stack size
|
|
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
|
|
index f4a1783..9264bed 100644
|
|
--- a/src/libstd/sys/unix/thread.rs
|
|
+++ b/src/libstd/sys/unix/thread.rs
|
|
@@ -164,8 +164,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/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs
|
|
index 518eccf..2aa5818 100644
|
|
--- a/src/libstd/sys/windows/c.rs
|
|
+++ b/src/libstd/sys/windows/c.rs
|
|
@@ -268,7 +268,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;
|
|
|
|
#[cfg(target_env = "msvc")]
|
|
#[cfg(feature = "backtrace")]
|
|
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
|
|
index ebdf361..de198a6 100644
|
|
--- a/src/libstd/sys/windows/thread.rs
|
|
+++ b/src/libstd/sys/windows/thread.rs
|
|
@@ -58,11 +58,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/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
|
|
index 35de4f4..1d6d0c8 100644
|
|
--- a/src/libstd/thread/mod.rs
|
|
+++ b/src/libstd/thread/mod.rs
|
|
@@ -1438,11 +1438,6 @@ impl<T> JoinHandle<T> {
|
|
/// [`panic`]: ../../std/macro.panic.html
|
|
/// [atomic memory orderings]: ../../std/sync/atomic/index.html
|
|
///
|
|
- /// # 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/Unix/Signals.inc b/src/llvm-project/llvm/lib/Support/Unix/Signals.inc
|
|
index ad88d5e..9d320b7 100644
|
|
--- a/src/llvm-project/llvm/lib/Support/Unix/Signals.inc
|
|
+++ b/src/llvm-project/llvm/lib/Support/Unix/Signals.inc
|
|
@@ -47,7 +47,9 @@
|
|
#include "llvm/Support/raw_ostream.h"
|
|
#include <algorithm>
|
|
#include <string>
|
|
+#define _BSD_SOURCE
|
|
#include <sysexits.h>
|
|
+#undef _BSD_SOURCE
|
|
#ifdef HAVE_BACKTRACE
|
|
# include BACKTRACE_HEADER // For backtrace().
|
|
#endif
|
|
--
|
|
2.19.0
|
|
|