aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--src/javascript/jsc/bindings/bindings.cpp6
2 files changed, 12 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 532723bc2..504772899 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,7 @@ ARCHIVE_FILES_WITHOUT_LIBCRYPTO = src/deps/mimalloc/libmimalloc.a \
src/deps/libssl.a \
src/deps/picohttpparser.o \
-ARCHIVE_FILES = $(ARCHIVE_FILES_WITHOUT_LIBCRYPTO) src/deps/libcrypto.a
+ARCHIVE_FILES = $(ARCHIVE_FILES_WITHOUT_LIBCRYPTO) src/deps/libcrypto.boring.a
PLATFORM_LINKER_FLAGS =
@@ -224,7 +224,7 @@ boringssl-build:
boringssl-copy:
cp $(DEPS_DIR)/boringssl/build/ssl/libssl.a $(DEPS_DIR)/libssl.a
- cp $(DEPS_DIR)/boringssl/build/crypto/libcrypto.a $(DEPS_DIR)/libcrypto.a
+ cp $(DEPS_DIR)/boringssl/build/crypto/libcrypto.a $(DEPS_DIR)/libcrypto.boring.a
boringssl: boringssl-build boringssl-copy
@@ -316,7 +316,7 @@ fetch:
src/deps/mimalloc/libmimalloc.a \
src/deps/zlib/libz.a \
src/deps/libarchive.a \
- src/deps/libcrypto.a \
+ src/deps/libcrypto.boring.a \
src/deps/libssl.a \
src/deps/picohttpparser.o
@@ -326,7 +326,7 @@ fetch-debug:
src/deps/mimalloc/libmimalloc.a \
src/deps/zlib/libz.a \
src/deps/libarchive.a \
- src/deps/libcrypto.a \
+ src/deps/libcrypto.boring.a \
src/deps/libssl.a \
src/deps/picohttpparser.o
@@ -339,7 +339,7 @@ httpbench-debug:
src/deps/zlib/libz.a \
src/deps/libarchive.a \
src/deps/libssl.a \
- src/deps/libcrypto.a \
+ src/deps/libcrypto.boring.a \
src/deps/picohttpparser.o \
$(LIBCRYPTO_STATIC_LIB)
@@ -351,7 +351,7 @@ httpbench-release:
src/deps/zlib/libz.a \
src/deps/libarchive.a \
src/deps/libssl.a \
- src/deps/libcrypto.a \
+ src/deps/libcrypto.boring.a \
src/deps/picohttpparser.o \
$(LIBCRYPTO_STATIC_LIB)
diff --git a/src/javascript/jsc/bindings/bindings.cpp b/src/javascript/jsc/bindings/bindings.cpp
index 674849fc6..f29cfe1e9 100644
--- a/src/javascript/jsc/bindings/bindings.cpp
+++ b/src/javascript/jsc/bindings/bindings.cpp
@@ -23,6 +23,7 @@
#include <JavaScriptCore/JSObject.h>
#include <JavaScriptCore/JSSet.h>
#include <JavaScriptCore/JSString.h>
+#include <JavaScriptCore/Microtask.h>
#include <JavaScriptCore/ObjectConstructor.h>
#include <JavaScriptCore/ParserError.h>
#include <JavaScriptCore/ScriptExecutable.h>
@@ -37,6 +38,7 @@
#include <wtf/text/WTFString.h>
extern "C" {
+
JSC__JSValue
JSC__JSObject__create(JSC__JSGlobalObject *globalObject, size_t initialCapacity, void *arg2,
void (*ArgFn3)(void *arg0, JSC__JSObject *arg1, JSC__JSGlobalObject *arg2)) {
@@ -283,6 +285,10 @@ bWTF__String JSC__JSString__value(JSC__JSString *arg0, JSC__JSGlobalObject *arg1
// arg2->depen
// }
+void Microtask__run(void *microtask, void *global) {
+ reinterpret_cast<Zig::JSMicrotaskCallback *>(microtask)->call();
+}
+
bool JSC__JSModuleLoader__checkSyntax(JSC__JSGlobalObject *arg0, const JSC__SourceCode *arg1,
bool arg2) {
JSC::ParserError error;