Skip to content

Commit 2d810b5

Browse files
authored
Merge pull request #32469 from JuliaLang/kf/emscriptenlongjmp
Misc backports from kf/wasm3
2 parents 82883a0 + da5a384 commit 2d810b5

File tree

4 files changed

+8
-1
lines changed

4 files changed

+8
-1
lines changed

src/jloptions.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// This file is a part of Julia. License is MIT: https://julialang.org/license
22

33
#include <limits.h>
4+
#include <errno.h>
45

56
#include "julia.h"
67

src/julia.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,6 +1731,11 @@ void (jl_longjmp)(jmp_buf _Buf, int _Value);
17311731
#define jl_setjmp_name "jl_setjmp"
17321732
#define jl_setjmp(a,b) jl_setjmp(a)
17331733
#define jl_longjmp(a,b) jl_longjmp(a,b)
1734+
#elif defined(_OS_EMSCRIPTEN_)
1735+
#define jl_setjmp(a,b) setjmp(a)
1736+
#define jl_longjmp(a,b) longjmp(a,b)
1737+
#define jl_setjmp_f setjmp
1738+
#define jl_setjmp_name "setjmp"
17341739
#else
17351740
// determine actual entry point name
17361741
#if defined(sigsetjmp)

src/signals-unix.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <sys/stat.h>
66
#include <sys/mman.h>
77
#include <pthread.h>
8+
#include <errno.h>
89
#if defined(_OS_DARWIN_) && !defined(MAP_ANONYMOUS)
910
#define MAP_ANONYMOUS MAP_ANON
1011
#endif

src/task.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static void jl_start_fiber(jl_ucontext_t *lastt, jl_ucontext_t *t);
7070
static void jl_swap_fiber(jl_ucontext_t *lastt, jl_ucontext_t *t);
7171

7272
#ifdef JL_HAVE_UNW_CONTEXT
73-
static JL_THREAD unw_cursor_t jl_basecursor;
73+
static JL_THREAD_LOCAL unw_cursor_t jl_basecursor;
7474
#endif
7575

7676
#ifdef ALWAYS_COPY_STACKS

0 commit comments

Comments
 (0)