Remove bitrig support from rust

This commit is contained in:
Marcel Hellwig
2019-05-13 09:13:07 +02:00
parent fe5f42cdb8
commit cc314b066a
47 changed files with 21 additions and 363 deletions

View File

@@ -49,7 +49,6 @@ impl DoubleEndedIterator for Args {
target_os = "android",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "bitrig",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",

View File

@@ -53,17 +53,6 @@ pub mod os {
pub const EXE_EXTENSION: &str = "";
}
#[cfg(target_os = "bitrig")]
pub mod os {
pub const FAMILY: &str = "unix";
pub const OS: &str = "bitrig";
pub const DLL_PREFIX: &str = "lib";
pub const DLL_SUFFIX: &str = ".so";
pub const DLL_EXTENSION: &str = "so";
pub const EXE_SUFFIX: &str = "";
pub const EXE_EXTENSION: &str = "";
}
#[cfg(target_os = "netbsd")]
pub mod os {
pub const FAMILY: &str = "unix";

View File

@@ -32,12 +32,12 @@ use crate::sys_common::{self, AsInner, FromInner, IntoInner};
#[cfg(any(target_os = "linux", target_os = "android",
target_os = "dragonfly", target_os = "freebsd",
target_os = "openbsd", target_os = "netbsd",
target_os = "haiku", target_os = "bitrig"))]
target_os = "haiku"))]
use libc::MSG_NOSIGNAL;
#[cfg(not(any(target_os = "linux", target_os = "android",
target_os = "dragonfly", target_os = "freebsd",
target_os = "openbsd", target_os = "netbsd",
target_os = "haiku", target_os = "bitrig")))]
target_os = "haiku")))]
const MSG_NOSIGNAL: libc::c_int = 0x0;
fn sun_path_offset() -> usize {

View File

@@ -147,8 +147,7 @@ impl FileAttr {
}))
}
#[cfg(any(target_os = "bitrig",
target_os = "freebsd",
#[cfg(any(target_os = "freebsd",
target_os = "openbsd",
target_os = "macos",
target_os = "ios"))]
@@ -159,8 +158,7 @@ impl FileAttr {
}))
}
#[cfg(not(any(target_os = "bitrig",
target_os = "freebsd",
#[cfg(not(any(target_os = "freebsd",
target_os = "openbsd",
target_os = "macos",
target_os = "ios")))]
@@ -355,7 +353,6 @@ impl DirEntry {
#[cfg(any(target_os = "freebsd",
target_os = "openbsd",
target_os = "bitrig",
target_os = "netbsd",
target_os = "dragonfly"))]
pub fn ino(&self) -> u64 {
@@ -367,8 +364,7 @@ impl DirEntry {
target_os = "netbsd",
target_os = "openbsd",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "bitrig"))]
target_os = "dragonfly"))]
fn name_bytes(&self) -> &[u8] {
use crate::slice;
unsafe {

View File

@@ -5,7 +5,6 @@ use crate::io::ErrorKind;
#[cfg(any(rustdoc, target_os = "linux"))] pub use crate::os::linux as platform;
#[cfg(all(not(rustdoc), target_os = "android"))] pub use crate::os::android as platform;
#[cfg(all(not(rustdoc), target_os = "bitrig"))] pub use crate::os::bitrig as platform;
#[cfg(all(not(rustdoc), target_os = "dragonfly"))] pub use crate::os::dragonfly as platform;
#[cfg(all(not(rustdoc), target_os = "freebsd"))] pub use crate::os::freebsd as platform;
#[cfg(all(not(rustdoc), target_os = "haiku"))] pub use crate::os::haiku as platform;

View File

@@ -33,8 +33,7 @@ extern {
target_os = "fuchsia",
target_os = "l4re"),
link_name = "__errno_location")]
#[cfg_attr(any(target_os = "bitrig",
target_os = "netbsd",
#[cfg_attr(any(target_os = "netbsd",
target_os = "openbsd",
target_os = "android",
target_os = "hermit",
@@ -257,7 +256,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
sysctl().or_else(|_| procfs())
}
#[cfg(any(target_os = "bitrig", target_os = "openbsd"))]
#[cfg(target_os = "openbsd")]
pub fn current_exe() -> io::Result<PathBuf> {
unsafe {
let mut mib = [libc::CTL_KERN,

View File

@@ -25,7 +25,6 @@ impl Drop for Handler {
#[cfg(any(target_os = "linux",
target_os = "macos",
target_os = "bitrig",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "solaris",
@@ -139,7 +138,6 @@ mod imp {
#[cfg(any(target_os = "linux",
target_os = "macos",
target_os = "bitrig",
target_os = "freebsd",
target_os = "netbsd",
target_os = "openbsd",
@@ -185,7 +183,6 @@ mod imp {
#[cfg(not(any(target_os = "linux",
target_os = "macos",
target_os = "bitrig",
target_os = "dragonfly",
target_os = "freebsd",
target_os = "solaris",

View File

@@ -99,7 +99,6 @@ impl Thread {
#[cfg(any(target_os = "freebsd",
target_os = "dragonfly",
target_os = "bitrig",
target_os = "openbsd"))]
pub fn set_name(name: &CStr) {
unsafe {
@@ -189,7 +188,6 @@ impl Drop for Thread {
#[cfg(all(not(all(target_os = "linux", not(target_env = "musl"))),
not(target_os = "freebsd"),
not(target_os = "macos"),
not(target_os = "bitrig"),
not(all(target_os = "netbsd", not(target_vendor = "rumprun"))),
not(target_os = "openbsd"),
not(target_os = "solaris")))]
@@ -205,7 +203,6 @@ pub mod guard {
#[cfg(any(all(target_os = "linux", not(target_env = "musl")),
target_os = "freebsd",
target_os = "macos",
target_os = "bitrig",
all(target_os = "netbsd", not(target_vendor = "rumprun")),
target_os = "openbsd",
target_os = "solaris"))]
@@ -236,16 +233,15 @@ pub mod guard {
Some(stackaddr as *mut libc::c_void)
}
#[cfg(any(target_os = "openbsd", target_os = "bitrig"))]
#[cfg(target_os = "openbsd")]
unsafe fn get_stack_start() -> Option<*mut libc::c_void> {
let mut current_stack: libc::stack_t = crate::mem::zeroed();
assert_eq!(libc::pthread_stackseg_np(libc::pthread_self(),
&mut current_stack), 0);
let extra = if cfg!(target_os = "bitrig") {3} else {1} * PAGE_SIZE;
let stackaddr = if libc::pthread_main_np() == 1 {
// main thread
current_stack.ss_sp as usize - current_stack.ss_size + extra
current_stack.ss_sp as usize - current_stack.ss_size + PAGE_SIZE
} else {
// new thread
current_stack.ss_sp as usize - current_stack.ss_size
@@ -343,7 +339,6 @@ pub mod guard {
}
#[cfg(any(target_os = "macos",
target_os = "bitrig",
target_os = "openbsd",
target_os = "solaris"))]
pub unsafe fn current() -> Option<Guard> {