Skip to content

Commit 44ed487

Browse files
authored
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.
2 parents 9b75703 + ab0499f commit 44ed487

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/unix/notbsd/linux/musl/b32/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ cfg_if! {
3939
} else if #[cfg(any(target_arch = "arm"))] {
4040
mod arm;
4141
pub use self::arm::*;
42-
} else if #[cfg(any(target_arch = "asmjs"))] {
42+
} else if #[cfg(any(target_arch = "asmjs", target_arch = "wasm32"))] {
43+
// For the time being asmjs and wasm32 are the same, and both
44+
// backed by identical emscripten runtimes
4345
mod asmjs;
4446
pub use self::asmjs::*;
4547
} else {

src/unix/notbsd/linux/musl/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,8 @@ cfg_if! {
235235
} else if #[cfg(any(target_arch = "x86",
236236
target_arch = "mips",
237237
target_arch = "arm",
238-
target_arch = "asmjs"))] {
238+
target_arch = "asmjs",
239+
target_arch = "wasm32"))] {
239240
mod b32;
240241
pub use self::b32::*;
241242
} else { }

0 commit comments

Comments
 (0)