diff options
| author | bors <bors@rust-lang.org> | 2021-02-28 03:56:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-28 03:56:16 +0000 |
| commit | 6e2801c44eadc5cd05532a19fe1093ef6f041abe (patch) | |
| tree | bccc9f718b26c9b959ecd8b20a40ad7af8ca50dd /library/std/src | |
| parent | 130b2ab0ed272f93dd5d019e72ac1fd4b4a77323 (diff) | |
| parent | a757fae24596e936b819a8974054eca95d95a58e (diff) | |
| download | rust-6e2801c44eadc5cd05532a19fe1093ef6f041abe.tar.gz rust-6e2801c44eadc5cd05532a19fe1093ef6f041abe.zip | |
Auto merge of #82594 - nagisa:nagisa/remove-rumprun, r=petrochenkov
Remove the x86_64-rumprun-netbsd target Herein we remove the target from the compiler and the code from libstd intended to support the now-defunct rumprun project. Closes #81514
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/unix/stack_overflow.rs | 4 | ||||
| -rw-r--r-- | library/std/src/sys/unix/thread.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/library/std/src/sys/unix/stack_overflow.rs b/library/std/src/sys/unix/stack_overflow.rs index d8474205352..d7bba50c76a 100644 --- a/library/std/src/sys/unix/stack_overflow.rs +++ b/library/std/src/sys/unix/stack_overflow.rs @@ -34,7 +34,7 @@ impl Drop for Handler { target_os = "freebsd", target_os = "solaris", target_os = "illumos", - all(target_os = "netbsd", not(target_vendor = "rumprun")), + target_os = "netbsd", target_os = "openbsd" ))] mod imp { @@ -218,7 +218,7 @@ mod imp { target_os = "freebsd", target_os = "solaris", target_os = "illumos", - all(target_os = "netbsd", not(target_vendor = "rumprun")), + target_os = "netbsd", target_os = "openbsd", )))] mod imp { diff --git a/library/std/src/sys/unix/thread.rs b/library/std/src/sys/unix/thread.rs index cda17eb4bd2..40c96307514 100644 --- a/library/std/src/sys/unix/thread.rs +++ b/library/std/src/sys/unix/thread.rs @@ -202,7 +202,7 @@ impl Drop for Thread { not(target_os = "linux"), not(target_os = "freebsd"), not(target_os = "macos"), - not(all(target_os = "netbsd", not(target_vendor = "rumprun"))), + not(target_os = "netbsd"), not(target_os = "openbsd"), not(target_os = "solaris") ))] @@ -222,7 +222,7 @@ pub mod guard { target_os = "linux", target_os = "freebsd", target_os = "macos", - all(target_os = "netbsd", not(target_vendor = "rumprun")), + target_os = "netbsd", target_os = "openbsd", target_os = "solaris" ))] |