From d6c0d859f6d859aa6e418b5ec58246071efbc9de Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 26 Nov 2015 19:05:10 +0000 Subject: Add the asmjs-unknown-emscripten triple. Add cfgs to libs. Backtraces, and the compilation of libbacktrace for asmjs, are disabled. This port doesn't use jemalloc so, like pnacl, it disables jemalloc *for all targets* in the configure file. It disables stack protection. --- src/libstd/os/linux/raw.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/libstd/os/linux') diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index cc7fa23546b..10d37f9f597 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -26,7 +26,8 @@ pub use self::arch::{off_t, ino_t, nlink_t, blksize_t, blkcnt_t, stat, time_t}; #[cfg(any(target_arch = "x86", target_arch = "le32", target_arch = "powerpc", - target_arch = "arm"))] + target_arch = "arm", + target_arch = "asmjs"))] mod arch { use super::{dev_t, mode_t}; use os::raw::{c_long, c_short}; @@ -34,7 +35,14 @@ mod arch { #[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = i32; #[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = i32; - #[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = u32; + + #[stable(feature = "raw_ext", since = "1.1.0")] + #[cfg(not(any(target_env = "musl", target_arch = "asmjs")))] + pub type ino_t = u32; + #[stable(feature = "raw_ext", since = "1.1.0")] + #[cfg(any(target_env = "musl", target_arch = "asmjs"))] + pub type ino_t = u64; + #[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = u32; #[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = i32; #[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = i32; -- cgit 1.4.1-3-g733a5