Skip to content

fix: Linux/ARM64 memory reallocation failure in 1.19.9 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2022
Merged

fix: Linux/ARM64 memory reallocation failure in 1.19.9 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions patch/1.19.9/LuaJIT-2.1-arm64-memory.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git src/lj_alloc.c src/lj_alloc.c
index 21fb7af5..165203fa 100644
--- src/lj_alloc.c
+++ src/lj_alloc.c
@@ -365,7 +365,7 @@ static void *CALL_MREMAP_(void *ptr, size_t osz, size_t nsz, int flags)
#define CALL_MREMAP(addr, osz, nsz, mv) CALL_MREMAP_((addr), (osz), (nsz), (mv))
#define CALL_MREMAP_NOMOVE 0
#define CALL_MREMAP_MAYMOVE 1
-#if LJ_64 && !LJ_GC64
+#if LJ_64 && (!LJ_GC64 || LJ_TARGET_ARM64)
#define CALL_MREMAP_MV CALL_MREMAP_NOMOVE
#else
#define CALL_MREMAP_MV CALL_MREMAP_MAYMOVE
1 change: 1 addition & 0 deletions patch/patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ elif [[ "$root" == *openresty-1.19.9.* ]]; then
apply_patch "$patch_dir" "$root" "lua-resty-core" "0.1.22"
apply_patch "$patch_dir" "$root" "ngx_lua" "0.10.20"
apply_patch "$patch_dir" "$root" "ngx_stream_lua" "0.0.10"
apply_patch "$patch_dir" "$root" "LuaJIT-2.1" "20210510"
else
err "can't detect OpenResty version"
exit 1
Expand Down