emscripten-core · sbc100 · Dec 6, 2019 · Dec 4, 2019 · Dec 6, 2019 · kripken
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -388,7 +388,7 @@ jobs:
       - run:
           name: get wasmer
           command: |
-            wget https://github.com/wasmerio/wasmer/releases/download/0.9.0/wasmer-linux-amd64.tar.gz
+            wget https://github.com/wasmerio/wasmer/releases/download/0.11.0/wasmer-linux-amd64.tar.gz
             tar -xf wasmer-linux-amd64.tar.gz
             mkdir ~/vms
             cp bin/wasmer ~/vms

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -22,7 +22,11 @@ Current Trunk
   disabled. There is no "Module.canvas" object, no magic "null" default handling,
   and DOM element 'target' parameters are taken to refer to CSS selectors, instead 
   of referring to DOM IDs. For more information see:
-  https://groups.google.com/forum/#!msg/emscripten-discuss/xScZ_LRIByk/_gEy67utDgAJ
+  <https://groups.google.com/forum/#!msg/emscripten-discuss/xScZ_LRIByk/_gEy67utDgAJ>
+- WASI API updated to from `wasi_unstable` to `wasi_snapshot_preview1` this
+  is mostly an implementation detail but if you use `WASI_STANDALONE` it means
+  that the output of emscripten now requires a runtime with
+  `wasi_snapshot_preview1` support.
 
 v1.39.4: 12/03/2019
 -------------------

diff --git a/src/library_syscall.js b/src/library_syscall.js
@@ -1852,7 +1852,7 @@ var WASI_SYSCALLS = set([
   'fd_sync',
 ]);
 
-// Fallback for cases where the wasi_unstable.name prefixing fails,
+// Fallback for cases where the wasi_interface_version.name prefixing fails,
 // and we have the full name from C. This happens in fastcomp which
 // lacks the attribute to set the import module and base names.
 if (!WASM_BACKEND) {

diff --git a/src/library_wasi.js b/src/library_wasi.js
@@ -91,7 +91,7 @@ var WasiLibrary = {
   },
 };
 
-// Fallback for cases where the wasi_unstable.name prefixing fails,
+// Fallback for cases where the wasi_interface_version.name prefixing fails,
 // and we have the full name from C. This happens in fastcomp which
 // lacks the attribute to set the import module and base names.
 if (!WASM_BACKEND) {

diff --git a/src/preamble.js b/src/preamble.js
@@ -933,7 +933,7 @@ function createWasm() {
   // prepare imports
   var info = {
     'env': asmLibraryArg,
-    'wasi_unstable': asmLibraryArg
+    '{{{ WASI_MODULE_NAME }}}': asmLibraryArg
 #if WASM_BACKEND == 0
     ,
     'global': {

diff --git a/src/settings.js b/src/settings.js
@@ -593,7 +593,7 @@ var ASYNCIFY_IMPORTS = [
   'emscripten_idb_store', 'emscripten_idb_delete', 'emscripten_idb_exists',
   'emscripten_idb_load_blob', 'emscripten_idb_store_blob', 'SDL_Delay',
   'emscripten_scan_registers', 'emscripten_lazy_load_code',
-  'wasi_unstable.fd_sync', '__wasi_fd_sync',
+  'wasi_snapshot_preview1.fd_sync', '__wasi_fd_sync',
 ];
 
 // Whether indirect calls can be on the stack during an unwind/rewind.

diff --git a/src/settings_internal.js b/src/settings_internal.js
@@ -81,3 +81,5 @@ var IMPLEMENTED_FUNCTIONS = [];
 
 // Name of the file containing the Fetch *.fetch.js, if relevant
 var FETCH_WORKER_FILE = '';
+
+var WASI_MODULE_NAME = "wasi_snapshot_preview1";
diff --git a/src/struct_info.json b/src/struct_info.json
@@ -1576,7 +1576,7 @@
         ]
     },
     {
-        "file": "wasi/wasi.h",
+        "file": "wasi/api.h",
         "structs": {
             "__wasi_fdstat_t": [
                 "fs_filetype",

diff --git a/src/support.js b/src/support.js
@@ -534,7 +534,7 @@ function loadWebAssemblyModule(binary, flags) {
       },
       'global.Math': Math,
       env: proxy,
-      wasi_unstable: proxy,
+      {{{ WASI_MODULE_NAME }}}: proxy,
       'asm2wasm': asm2wasmImports
     };
 #if ASSERTIONS

diff --git a/system/include/libc/fcntl.h b/system/include/libc/fcntl.h
@@ -2,7 +2,7 @@
 #define	_FCNTL_H
 
 #ifdef __EMSCRIPTEN__
-#include <wasi/wasi.h>
+#include <wasi/api.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/system/include/libc/stdio.h b/system/include/libc/stdio.h
@@ -2,7 +2,7 @@
 #define _STDIO_H
 
 #ifdef __EMSCRIPTEN__
-#include <wasi/wasi.h>
+#include <wasi/api.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/system/include/libc/unistd.h b/system/include/libc/unistd.h
@@ -2,7 +2,7 @@
 #define	_UNISTD_H
 
 #ifdef __EMSCRIPTEN__
-#include <wasi/wasi.h>
+#include <wasi/api.h>
 #endif
 
 #ifdef __cplusplus
Original file line number	Diff line number	Diff line change
		@@ -81,3 +81,5 @@ var IMPLEMENTED_FUNCTIONS = [];

		// Name of the file containing the Fetch *.fetch.js, if relevant
		var FETCH_WORKER_FILE = '';

		var WASI_MODULE_NAME = "wasi_snapshot_preview1";