From c43a89d3c1d592aae954674959790629af9f6cbf Mon Sep 17 00:00:00 2001
From: ophir <pere.jobs@gmail.com>
Date: Sat, 3 Oct 2020 23:30:34 +0200
Subject: [PATCH] Switch to emscripten 2

---
 .github/workflows/CI.yml      | 4 ++--
 .github/workflows/release.yml | 2 +-
 Makefile                      | 1 -
 package-lock.json             | 2 +-
 package.json                  | 2 +-
 src/api.js                    | 6 +++---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 83f8a536..b22ff332 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -11,10 +11,10 @@ jobs:
       id: cache
       with:
         path: '.emsdk-cache'
-        key: emscripten-1.39.20
+        key: emscripten-2.0.6
     - uses: mymindstorm/setup-emsdk@2a4a91b
       with:
-        version: '1.39.20'
+        version: '2.0.6'
         actions-cache-folder: '.emsdk-cache'
     - name: make
       run: make
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 60fb5b7b..592d9823 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: mymindstorm/setup-emsdk@2a4a91b
-        with: {version: '1.39.20'}
+        with: {version: '2.0.6'}
       - name: make
         run: make
       - name: Create Release
diff --git a/Makefile b/Makefile
index 69c0c4e9..a5e6614a 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,6 @@ EMFLAGS_OPTIMIZED= \
 	-s INLINING_LIMIT=50 \
 	-O3 \
 	-flto \
-	--llvm-lto 1 \
 	--closure 1
 
 EMFLAGS_DEBUG = \
diff --git a/package-lock.json b/package-lock.json
index 0830214d..6df3ef3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "sql.js",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/package.json b/package.json
index 9fb4572e..66324e0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sql.js",
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"description": "SQLite library with support for opening and writing databases, prepared statements, and more. This SQLite library is in pure javascript (compiled with emscripten).",
 	"keywords": [
 		"sql",
diff --git a/src/api.js b/src/api.js
index b69eec42..537b67db 100644
--- a/src/api.js
+++ b/src/api.js
@@ -474,7 +474,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
             this.pos += 1;
         }
         var bytes = intArrayFromString(string);
-        var strptr = allocate(bytes, "i8", ALLOC_NORMAL);
+        var strptr = allocate(bytes, ALLOC_NORMAL);
         this.allocatedmem.push(strptr);
         this.db.handleError(sqlite3_bind_text(
             this.stmt,
@@ -491,7 +491,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
             pos = this.pos;
             this.pos += 1;
         }
-        var blobptr = allocate(array, "i8", ALLOC_NORMAL);
+        var blobptr = allocate(array, ALLOC_NORMAL);
         this.allocatedmem.push(blobptr);
         this.db.handleError(sqlite3_bind_blob(
             this.stmt,
@@ -983,7 +983,7 @@ Module["onRuntimeInitialized"] = function onRuntimeInitialized() {
                     if (result === null) {
                         sqlite3_result_null(cx);
                     } else if (result.length != null) {
-                        var blobptr = allocate(result, "i8", ALLOC_NORMAL);
+                        var blobptr = allocate(result, ALLOC_NORMAL);
                         sqlite3_result_blob(cx, blobptr, result.length, -1);
                         _free(blobptr);
                     } else {