about summary refs log tree commit diff
path: root/src/liballoc_system
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2015-11-26 19:05:10 +0000
committerBrian Anderson <banderson@mozilla.com>2016-02-06 20:56:14 +0000
commitd6c0d859f6d859aa6e418b5ec58246071efbc9de (patch)
tree0faba720f79f5047f27173e7173501b104503903 /src/liballoc_system
parent34af2de4096b3b1c5d3a5b70171c6e27822aaefb (diff)
downloadrust-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/liballoc_system')
-rw-r--r--src/liballoc_system/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs
index 8423492caf1..6a62e00d311 100644
--- a/src/liballoc_system/lib.rs
+++ b/src/liballoc_system/lib.rs
@@ -30,7 +30,8 @@ extern crate libc;
               target_arch = "arm",
               target_arch = "mips",
               target_arch = "powerpc",
-              target_arch = "powerpc64")))]
+              target_arch = "powerpc64",
+              target_arch = "asmjs")))]
 const MIN_ALIGN: usize = 8;
 #[cfg(all(any(target_arch = "x86_64",
               target_arch = "aarch64")))]