diff --git a/dev-lang/rust/patches/rust_x86-1.35.0.patchset b/dev-lang/rust/patches/rust_x86-1.35.0.patchset new file mode 100644 index 000000000..2a30e9d20 --- /dev/null +++ b/dev-lang/rust/patches/rust_x86-1.35.0.patchset @@ -0,0 +1,620 @@ +From 6a84247335859c1579850ab822ecdc5f75c26924 Mon Sep 17 00:00:00 2001 +From: Niels Sascha Reedijk +Date: Sun, 9 Jun 2019 08:38:06 +0200 +Subject: Haiku-specific patches for Rust 1.35.0 + + +diff --git a/Cargo.lock b/Cargo.lock +index f789033..1a3dd04 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -375,7 +375,7 @@ dependencies = [ + "cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "clippy-mini-macro-test 0.2.0", + "clippy_lints 0.0.212", +- "compiletest_rs 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", + "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -483,7 +483,7 @@ dependencies = [ + + [[package]] + name = "compiletest_rs" +-version = "0.3.21" ++version = "0.3.22" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1279,7 +1279,7 @@ dependencies = [ + "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.51 (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.40 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1297,7 +1297,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.28 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1600,7 +1600,7 @@ dependencies = [ + "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cargo_metadata 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", +- "compiletest_rs 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", + "directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -4006,7 +4006,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007" + "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2" + "checksum compiler_builtins 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d7de11892d9f9f1bc76d43011c8233d27d58300d629dc9dfb51b6626ef7f6077" +-"checksum compiletest_rs 0.3.21 (registry+https://github.com/rust-lang/crates.io-index)" = "17a60483b7d4d1534db7b77458a03d5d8a93a707432a04978dfe87ea43bb61b1" ++"checksum compiletest_rs 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "f40ecc9332b68270998995c00f8051ee856121764a0d3230e64c9efd059d27b6" + "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" + "checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887" + "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +@@ -4091,7 +4091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917" + "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)" = "" + "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 cb3c0ee..1bb1bca 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/bootstrap/builder.rs b/src/bootstrap/builder.rs +index 5224663..0d94aab 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -575,6 +575,25 @@ impl<'a> Builder<'a> { + }) + } + ++ /// Similar to `compiler`, except handles the full-bootstrap option to ++ /// silently use the stage1 compiler instead of a stage2 compiler if one is ++ /// requested. ++ /// ++ /// Note that this does *not* have the side effect of creating ++ /// `compiler(stage, host)`, unlike `compiler` above which does have such ++ /// a side effect. The returned compiler here can only be used to compile ++ /// new artifacts, it can't be used to rely on the presence of a particular ++ /// sysroot. ++ /// ++ /// See `force_use_stage1` for documentation on what each argument is. ++ pub fn compiler_for(&self, stage: u32, host: Interned, target: Interned) -> Compiler { ++ if self.build.force_use_stage1(Compiler { stage, host }, target) { ++ self.compiler(1, self.config.build) ++ } else { ++ self.compiler(stage, host) ++ } ++ } ++ + pub fn sysroot(&self, compiler: Compiler) -> Interned { + self.ensure(compile::Sysroot { compiler }) + } +@@ -748,11 +767,7 @@ impl<'a> Builder<'a> { + // This is for the original compiler, but if we're forced to use stage 1, then + // std/test/rustc stamps won't exist in stage 2, so we need to get those from stage 1, since + // we copy the libs forward. +- let cmp = if self.force_use_stage1(compiler, target) { +- self.compiler(1, compiler.host) +- } else { +- compiler +- }; ++ let cmp = self.compiler_for(compiler.stage, compiler.host, target); + + let libstd_stamp = match cmd { + "check" => check::libstd_stamp(self, cmp, target), +@@ -1351,7 +1366,7 @@ mod __test { + assert_eq!( + first(builder.cache.all::()), + &[dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: a, + },] + ); +@@ -1388,7 +1403,7 @@ mod __test { + first(builder.cache.all::()), + &[ + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: a, + }, + dist::Std { +@@ -1435,11 +1450,11 @@ mod __test { + first(builder.cache.all::()), + &[ + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: a, + }, + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: b, + }, + ] +@@ -1447,6 +1462,39 @@ mod __test { + assert_eq!(first(builder.cache.all::()), &[dist::Src]); + } + ++ #[test] ++ fn dist_only_cross_host() { ++ let a = INTERNER.intern_str("A"); ++ let b = INTERNER.intern_str("B"); ++ let mut build = Build::new(configure(&["B"], &[])); ++ build.config.docs = false; ++ build.hosts = vec![b]; ++ let mut builder = Builder::new(&build); ++ builder.run_step_descriptions(&Builder::get_step_descriptions(Kind::Dist), &[]); ++ ++ assert_eq!( ++ first(builder.cache.all::()), ++ &[ ++ dist::Rustc { ++ compiler: Compiler { host: b, stage: 2 } ++ }, ++ ] ++ ); ++ assert_eq!( ++ first(builder.cache.all::()), ++ &[ ++ compile::Rustc { ++ compiler: Compiler { host: a, stage: 0 }, ++ target: a, ++ }, ++ compile::Rustc { ++ compiler: Compiler { host: a, stage: 1 }, ++ target: b, ++ }, ++ ] ++ ); ++ } ++ + #[test] + fn dist_with_targets_and_hosts() { + let build = Build::new(configure(&["B"], &["C"])); +@@ -1488,11 +1536,11 @@ mod __test { + first(builder.cache.all::()), + &[ + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: a, + }, + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: b, + }, + dist::Std { +@@ -1537,11 +1585,11 @@ mod __test { + first(builder.cache.all::()), + &[ + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: a, + }, + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: b, + }, + dist::Std { +@@ -1588,11 +1636,11 @@ mod __test { + first(builder.cache.all::()), + &[ + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: a, + }, + dist::Std { +- compiler: Compiler { host: a, stage: 2 }, ++ compiler: Compiler { host: a, stage: 1 }, + target: b, + }, + ] +@@ -1642,10 +1690,6 @@ mod __test { + compiler: Compiler { host: a, stage: 1 }, + target: b, + }, +- compile::Test { +- compiler: Compiler { host: a, stage: 2 }, +- target: b, +- }, + ] + ); + assert_eq!( +@@ -1698,10 +1742,6 @@ mod __test { + compiler: Compiler { host: b, stage: 2 }, + target: a, + }, +- compile::Rustc { +- compiler: Compiler { host: a, stage: 0 }, +- target: b, +- }, + compile::Rustc { + compiler: Compiler { host: a, stage: 1 }, + target: b, +@@ -1736,10 +1776,6 @@ mod __test { + compiler: Compiler { host: b, stage: 2 }, + target: a, + }, +- compile::Test { +- compiler: Compiler { host: a, stage: 0 }, +- target: b, +- }, + compile::Test { + compiler: Compiler { host: a, stage: 1 }, + target: b, +@@ -1786,9 +1822,6 @@ mod __test { + compile::Assemble { + target_compiler: Compiler { host: a, stage: 1 }, + }, +- compile::Assemble { +- target_compiler: Compiler { host: b, stage: 1 }, +- }, + compile::Assemble { + target_compiler: Compiler { host: a, stage: 2 }, + }, +@@ -1808,10 +1841,6 @@ mod __test { + compiler: Compiler { host: a, stage: 1 }, + target: a, + }, +- compile::Rustc { +- compiler: Compiler { host: a, stage: 0 }, +- target: b, +- }, + compile::Rustc { + compiler: Compiler { host: a, stage: 1 }, + target: b, +@@ -1838,10 +1867,6 @@ mod __test { + compiler: Compiler { host: b, stage: 2 }, + target: a, + }, +- compile::Test { +- compiler: Compiler { host: a, stage: 0 }, +- target: b, +- }, + compile::Test { + compiler: Compiler { host: a, stage: 1 }, + target: b, +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index 66443d4..3fd9641 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -69,20 +69,20 @@ impl Step for Std { + + builder.ensure(StartupObjects { compiler, target }); + +- if builder.force_use_stage1(compiler, target) { +- let from = builder.compiler(1, builder.config.build); ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ if compiler_to_use != compiler { + builder.ensure(Std { +- compiler: from, ++ compiler: compiler_to_use, + target, + }); +- builder.info(&format!("Uplifting stage1 std ({} -> {})", from.host, target)); ++ builder.info(&format!("Uplifting stage1 std ({} -> {})", compiler_to_use.host, target)); + + // Even if we're not building std this stage, the new sysroot must + // still contain the third party objects needed by various targets. + copy_third_party_objects(builder, &compiler, target); + + builder.ensure(StdLink { +- compiler: from, ++ compiler: compiler_to_use, + target_compiler: compiler, + target, + }); +@@ -374,15 +374,16 @@ impl Step for Test { + return; + } + +- if builder.force_use_stage1(compiler, target) { ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ if compiler_to_use != compiler { + builder.ensure(Test { +- compiler: builder.compiler(1, builder.config.build), ++ compiler: compiler_to_use, + target, + }); + builder.info( + &format!("Uplifting stage1 test ({} -> {})", builder.config.build, target)); + builder.ensure(TestLink { +- compiler: builder.compiler(1, builder.config.build), ++ compiler: compiler_to_use, + target_compiler: compiler, + target, + }); +@@ -499,15 +500,16 @@ impl Step for Rustc { + return; + } + +- if builder.force_use_stage1(compiler, target) { ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ if compiler_to_use != compiler { + builder.ensure(Rustc { +- compiler: builder.compiler(1, builder.config.build), ++ compiler: compiler_to_use, + target, + }); + builder.info(&format!("Uplifting stage1 rustc ({} -> {})", + builder.config.build, target)); + builder.ensure(RustcLink { +- compiler: builder.compiler(1, builder.config.build), ++ compiler: compiler_to_use, + target_compiler: compiler, + target, + }); +@@ -663,9 +665,10 @@ impl Step for CodegenBackend { + return; + } + +- if builder.force_use_stage1(compiler, target) { ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ if compiler_to_use != compiler { + builder.ensure(CodegenBackend { +- compiler: builder.compiler(1, builder.config.build), ++ compiler: compiler_to_use, + target, + backend, + }); +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 61a7705..27ac967 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -647,7 +647,11 @@ impl Step for Std { + + fn make_run(run: RunConfig<'_>) { + run.builder.ensure(Std { +- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build), ++ compiler: run.builder.compiler_for( ++ run.builder.top_stage, ++ run.builder.config.build, ++ run.target, ++ ), + target: run.target, + }); + } +@@ -757,13 +761,10 @@ impl Step for Analysis { + + builder.ensure(Std { compiler, target }); + +- // Package save-analysis from stage1 if not doing a full bootstrap, as the +- // stage2 artifacts is simply copied from stage1 in that case. +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler.clone() +- }; ++ // Find the actual compiler (handling the full bootstrap option) which ++ // produced the save-analysis data because that data isn't copied ++ // through the sysroot uplifting. ++ let compiler = builder.compiler_for(compiler.stage, compiler.host, target); + + let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); + +diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs +index d831d2f..401ce4e 100644 +--- a/src/bootstrap/doc.rs ++++ b/src/bootstrap/doc.rs +@@ -475,12 +475,7 @@ impl Step for Std { + builder.info(&format!("Documenting stage{} std ({})", stage, target)); + let out = builder.doc_out(target); + t!(fs::create_dir_all(&out)); +- let compiler = builder.compiler(stage, builder.config.build); +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler +- }; ++ let compiler = builder.compiler_for(stage, builder.config.build, target); + + builder.ensure(compile::Std { compiler, target }); + let out_dir = builder.stage_out(compiler, Mode::Std) +@@ -563,12 +558,7 @@ impl Step for Test { + builder.info(&format!("Documenting stage{} test ({})", stage, target)); + let out = builder.doc_out(target); + t!(fs::create_dir_all(&out)); +- let compiler = builder.compiler(stage, builder.config.build); +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler +- }; ++ let compiler = builder.compiler_for(stage, builder.config.build, target); + + // Build libstd docs so that we generate relative links + builder.ensure(Std { stage, target }); +@@ -632,12 +622,7 @@ impl Step for WhitelistedRustc { + builder.info(&format!("Documenting stage{} whitelisted compiler ({})", stage, target)); + let out = builder.doc_out(target); + t!(fs::create_dir_all(&out)); +- let compiler = builder.compiler(stage, builder.config.build); +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler +- }; ++ let compiler = builder.compiler_for(stage, builder.config.build, target); + + // Build libstd docs so that we generate relative links + builder.ensure(Std { stage, target }); +@@ -706,12 +691,7 @@ impl Step for Rustc { + t!(fs::create_dir_all(&out)); + + // Get the correct compiler for this stage. +- let compiler = builder.compiler(stage, builder.config.build); +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler +- }; ++ let compiler = builder.compiler_for(stage, builder.config.build, target); + + if !builder.config.compiler_docs { + builder.info("\tskipping - compiler/librustdoc docs disabled"); +@@ -807,12 +787,7 @@ impl Step for Rustdoc { + t!(fs::create_dir_all(&out)); + + // Get the correct compiler for this stage. +- let compiler = builder.compiler(stage, builder.config.build); +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler +- }; ++ let compiler = builder.compiler_for(stage, builder.config.build, target); + + if !builder.config.compiler_docs { + builder.info("\tskipping - compiler/librustdoc docs disabled"); +diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs +index 881bea5..39f912a 100644 +--- a/src/bootstrap/test.rs ++++ b/src/bootstrap/test.rs +@@ -1675,15 +1675,11 @@ impl Step for Crate { + builder.ensure(compile::Test { compiler, target }); + builder.ensure(RemoteCopyLibs { compiler, target }); + +- // If we're not doing a full bootstrap but we're testing a stage2 version of +- // libstd, then what we're actually testing is the libstd produced in +- // stage1. Reflect that here by updating the compiler that we're working +- // with automatically. +- let compiler = if builder.force_use_stage1(compiler, target) { +- builder.compiler(1, compiler.host) +- } else { +- compiler.clone() +- }; ++ // If we're not doing a full bootstrap but we're testing a stage2 ++ // version of libstd, then what we're actually testing is the libstd ++ // produced in stage1. Reflect that here by updating the compiler that ++ // we're working with automatically. ++ let compiler = builder.compiler_for(compiler.stage, compiler.host, target); + + let mut cargo = builder.cargo(compiler, mode, target, test_kind.subcommand()); + match mode { +diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs +index 17523ae..15d52bf 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 { + // 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 feb15e8..653130b 100644 +--- a/src/libstd/sys/unix/thread.rs ++++ b/src/libstd/sys/unix/thread.rs +@@ -166,8 +166,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 1b0a811..8c2bf15 100644 +--- a/src/libstd/sys/windows/thread.rs ++++ b/src/libstd/sys/windows/thread.rs +@@ -59,11 +59,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 cb50797..5a0850e 100644 +--- a/src/libstd/thread/mod.rs ++++ b/src/libstd/thread/mod.rs +@@ -1436,11 +1436,6 @@ impl JoinHandle { + /// [`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 + #include ++#define _BSD_SOURCE + #include ++#undef _BSD_SOURCE + #ifdef HAVE_BACKTRACE + # include BACKTRACE_HEADER // For backtrace(). + #endif +-- +2.19.0 + diff --git a/dev-lang/rust/rust-1.35.0.recipe b/dev-lang/rust/rust-1.35.0.recipe new file mode 100644 index 000000000..8f85e8119 --- /dev/null +++ b/dev-lang/rust/rust-1.35.0.recipe @@ -0,0 +1,167 @@ +SUMMARY="Modern and safe systems programming language" +DESCRIPTION="Rust is a systems programming language that runs blazingly fast, \ +prevents almost all crashes*, and eliminates data races." +HOMEPAGE="https://www.rust-lang.org/" +COPYRIGHT="2018 The Rust Project Developers" +LICENSE="MIT" +REVISION="1" +cargoVersion="0.36.0" +rlsVersion="1.35.0" +rustfmtVersion="1.2.0" +clippyVersion="0.0.212" +SOURCE_URI="https://static.rust-lang.org/dist/rustc-$portVersion-src.tar.xz" +CHECKSUM_SHA256="169756df2298957bcf02da6a612996c24a51b9ac3b23409e6507d69eb2e6f523" +SOURCE_DIR="rustc-$portVersion-src" +PATCHES="rust-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + rust_bin$secondaryArchSuffix = $portVersion + cmd:rustc$secondaryArchSuffix = $portVersion + cmd:rustdoc$secondaryArchSuffix = $portVersion + cmd:rustfmt$secondaryArchSuffix = $portVersion + cmd:rust_gdb$secondaryArchSuffix = $portVersion + cmd:rust_lldb$secondaryArchSuffix = $portVersion + cmd:cargo$secondaryArchSuffix = $cargoVersion + cmd:cargo_clippy$secondaryArchSuffix = $clippyVersion + cmd:cargo_fmt$secondaryArchSuffix = $cargoVersion + cmd:clippy_driver$secondaryArchSuffix = $clippyVersion + cmd:rls$secondaryArchSuffix = $rlsVersion + cmd:rustfmt = $rustfmtVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libcurl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cargo$secondaryArchSuffix == $cargoVersion + cmd:cmake + cmd:cmp + cmd:file + cmd:find + cmd:gcc$secondaryArchSuffix + cmd:git + cmd:grep + cmd:ld$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:python + cmd:rustc$secondaryArchSuffix == $portVersion + cmd:sed + cmd:tar + cmd:which + cmd:xargs + " + +relativeInstallDir="develop/tools$secondaryArchSubDir/rust" +installDir="$prefix/$relativeInstallDir" + +BUILD() +{ + # write the build configuration + tr -d '\t' >config.toml <<- EOL + [llvm] + targets = "X86" + experimental-targets = "" + + [build] + cargo = "/$relativeBinDir/cargo" + rustc = "/$relativeBinDir/rustc" + submodules = false + extended = true + tools = ["cargo", "rls", "rustfmt", "analysis"] + + [install] + prefix = "$installDir" + libdir = "$installDir/bin/lib" + mandir = "$manDir" + docdir = "$developDocDir" + sysconfdir = "$dataDir" + + [rust] + channel = "stable" + rpath = false + deny-warnings = false + dist-src = false + + [dist] + src-tarball = false +EOL + # Disable ASLR: compiling stage 1 rustc requires a lot of RAM (about 1.5 + # GB). Haiku has a per-process limit of 2GB on 32 bit systems. ASLR makes + # the available space even smaller. Disabling it will give us the space to + # compile Rust + export DISABLE_ASLR=1 + + # now build rust and cargo + ./x.py dist +} + +INSTALL() +{ + # we will manually invoke the install scripts + if [ $effectiveTargetArchitecture = x86 ]; then + architecture="i686-unknown-haiku" + fi + if [ $effectiveTargetArchitecture = x86_64 ]; then + architecture="x86_64-unknown-haiku" + fi + + # let's install the packages one by one + cd $sourceDir/build/tmp/dist/ + for module in "rust-docs-$srcGitRev-$architecture" \ + "rust-std-$srcGitRev-$architecture" \ + "rustc-$srcGitRev-$architecture" \ + "rust-analysis-$srcGitRev-$architecture" \ + "cargo-$cargoVersion-$architecture" \ + "clippy-$clippyVersion-$architecture" \ + "rls-$rlsVersion-$architecture" \ + "rustfmt-$rustfmtVersion-$architecture" + do + ./$module/install.sh \ + --prefix=$installDir \ + --docdir=$developDocDir \ + --mandir=$manDir \ + --sysconfdir=$dataDir \ + --disable-ldconfig + done + + # move zsh data to the datadir + mv $installDir/share/zsh $dataDir + rm -rf $installDir/share + + # clean out unneccesary files created by the rust installer + rm $installDir/lib/rustlib/components + rm $installDir/lib/rustlib/install.log + rm $installDir/lib/rustlib/manifest-* + rm $installDir/lib/rustlib/rust-installer-version + rm $installDir/lib/rustlib/uninstall.sh + + # link the binaries in $binDir + mkdir -p $binDir + for f in cargo cargo-clippy cargo-fmt clippy-driver rls rust-gdb \ + rust-lldb rustc rustdoc rustfmt; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + # make sure runtime_loader can find the libraries in the lib dir relative + # to the binaries + symlinkRelative -sfn $installDir/lib $installDir/bin/lib +} + +TEST() +{ + ./x.py test +} diff --git a/dev-lang/rust_bin/rust_bin-1.35.0.recipe b/dev-lang/rust_bin/rust_bin-1.35.0.recipe new file mode 100644 index 000000000..946ceccd3 --- /dev/null +++ b/dev-lang/rust_bin/rust_bin-1.35.0.recipe @@ -0,0 +1,98 @@ +SUMMARY="Modern and safe systems programming language" +DESCRIPTION="Rust is a systems programming language that runs blazingly fast, \ +prevents almost all crashes*, and eliminates data races." +HOMEPAGE="https://www.rust-lang.org/" +COPYRIGHT="2018 The Rust Project Developers" +LICENSE="MIT" +REVISION="1" + +case "$effectiveTargetArchitecture" in + x86) +SOURCE_URI="http://dl.rust-on-haiku.com/dist/$portVersion/rust-$portVersion-i686-unknown-haiku.tar.xz" +CHECKSUM_SHA256="7f21adfccdbd7bd1dd941960fb318e8b4135bab7fbe5e2e3770b3ea593f70744" +SOURCE_DIR="rust-$portVersion-i686-unknown-haiku" + ;; + x86_64) +SOURCE_URI="http://dl.rust-on-haiku.com/dist/$portVersion/rust-$portVersion-x86_64-unknown-haiku.tar.xz" +CHECKSUM_SHA256="1efb0e3da96fdb54a73845235981393b8f15a09b7db5b3b8a8c186727c751a50" +SOURCE_DIR="rust-$portVersion-x86_64-unknown-haiku" + ;; + *) +SOURCE_URI="http://dl.rust-on-haiku.com/dist/$portVersion/rustc-$portVersion-src.tar.xz" +CHECKSUM_SHA256="39b1841b2e9bf6786beb132aa520de905298216e8f3f4ebef41e032b2d7cb5a0" +SOURCE_DIR="rustc-$portVersion-src" + ;; +esac + +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" +SECONDARY_ARCHITECTURES="x86" +DISABLE_SOURCE_PACKAGE=yes + +cargoVersion="0.36.0" +rlsVersion="1.35.0" +rustfmtVersion="1.2.0" +clippyVersion="0.0.212" + +PROVIDES=" + rust_bin$secondaryArchSuffix = $portVersion + cmd:rustc$secondaryArchSuffix = $portVersion + cmd:rustdoc$secondaryArchSuffix = $portVersion + cmd:rustfmt$secondaryArchSuffix = $portVersion + cmd:rust_gdb$secondaryArchSuffix = $portVersion + cmd:rust_lldb$secondaryArchSuffix = $portVersion + cmd:cargo$secondaryArchSuffix = $cargoVersion + cmd:cargo_clippy$secondaryArchSuffix = $clippyVersion + cmd:cargo_fmt$secondaryArchSuffix = $cargoVersion + cmd:clippy_driver$secondaryArchSuffix = $clippyVersion + cmd:rls$secondaryArchSuffix = $rlsVersion + cmd:rustfmt = $rustfmtVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +CONFLICTS=" + rust$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " + +relativeInstallDir="develop/tools$secondaryArchSubDir/rust" +installDir="$prefix/$relativeInstallDir" + +INSTALL() +{ + ./install.sh \ + --prefix=$installDir \ + --docdir=$developDocDir \ + --mandir=$manDir \ + --sysconfdir=$dataDir \ + --disable-ldconfig + + # move zsh data to the datadir + mv $installDir/share/zsh $dataDir + rm -rf $installDir/share + + # clean out unneccesary files created by the rust installer + rm $installDir/lib/rustlib/components + rm $installDir/lib/rustlib/install.log + rm $installDir/lib/rustlib/manifest-* + rm $installDir/lib/rustlib/rust-installer-version + rm $installDir/lib/rustlib/uninstall.sh + + # link the binaries in $binDir + mkdir -p $binDir + for f in cargo cargo-clippy cargo-fmt clippy-driver rls rust-gdb \ + rust-lldb rustc rustdoc rustfmt; do + symlinkRelative -sfn $installDir/bin/$f $binDir + done + + # make sure runtime_loader can find the libraries in the lib dir relative + # to the binaries + symlinkRelative -sfn $installDir/lib $installDir/bin/lib +}