diff options
| author | bors <bors@rust-lang.org> | 2019-07-25 02:04:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-25 02:04:55 +0000 |
| commit | 185b9acb66438894596f3c40d2ae4c6f7deeb8ab (patch) | |
| tree | a032ed1d213b8f195cee010fb1d43d6623bb2f37 /src/libstd | |
| parent | 03f19f7ff128a3b01eeab3f87f04cce22883f006 (diff) | |
| parent | 0340d72bf5bd8a740d46dee7325b69565b96af52 (diff) | |
| download | rust-185b9acb66438894596f3c40d2ae4c6f7deeb8ab.tar.gz rust-185b9acb66438894596f3c40d2ae4c6f7deeb8ab.zip | |
Auto merge of #62961 - Centril:rollup-kydeswa, r=Centril
Rollup of 9 pull requests Successful merges: - #61727 (Add binary dependencies to dep-info files) - #62736 (Polonius: fix some cases of `killed` fact generation, and most of the `ui` test suite) - #62758 (ci: Install clang on Windows through tarballs) - #62784 (Add riscv32i-unknown-none-elf target) - #62814 (add support for hexagon-unknown-linux-musl) - #62827 (Don't link mcjit/interpreter LLVM components) - #62901 (cleanup: Remove `extern crate serialize as rustc_serialize`s) - #62903 (Support SDKROOT env var on iOS) - #62906 (Require a value for configure --debuginfo-level) Failed merges: - #62910 (cleanup: Remove lint annotations in specific crates that are already enforced by rustbuild) r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 5 | ||||
| -rw-r--r-- | src/libstd/os/linux/raw.rs | 56 | ||||
| -rw-r--r-- | src/libstd/os/raw/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys_common/alloc.rs | 3 |
4 files changed, 65 insertions, 1 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 00e840a53e9..1f5de25b65c 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -975,6 +975,11 @@ mod arch { pub const ARCH: &str = "wasm32"; } +#[cfg(target_arch = "hexagon")] +mod arch { + pub const ARCH: &'static str = "hexagon"; +} + #[cfg(test)] mod tests { use super::*; diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index 77eeacb4b47..21e1cf8a22b 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -147,6 +147,62 @@ mod arch { } } +#[cfg(target_arch = "hexagon")] +mod arch { + use crate::os::raw::{c_long, c_int, c_longlong, culonglong}; + + #[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = c_longlong; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = c_long; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = c_ulonglong; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = c_uint; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = c_longlong; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = c_long; + + #[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_dev: ::dev_t, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_ino: ::c_ulonglong, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_mode: ::c_uint, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_nlink: ::c_uint, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_uid: ::c_uint, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_gid: ::c_uint, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_rdev: ::c_ulonglong, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub __pad1: ::c_ulong, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_size: ::c_longlong, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_blksize: ::blksize_t, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub __pad2: ::c_int, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_blocks: ::blkcnt_t, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_atime: ::time_t, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_atime_nsec: ::c_long, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_mtime: ::time_t, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_mtime_nsec: ::c_long, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_ctime: ::time_t, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub st_ctime_nsec: ::c_long, + #[stable(feature = "raw_ext", since = "1.1.0")] + pub __pad3: [::c_int;2], + } +} + #[cfg(any(target_arch = "mips64", target_arch = "s390x", target_arch = "sparc64"))] diff --git a/src/libstd/os/raw/mod.rs b/src/libstd/os/raw/mod.rs index c0b0b6d40d8..cf8be393a40 100644 --- a/src/libstd/os/raw/mod.rs +++ b/src/libstd/os/raw/mod.rs @@ -11,6 +11,7 @@ #[doc(include = "os/raw/char.md")] #[cfg(any(all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", + target_arch = "hexagon", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x")), @@ -34,6 +35,7 @@ #[doc(include = "os/raw/char.md")] #[cfg(not(any(all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", + target_arch = "hexagon", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x")), diff --git a/src/libstd/sys_common/alloc.rs b/src/libstd/sys_common/alloc.rs index 978a70bee09..1cfc7ed17f2 100644 --- a/src/libstd/sys_common/alloc.rs +++ b/src/libstd/sys_common/alloc.rs @@ -12,7 +12,8 @@ use crate::ptr; target_arch = "powerpc", target_arch = "powerpc64", target_arch = "asmjs", - target_arch = "wasm32")))] + target_arch = "wasm32", + target_arch = "hexagon")))] pub const MIN_ALIGN: usize = 8; #[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64", |
