Auto merge of #381 - brson:wasm32, r=alexcrichton

Add prelimenary wasm32 support

For the moment there's nothing different about the emscripten libc implementations for asmjs and wasm32.
This commit is contained in:
bors 2016-09-06 16:13:56 -07:00 committed by GitHub
commit 44ed4873ed
2 changed files with 5 additions and 2 deletions

View File

@ -39,7 +39,9 @@ cfg_if! {
} else if #[cfg(any(target_arch = "arm"))] {
mod arm;
pub use self::arm::*;
} else if #[cfg(any(target_arch = "asmjs"))] {
} else if #[cfg(any(target_arch = "asmjs", target_arch = "wasm32"))] {
// For the time being asmjs and wasm32 are the same, and both
// backed by identical emscripten runtimes
mod asmjs;
pub use self::asmjs::*;
} else {

View File

@ -235,7 +235,8 @@ cfg_if! {
} else if #[cfg(any(target_arch = "x86",
target_arch = "mips",
target_arch = "arm",
target_arch = "asmjs"))] {
target_arch = "asmjs",
target_arch = "wasm32"))] {
mod b32;
pub use self::b32::*;
} else { }