Merge pull request #2473 from brendena/patch-2

Building EMSCRIPTEN boards on the latest EMCC
espruino · Mar 1, 2024 · e5ffc93 · e5ffc93
2 parents 6be243d + 3218bcc
commit e5ffc93
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/make/family/EMSCRIPTEN.make b/make/family/EMSCRIPTEN.make
@@ -6,5 +6,5 @@ targets/emscripten/jshardware.c
 LIBS += -lc
 #LIBS += -lstdc++
 CFLAGS += -Wno-unused-function -Wno-switch
-LDFLAGS += -s EXPORTED_FUNCTIONS='["_jsInit","_jsIdle","_jsKill","_jshPushIOCharEvent","_jsSendPinWatchEvent","_jsSendTouchEvent","_jshGetDeviceToTransmit","_jshGetCharToTransmit","_jsGfxChanged","_jsGfxGetPtr"]' -s EXTRA_EXPORTED_RUNTIME_METHODS='["ccall"]' -s WASM=0 -s ASSERTIONS=1 --memory-init-file 0 -Oz 
+LDFLAGS += -s EXPORTED_FUNCTIONS='["_jsInit","_jsIdle","_jsKill","_jshPushIOCharEvent","_jsSendPinWatchEvent","_jsSendTouchEvent","_jshGetDeviceToTransmit","_jshGetCharToTransmit","_jsGfxChanged","_jsGfxGetPtr"]' -s EXPORTED_RUNTIME_METHODS='["ccall"]' -s WASM=0 -s ASSERTIONS=1 --memory-init-file 0 -Oz 
 
diff --git a/targets/emscripten/jshardware.c b/targets/emscripten/jshardware.c
@@ -31,6 +31,14 @@
 
 #define FLASH_UNITARY_WRITE_SIZE 4
 #define FAKE_FLASH_BLOCKSIZE 4096
+
+// ----------------------------------------------------------------------------
+/*Reason - Needed for latest build of EMCC(3.1.55).  Else undefined symbol*/
+EM_JS(void, emscripten_memcpy_js, (uint8_t* dest, uint8_t* src, size_t numBytes), {
+  var destHeap = new Uint8Array(Module.HEAPU8.buffer, dest, numBytes);
+  var srcHeap = new Uint8Array(Module.HEAPU8.buffer, src, numBytes);
+  destHeap.set(srcHeap);
+});
 // ----------------------------------------------------------------------------
 
 Pin eventFlagsToPin[16];