diff options
| author | Brian Anderson <banderson@mozilla.com> | 2015-11-26 19:05:10 +0000 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2016-02-06 20:56:14 +0000 |
| commit | d6c0d859f6d859aa6e418b5ec58246071efbc9de (patch) | |
| tree | 0faba720f79f5047f27173e7173501b104503903 /src/libstd/sys/common | |
| parent | 34af2de4096b3b1c5d3a5b70171c6e27822aaefb (diff) | |
| download | rust-d6c0d859f6d859aa6e418b5ec58246071efbc9de.tar.gz rust-d6c0d859f6d859aa6e418b5ec58246071efbc9de.zip | |
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.
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/args.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/common/mod.rs | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/libstd/sys/common/args.rs b/src/libstd/sys/common/args.rs index 4600983eb3b..58417540664 100644 --- a/src/libstd/sys/common/args.rs +++ b/src/libstd/sys/common/args.rs @@ -39,7 +39,8 @@ pub fn clone() -> Option<Vec<Vec<u8>>> { imp::clone() } target_os = "bitrig", target_os = "netbsd", target_os = "openbsd", - target_os = "solaris"))] + target_os = "solaris", + target_os = "emscripten"))] mod imp { use prelude::v1::*; diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index 956f6005f1c..3f70afe6ad7 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -86,6 +86,10 @@ pub const unwinder_private_data_size: usize = 2; #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] pub const unwinder_private_data_size: usize = 2; +#[cfg(target_arch = "asmjs")] +// FIXME: Copied from arm. Need to confirm. +pub const unwinder_private_data_size: usize = 20; + #[repr(C)] pub struct _Unwind_Exception { pub exception_class: _Unwind_Exception_Class, diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs index 5062be8cd63..56628a4c754 100644 --- a/src/libstd/sys/common/mod.rs +++ b/src/libstd/sys/common/mod.rs @@ -45,7 +45,7 @@ pub mod unwind; pub mod util; pub mod wtf8; -#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios"))), +#[cfg(any(all(unix, not(any(target_os = "macos", target_os = "ios", target_os = "emscripten"))), all(windows, target_env = "gnu")))] pub mod gnu; |