Merge branch 'master' into feature/generate-nullfuncs

This commit is contained in:
Mackenzie Clark
2019-03-26 19:04:18 -07:00
3 changed files with 15 additions and 1 deletions

View File

@ -27,6 +27,7 @@ mod file_descriptor;
pub mod stdio;
// EMSCRIPTEN APIS
mod bitwise;
mod emscripten_target;
mod env;
mod errno;
@ -628,6 +629,9 @@ pub fn generate_emscripten_env(globals: &mut EmscriptenGlobals) -> ImportObject
"__longjmp" => func!(crate::jmp::__longjmp),
"_longjmp" => func!(crate::jmp::__longjmp),
// Bitwise
"_llvm_bswap_i64" => func!(crate::bitwise::_llvm_bswap_i64),
// Linking
"_dlclose" => func!(crate::linking::_dlclose),
"_dlerror" => func!(crate::linking::_dlerror),