aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMITSUNARI Shigeo <herumi@nifty.com>2018-05-27 22:56:06 +0800
committerMITSUNARI Shigeo <herumi@nifty.com>2018-05-27 22:56:06 +0800
commit4a397e4e8e38ea1e6fb50848f43dede0287df56b (patch)
tree57fabffa0c7d61f5ff78dc93c945ebb9a3980175
parent600cc468d8884edbd8945dbe55cf2e86e5b48ed7 (diff)
downloaddexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.tar
dexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.tar.gz
dexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.tar.bz2
dexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.tar.lz
dexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.tar.xz
dexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.tar.zst
dexon-bls-4a397e4e8e38ea1e6fb50848f43dede0287df56b.zip
noexception build
-rw-r--r--Makefile2
-rw-r--r--src/bls_c.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8da1756..740499d 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ EMCC_OPT+=-DMCLBN_FP_UNIT_SIZE=6
JS_DEP=src/bls_c.cpp ../mcl/src/fp.cpp Makefile
../bls-wasm/bls_c.js: $(JS_DEP)
- emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -DMCL_MAX_BIT_SIZE=384 -DMCL_USE_WEB_CRYPTO_API -s DISABLE_EXCEPTION_CATCHING=1
+ emcc -o $@ src/bls_c.cpp ../mcl/src/fp.cpp $(EMCC_OPT) -DMCL_MAX_BIT_SIZE=384 -DMCL_USE_WEB_CRYPTO_API -s DISABLE_EXCEPTION_CATCHING=1 -DCYBOZU_DONT_USE_EXCEPTION -DCYBOZU_DONT_USE_STRING -fno-exceptions
bls-wasm:
$(MAKE) ../bls-wasm/bls_c.js
diff --git a/src/bls_c.cpp b/src/bls_c.cpp
index c7541a6..27de518 100644
--- a/src/bls_c.cpp
+++ b/src/bls_c.cpp
@@ -33,6 +33,10 @@ int blsInitNotThreadSafe(int curve, int maxUnitSize)
}
#ifdef __EMSCRIPTEN__
+extern "C" BLS_DLL_API void *blsMalloc(size_t n)
+{
+ return malloc(n);
+}
extern "C" BLS_DLL_API void blsFree(void *p)
{
free(p);