Auto merge of #60775 - hellow554:no_bitrig, r=joshtriplett
Remove bitrig support from rust
Resolves #60743
using `find` and `rg` I delete every occurence of "bitrig" in the sources, expect for the llvm submodule (is this correct?).
There's also this file 5b8e99bb61/rls-analysis/test_data/rust-analysis/libstd-af9bacceee784405.json which contains a bitrig string in it. What to do with that?
This commit is contained in:
bors
commit
c84a7abf8b
47 changed files with 21 additions and 363 deletions
|
|
@ -177,7 +177,6 @@ def default_build_triple():
|
|||
# The goal here is to come up with the same triple as LLVM would,
|
||||
# at least for the subset of platforms we're willing to target.
|
||||
ostype_mapper = {
|
||||
'Bitrig': 'unknown-bitrig',
|
||||
'Darwin': 'apple-darwin',
|
||||
'DragonFly': 'unknown-dragonfly',
|
||||
'FreeBSD': 'unknown-freebsd',
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ pub fn gnu_target(target: &str) -> &str {
|
|||
}
|
||||
|
||||
pub fn make(host: &str) -> PathBuf {
|
||||
if host.contains("bitrig") || host.contains("dragonfly") || host.contains("freebsd")
|
||||
if host.contains("dragonfly") || host.contains("freebsd")
|
||||
|| host.contains("netbsd") || host.contains("openbsd")
|
||||
{
|
||||
PathBuf::from("gmake")
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@ cfg_if! {
|
|||
}
|
||||
|
||||
#[cfg(any(target_os = "dragonfly",
|
||||
target_os = "bitrig",
|
||||
target_os = "netbsd",
|
||||
target_os = "openbsd"))]
|
||||
mod os {
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
use crate::spec::{TargetOptions, RelroLevel};
|
||||
use std::default::Default;
|
||||
|
||||
pub fn opts() -> TargetOptions {
|
||||
TargetOptions {
|
||||
dynamic_linking: true,
|
||||
executables: true,
|
||||
target_family: Some("unix".to_string()),
|
||||
linker_is_gnu: true,
|
||||
has_rpath: true,
|
||||
position_independent_executables: true,
|
||||
relro_level: RelroLevel::Full,
|
||||
|
||||
.. Default::default()
|
||||
}
|
||||
}
|
||||
|
|
@ -47,7 +47,6 @@ mod android_base;
|
|||
mod apple_base;
|
||||
mod apple_ios_base;
|
||||
mod arm_base;
|
||||
mod bitrig_base;
|
||||
mod cloudabi_base;
|
||||
mod dragonfly_base;
|
||||
mod freebsd_base;
|
||||
|
|
@ -390,8 +389,6 @@ supported_targets! {
|
|||
("i686-unknown-dragonfly", i686_unknown_dragonfly),
|
||||
("x86_64-unknown-dragonfly", x86_64_unknown_dragonfly),
|
||||
|
||||
("x86_64-unknown-bitrig", x86_64_unknown_bitrig),
|
||||
|
||||
("aarch64-unknown-openbsd", aarch64_unknown_openbsd),
|
||||
("i686-unknown-openbsd", i686_unknown_openbsd),
|
||||
("x86_64-unknown-openbsd", x86_64_unknown_openbsd),
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
use crate::spec::{LinkerFlavor, Target, TargetResult};
|
||||
|
||||
pub fn target() -> TargetResult {
|
||||
let mut base = super::bitrig_base::opts();
|
||||
base.cpu = "x86-64".to_string();
|
||||
base.max_atomic_width = Some(64);
|
||||
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
|
||||
base.stack_probes = true;
|
||||
|
||||
Ok(Target {
|
||||
llvm_target: "x86_64-unknown-bitrig".to_string(),
|
||||
target_endian: "little".to_string(),
|
||||
target_pointer_width: "64".to_string(),
|
||||
target_c_int_width: "32".to_string(),
|
||||
data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(),
|
||||
arch: "x86_64".to_string(),
|
||||
target_os: "bitrig".to_string(),
|
||||
target_env: String::new(),
|
||||
target_vendor: "unknown".to_string(),
|
||||
linker_flavor: LinkerFlavor::Gcc,
|
||||
options: base,
|
||||
})
|
||||
}
|
||||
|
|
@ -338,7 +338,6 @@ impl<'a> fmt::Display for Html<'a> {
|
|||
("debug_assertions", None) => "debug-assertions enabled",
|
||||
("target_os", Some(os)) => match &*os.as_str() {
|
||||
"android" => "Android",
|
||||
"bitrig" => "Bitrig",
|
||||
"dragonfly" => "DragonFly BSD",
|
||||
"emscripten" => "Emscripten",
|
||||
"freebsd" => "FreeBSD",
|
||||
|
|
|
|||
|
|
@ -20,8 +20,7 @@ fn main() {
|
|||
} else if target.contains("netbsd") {
|
||||
println!("cargo:rustc-link-lib=pthread");
|
||||
println!("cargo:rustc-link-lib=rt");
|
||||
} else if target.contains("dragonfly") || target.contains("bitrig") ||
|
||||
target.contains("openbsd") {
|
||||
} else if target.contains("dragonfly") || target.contains("openbsd") {
|
||||
println!("cargo:rustc-link-lib=pthread");
|
||||
} else if target.contains("solaris") {
|
||||
println!("cargo:rustc-link-lib=socket");
|
||||
|
|
|
|||
|
|
@ -851,7 +851,6 @@ pub mod consts {
|
|||
/// - ios
|
||||
/// - freebsd
|
||||
/// - dragonfly
|
||||
/// - bitrig
|
||||
/// - netbsd
|
||||
/// - openbsd
|
||||
/// - solaris
|
||||
|
|
|
|||
|
|
@ -974,9 +974,9 @@ mod tests {
|
|||
// s has been moved into the tsa call
|
||||
}
|
||||
|
||||
// FIXME: figure out why this fails on openbsd and bitrig and fix it
|
||||
// FIXME: figure out why this fails on openbsd and fix it
|
||||
#[test]
|
||||
#[cfg(not(any(windows, target_os = "openbsd", target_os = "bitrig")))]
|
||||
#[cfg(not(any(windows, target_os = "openbsd")))]
|
||||
fn to_socket_addr_str_bad() {
|
||||
assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1595,9 +1595,9 @@ mod tests {
|
|||
assert_eq!(format!("{:?}", stream), compare);
|
||||
}
|
||||
|
||||
// FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
|
||||
// FIXME: re-enabled openbsd tests once their socket timeout code
|
||||
// no longer has rounding errors.
|
||||
#[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
|
||||
#[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)]
|
||||
#[cfg_attr(target_env = "sgx", ignore)] // FIXME: https://github.com/fortanix/rust-sgx/issues/31
|
||||
#[test]
|
||||
fn timeouts() {
|
||||
|
|
|
|||
|
|
@ -1024,9 +1024,9 @@ mod tests {
|
|||
assert_eq!(format!("{:?}", udpsock), compare);
|
||||
}
|
||||
|
||||
// FIXME: re-enabled bitrig/openbsd/netbsd tests once their socket timeout code
|
||||
// FIXME: re-enabled openbsd/netbsd tests once their socket timeout code
|
||||
// no longer has rounding errors.
|
||||
#[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
|
||||
#[cfg_attr(any(target_os = "netbsd", target_os = "openbsd"), ignore)]
|
||||
#[test]
|
||||
fn timeouts() {
|
||||
let addr = next_test_ip4();
|
||||
|
|
|
|||
|
|
@ -1,138 +0,0 @@
|
|||
#![stable(feature = "metadata_ext", since = "1.1.0")]
|
||||
|
||||
use crate::fs::Metadata;
|
||||
use crate::sys_common::AsInner;
|
||||
|
||||
#[allow(deprecated)]
|
||||
use crate::os::bitrig::raw;
|
||||
|
||||
/// OS-specific extensions to [`fs::Metadata`].
|
||||
///
|
||||
/// [`fs::Metadata`]: ../../../../std/fs/struct.Metadata.html
|
||||
#[stable(feature = "metadata_ext", since = "1.1.0")]
|
||||
pub trait MetadataExt {
|
||||
/// Gain a reference to the underlying `stat` structure which contains
|
||||
/// the raw information returned by the OS.
|
||||
///
|
||||
/// The contents of the returned `stat` are **not** consistent across
|
||||
/// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the
|
||||
/// cross-Unix abstractions contained within the raw stat.
|
||||
#[stable(feature = "metadata_ext", since = "1.1.0")]
|
||||
#[rustc_deprecated(since = "1.8.0",
|
||||
reason = "deprecated in favor of the accessor \
|
||||
methods of this trait")]
|
||||
#[allow(deprecated)]
|
||||
fn as_raw_stat(&self) -> &raw::stat;
|
||||
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_dev(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_ino(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_mode(&self) -> u32;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_nlink(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_uid(&self) -> u32;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_gid(&self) -> u32;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_rdev(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_size(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_atime(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_atime_nsec(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_mtime(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_mtime_nsec(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_ctime(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_ctime_nsec(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_birthtime(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_birthtime_nsec(&self) -> i64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_blksize(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_blocks(&self) -> u64;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_flags(&self) -> u32;
|
||||
#[stable(feature = "metadata_ext2", since = "1.8.0")]
|
||||
fn st_gen(&self) -> u32;
|
||||
}
|
||||
|
||||
#[stable(feature = "metadata_ext", since = "1.1.0")]
|
||||
impl MetadataExt for Metadata {
|
||||
#[allow(deprecated)]
|
||||
fn as_raw_stat(&self) -> &raw::stat {
|
||||
unsafe {
|
||||
&*(self.as_inner().as_inner() as *const libc::stat
|
||||
as *const raw::stat)
|
||||
}
|
||||
}
|
||||
fn st_dev(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_dev as u64
|
||||
}
|
||||
fn st_ino(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_ino as u64
|
||||
}
|
||||
fn st_mode(&self) -> u32 {
|
||||
self.as_inner().as_inner().st_mode as u32
|
||||
}
|
||||
fn st_nlink(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_nlink as u64
|
||||
}
|
||||
fn st_uid(&self) -> u32 {
|
||||
self.as_inner().as_inner().st_uid as u32
|
||||
}
|
||||
fn st_gid(&self) -> u32 {
|
||||
self.as_inner().as_inner().st_gid as u32
|
||||
}
|
||||
fn st_rdev(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_rdev as u64
|
||||
}
|
||||
fn st_size(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_size as u64
|
||||
}
|
||||
fn st_atime(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_atime as i64
|
||||
}
|
||||
fn st_atime_nsec(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_atime_nsec as i64
|
||||
}
|
||||
fn st_mtime(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_mtime as i64
|
||||
}
|
||||
fn st_mtime_nsec(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_mtime_nsec as i64
|
||||
}
|
||||
fn st_ctime(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_ctime as i64
|
||||
}
|
||||
fn st_ctime_nsec(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_ctime_nsec as i64
|
||||
}
|
||||
fn st_birthtime(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_birthtime as i64
|
||||
}
|
||||
fn st_birthtime_nsec(&self) -> i64 {
|
||||
self.as_inner().as_inner().st_birthtime_nsec as i64
|
||||
}
|
||||
fn st_blksize(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_blksize as u64
|
||||
}
|
||||
fn st_blocks(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_blocks as u64
|
||||
}
|
||||
fn st_gen(&self) -> u32 {
|
||||
self.as_inner().as_inner().st_gen as u32
|
||||
}
|
||||
fn st_flags(&self) -> u32 {
|
||||
self.as_inner().as_inner().st_flags as u32
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
//! Bitrig-specific definitions
|
||||
|
||||
#![stable(feature = "raw_ext", since = "1.1.0")]
|
||||
|
||||
pub mod raw;
|
||||
pub mod fs;
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
//! Bitrig-specific raw type definitions
|
||||
|
||||
#![stable(feature = "raw_ext", since = "1.1.0")]
|
||||
#![rustc_deprecated(since = "1.8.0",
|
||||
reason = "these type aliases are no longer supported by \
|
||||
the standard library, the `libc` crate on \
|
||||
crates.io should be used instead for the correct \
|
||||
definitions")]
|
||||
#![allow(deprecated)]
|
||||
|
||||
use crate::os::raw::c_long;
|
||||
use crate::os::unix::raw::{uid_t, gid_t};
|
||||
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = u64;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = u64;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type dev_t = u64;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type fflags_t = u32;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u64;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type mode_t = u32;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = u64;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = u64;
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i64;
|
||||
|
||||
#[stable(feature = "pthread_t", since = "1.8.0")]
|
||||
pub type pthread_t = usize;
|
||||
|
||||
#[repr(C)]
|
||||
#[derive(Clone)]
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub struct stat {
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_mode: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_dev: i32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_ino: u64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_nlink: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_uid: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_gid: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_rdev: i32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_atime: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_atime_nsec: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_mtime: u64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_mtime_nsec: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_ctime: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_ctime_nsec: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_size: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_blocks: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_blksize: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_flags: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_gen: u32,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_birthtime: i64,
|
||||
#[stable(feature = "raw_ext", since = "1.1.0")]
|
||||
pub st_birthtime_nsec: i64,
|
||||
}
|
||||
|
|
@ -39,7 +39,6 @@ cfg_if! {
|
|||
}
|
||||
|
||||
#[cfg(target_os = "android")] pub mod android;
|
||||
#[cfg(target_os = "bitrig")] pub mod bitrig;
|
||||
#[cfg(target_os = "dragonfly")] pub mod dragonfly;
|
||||
#[cfg(target_os = "freebsd")] pub mod freebsd;
|
||||
#[cfg(target_os = "haiku")] pub mod haiku;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,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",
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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> {
|
||||
|
|
|
|||
|
|
@ -37,12 +37,12 @@ use crate::sys::net::netc::IPV6_DROP_MEMBERSHIP;
|
|||
#[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: c_int = 0x0;
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -1289,7 +1289,6 @@ fn get_concurrency() -> usize {
|
|||
#[cfg(any(
|
||||
target_os = "freebsd",
|
||||
target_os = "dragonfly",
|
||||
target_os = "bitrig",
|
||||
target_os = "netbsd"
|
||||
))]
|
||||
fn num_cpus() -> usize {
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ fn main() {
|
|||
println!("cargo:rustc-link-lib=c++abi");
|
||||
} else if target.contains("solaris") {
|
||||
println!("cargo:rustc-link-lib=gcc_s");
|
||||
} else if target.contains("bitrig") {
|
||||
println!("cargo:rustc-link-lib=c++abi");
|
||||
} else if target.contains("dragonfly") {
|
||||
println!("cargo:rustc-link-lib=gcc_pic");
|
||||
} else if target.contains("windows-gnu") {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
// This test is for *-windows-msvc only.
|
||||
// ignore-android
|
||||
// ignore-bitrig
|
||||
// ignore-cloudabi
|
||||
// ignore-dragonfly
|
||||
// ignore-emscripten
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
// This test is for *-windows-msvc only.
|
||||
// ignore-android
|
||||
// ignore-bitrig
|
||||
// ignore-cloudabi
|
||||
// ignore-dragonfly
|
||||
// ignore-emscripten
|
||||
|
|
|
|||
|
|
@ -6,10 +6,6 @@
|
|||
# is compiled with LTO, it shouldn't strip the symbol from `foo`, and that's the
|
||||
# only way that `foo.c` will successfully compile.
|
||||
|
||||
ifeq ($(UNAME),Bitrig)
|
||||
EXTRACFLAGS := -lc $(EXTRACFLAGS) $(EXTRACXXFLAGS)
|
||||
endif
|
||||
|
||||
all:
|
||||
$(RUSTC) foo.rs --crate-type=rlib
|
||||
$(RUSTC) bar.rs --crate-type=staticlib -C lto -L. -o $(TMPDIR)/libbar.a
|
||||
|
|
|
|||
|
|
@ -88,10 +88,6 @@ else
|
|||
ifeq ($(UNAME),FreeBSD)
|
||||
EXTRACFLAGS := -lm -lpthread -lgcc_s
|
||||
else
|
||||
ifeq ($(UNAME),Bitrig)
|
||||
EXTRACFLAGS := -lm -lpthread
|
||||
EXTRACXXFLAGS := -lc++ -lc++abi
|
||||
else
|
||||
ifeq ($(UNAME),SunOS)
|
||||
EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket -lresolv
|
||||
else
|
||||
|
|
@ -106,7 +102,6 @@ endif
|
|||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
REMOVE_DYLIBS = rm $(TMPDIR)/$(call DYLIB_GLOB,$(1))
|
||||
REMOVE_RLIBS = rm $(TMPDIR)/$(call RLIB_GLOB,$(1))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
# ignore-freebsd
|
||||
# ignore-openbsd
|
||||
# ignore-bitrig
|
||||
# ignore-sunos
|
||||
|
||||
HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //')
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ macro_rules! dump_and_die {
|
|||
all(target_os = "linux", target_arch = "arm"),
|
||||
target_os = "freebsd",
|
||||
target_os = "dragonfly",
|
||||
target_os = "bitrig",
|
||||
target_os = "openbsd")) {
|
||||
// skip these platforms as this support isn't implemented yet.
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -18,9 +18,6 @@ mod hello;
|
|||
#[cfg(target_os = "dragonfly")]
|
||||
mod hello;
|
||||
|
||||
#[cfg(target_os = "bitrig")]
|
||||
mod hello;
|
||||
|
||||
#[cfg(target_os = "android")]
|
||||
mod hello;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
// Tests parallel codegen - this can fail if the symbol for the anonymous
|
||||
// closure in `sum` pollutes the second codegen unit from the first.
|
||||
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen_units=2
|
||||
|
||||
#![feature(iter_arith)]
|
||||
|
|
|
|||
|
|
@ -40,18 +40,6 @@ mod m {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "bitrig")]
|
||||
mod m {
|
||||
#[main]
|
||||
#[cfg(target_arch = "x86_64")]
|
||||
pub fn main() {
|
||||
unsafe {
|
||||
assert_eq!(::rusti::pref_align_of::<u64>(), 8);
|
||||
assert_eq!(::rusti::min_align_of::<u64>(), 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
mod m {
|
||||
#[main]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// run-pass
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen-units=3
|
||||
// aux-build:sepcomp_cci_lib.rs
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// run-pass
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen-units=3
|
||||
// aux-build:sepcomp-extern-lib.rs
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
// run-pass
|
||||
#![allow(dead_code)]
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen-units=3
|
||||
|
||||
// Test references to items that haven't been codegened yet.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// run-pass
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen-units=3
|
||||
|
||||
// Test basic separate compilation functionality. The functions should be able
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
// run-pass
|
||||
#![allow(dead_code)]
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen-units=3
|
||||
|
||||
// Test references to static items across compilation units.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
// run-pass
|
||||
#![allow(dead_code)]
|
||||
// ignore-bitrig
|
||||
// compile-flags: -C codegen-units=3
|
||||
// ignore-emscripten no threads support
|
||||
|
||||
|
|
|
|||
|
|
@ -55,15 +55,6 @@ mod m {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "bitrig")]
|
||||
mod m {
|
||||
#[cfg(target_arch = "x86_64")]
|
||||
pub mod m {
|
||||
pub fn align() -> usize { 8 }
|
||||
pub fn size() -> usize { 16 }
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
mod m {
|
||||
#[cfg(target_arch = "x86")]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
// ignore-android needs extra network permissions
|
||||
// ignore-bitrig system ulimit (Too many open files)
|
||||
// ignore-cloudabi no global network namespace access
|
||||
// ignore-emscripten no threads or sockets support
|
||||
// ignore-netbsd system ulimit (Too many open files)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ pub fn main() {
|
|||
}
|
||||
|
||||
#[cfg(any(target_os = "android",
|
||||
target_os = "bitrig",
|
||||
target_os = "cloudabi",
|
||||
target_os = "dragonfly",
|
||||
target_os = "emscripten",
|
||||
|
|
|
|||
|
|
@ -2217,9 +2217,7 @@ impl<'test> TestCx<'test> {
|
|||
|
||||
fn charset() -> &'static str {
|
||||
// FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
|
||||
if cfg!(target_os = "bitrig") {
|
||||
"auto"
|
||||
} else if cfg!(target_os = "freebsd") {
|
||||
if cfg!(target_os = "freebsd") {
|
||||
"ISO-8859-1"
|
||||
} else {
|
||||
"UTF-8"
|
||||
|
|
@ -2670,8 +2668,7 @@ impl<'test> TestCx<'test> {
|
|||
create_dir_all(&tmpdir).unwrap();
|
||||
|
||||
let host = &self.config.host;
|
||||
let make = if host.contains("bitrig")
|
||||
|| host.contains("dragonfly")
|
||||
let make = if host.contains("dragonfly")
|
||||
|| host.contains("freebsd")
|
||||
|| host.contains("netbsd")
|
||||
|| host.contains("openbsd")
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ use log::*;
|
|||
const OS_TABLE: &'static [(&'static str, &'static str)] = &[
|
||||
("android", "android"),
|
||||
("androideabi", "android"),
|
||||
("bitrig", "bitrig"),
|
||||
("cloudabi", "cloudabi"),
|
||||
("cuda", "cuda"),
|
||||
("darwin", "macos"),
|
||||
|
|
|
|||
Loading…
Reference in a new issue