-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
3 changed files
with
6 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,8 @@ | ||
From 0170462a78e86de9ee95017bfa7e4a3dd620a375 Mon Sep 17 00:00:00 2001 | ||
From: Hood Chatham <[email protected]> | ||
Date: Fri, 2 Jun 2023 11:59:32 -0700 | ||
Subject: [PATCH] Add back fs.findObject and fs.readFile in loadLibData | ||
|
||
See upstream PR: | ||
https://github.com/emscripten-core/emscripten/pull/19513 | ||
--- | ||
src/library_dylink.js | 13 +++++++++++-- | ||
1 file changed, 11 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/library_dylink.js b/src/library_dylink.js | ||
index d7676cdc2..f616d230d 100644 | ||
index 748468aae..c540877b3 100644 | ||
--- a/src/library_dylink.js | ||
+++ b/src/library_dylink.js | ||
@@ -993,14 +993,23 @@ var LibraryDylink = { | ||
@@ -1013,15 +1013,23 @@ var LibraryDylink = { | ||
#endif | ||
|
||
// for wasm, we can use fetch for async, but for fs mode we can only imitate it | ||
|
@@ -27,6 +16,7 @@ index d7676cdc2..f616d230d 100644 | |
+ libData = HEAP8.slice(data, data + dataSize); | ||
} | ||
} | ||
- | ||
+ if (!libData && flags.fs && flags.fs.findObject(libName)) { | ||
+ libData = flags.fs.readFile(libName, {encoding: 'binary'}); | ||
+ if (!(libData instanceof Uint8Array)) { | ||
|
@@ -36,9 +26,6 @@ index d7676cdc2..f616d230d 100644 | |
+ if (libData) { | ||
+ return flags.loadAsync ? Promise.resolve(libData) : libData; | ||
+ } | ||
|
||
var libFile = locateFile(libName); | ||
if (flags.loadAsync) { | ||
-- | ||
2.25.1 | ||
|
||
return asyncLoad(libFile); |
37 changes: 0 additions & 37 deletions
37
...ripten_emscripten-wasm32/patches/0001-Add-useful-error-when-symbol-resolution-fails.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters