From: stephan <stephan@noemail.net>
Date: Thu, 27 Jul 2023 01:35:11 +0000 (+0000)
Subject: Accommodate a breaking change in emcc 3.1.44.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0feda2f12507872628ac0c201c70b202a562f241;p=thirdparty%2Fsqlite.git

Accommodate a breaking change in emcc 3.1.44.

FossilOrigin-Name: 4ce386030092b8bafe860350c66ef5516b6aea75bd1b4467ac184875109d66e7
---

diff --git a/ext/wasm/api/sqlite3-api-cleanup.js b/ext/wasm/api/sqlite3-api-cleanup.js
index 3661464e1b..65dbb4eb64 100644
--- a/ext/wasm/api/sqlite3-api-cleanup.js
+++ b/ext/wasm/api/sqlite3-api-cleanup.js
@@ -22,7 +22,9 @@ if('undefined' !== typeof Module){ // presumably an Emscripten build
   */
   const SABC = Object.assign(
     Object.create(null), {
-      exports: Module['asm'],
+      exports: ('undefined'===typeof wasmExports)
+        ? Module['asm']/* emscripten <=3.1.43 */
+        : wasmExports  /* emscripten >=3.1.44 */,
       memory: Module.wasmMemory /* gets set if built with -sIMPORTED_MEMORY */
     },
     globalThis.sqlite3ApiConfig || {}
diff --git a/manifest b/manifest
index 911d11477b..6385122cd5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Initial\sexperimentation\swith\sgetting\sJSPI\s(JavaScript\sPromise\sIntegration)\ssupport\sworking.\sIt\sbuilds,\sbut\srequires\sdisabling\sfunc\sargument\scount\svalidation\schecks\son\ssqlite3.wasm.xWrap()-processed\sexports\sand\sit\scrashes\scryptically\sin\swasm\swhen\sthe\stests\sare\srun.
-D 2023-07-26T18:11:40.333
+C Accommodate\sa\sbreaking\schange\sin\semcc\s3.1.44.
+D 2023-07-27T01:35:11.655
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F ext/wasm/api/extern-pre-js.js cc61c09c7a24a07dbecb4c352453c3985170cec12b4e7e7e
 F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08902f15c34720ee4a1
 F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
 F ext/wasm/api/pre-js.c-pp.js 572c762b53101781b5e1c35dc62729e3eda616d113153f8199df843a7c1ff6da
-F ext/wasm/api/sqlite3-api-cleanup.js 23ceec5ef74a0e649b19694ca985fd89e335771e21f24f50df352a626a8c81bf
+F ext/wasm/api/sqlite3-api-cleanup.js d235ad237df6954145404305040991c72ef8b1881715d2a650dda7b3c2576d0e
 F ext/wasm/api/sqlite3-api-glue.js 47843a29fb894f8d4b580cc7789f5c9ceaf6fcb9502a43df03db2bfbc4611f77
 F ext/wasm/api/sqlite3-api-oo1.js 9678dc4d9a5d39632b6ffe6ea94a023119260815bf32f265bf5f6c36c9516db8
 F ext/wasm/api/sqlite3-api-prologue.js cbd7d6ba185f3a844a8b0020e954b49bbc2ca78b305d117bec2ceca21431795a
@@ -2044,11 +2044,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P b8f708e35d4fa027d12089ac7c5589c36da5f68b98cf9792bb11276bf233a860
-R b579c0cc362e441177477b3883fcf994
-T *branch * jspi
-T *sym-jspi *
-T -sym-trunk * Cancelled\sby\sbranch.
+P 5b178f92f5faea83734aeacf79a06a8fcfc2f392db5d430d2c083b4d2ff4af5f
+R 72f4b5681f78519d8aaef0748a985688
 U stephan
-Z 37b78cb422886750d5650a379168ec92
+Z 953578e5b49d0c13c5344b55cb683f8f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 96c848e7aa..ae65922f35 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5b178f92f5faea83734aeacf79a06a8fcfc2f392db5d430d2c083b4d2ff4af5f
\ No newline at end of file
+4ce386030092b8bafe860350c66ef5516b6aea75bd1b4467ac184875109d66e7
\ No newline at end of file