diff options
| author | bors <bors@rust-lang.org> | 2016-09-06 16:13:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 16:13:56 -0700 |
| commit | 44ed4873ed93d8f9f0d4c08b0d52b7d95146add6 (patch) | |
| tree | 73fa2d2581512c4c78540d374d0639c62cd7b5f1 | |
| parent | 9b757034bc5af20bfaa342bff984a6148a417ea4 (diff) | |
| parent | ab0499fc799d913dd57c060f5e18a5f7f621a347 (diff) | |
| download | rust-libc-44ed4873ed93d8f9f0d4c08b0d52b7d95146add6.tar.gz | |
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.
| -rw-r--r-- | src/unix/notbsd/linux/musl/b32/mod.rs | 4 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/musl/mod.rs | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/unix/notbsd/linux/musl/b32/mod.rs b/src/unix/notbsd/linux/musl/b32/mod.rs index 6ae90bd04e..899bc69310 100644 --- a/src/unix/notbsd/linux/musl/b32/mod.rs +++ b/src/unix/notbsd/linux/musl/b32/mod.rs @@ -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 { diff --git a/src/unix/notbsd/linux/musl/mod.rs b/src/unix/notbsd/linux/musl/mod.rs index ab4d8af1f7..a1672f7ec0 100644 --- a/src/unix/notbsd/linux/musl/mod.rs +++ b/src/unix/notbsd/linux/musl/mod.rs @@ -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 { } |