[Tarantool-patches] [PATCH luajit] ARM64: Allow building with unwinding disabled.
Maksim Kokryashkin
max.kokryashkin at gmail.com
Mon Dec 11 14:26:55 MSK 2023
From: Mike Pall <mike>
(cherry-picked from commit 5677985dc1f19cf0a67112f4365c7fb79237fa16)
Prior to this patch, the LuaJIT build with the
`-DLUAJIT_NO_UNWIND=1` option enabled failed on ARM64 because of
linker relocation errors related to dwarf-specific code. This
patch disables emission of the `.eh_frame` section for builds
without unwinding to solve the issue.
The `LUAJIT_NO_UNWIND` build option is added to CMakeLists.txt.
This patch adds this build flavor to our exotic builds workflow.
Maxim Kokryashkin:
* added the description for the problem
Part of tarantool/tarantool#9145
---
Branch: https://github.com/tarantool/luajit/tree/fckxorg/lj-866-allow-building-with-unwinding-disabled
PR: https://github.com/tarantool/tarantool/pull/9463
Issues: https://github.com/tarantool/tarantool/issues/9145
https://github.com/LuaJIT/LuaJIT/issues/866
.github/workflows/exotic-builds-testing.yml | 4 +++-
CMakeLists.txt | 5 +++++
src/vm_arm64.dasc | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/exotic-builds-testing.yml b/.github/workflows/exotic-builds-testing.yml
index 7c57d238..a9ba5fd5 100644
--- a/.github/workflows/exotic-builds-testing.yml
+++ b/.github/workflows/exotic-builds-testing.yml
@@ -34,7 +34,7 @@ jobs:
BUILDTYPE: [Debug, Release]
ARCH: [ARM64, x86_64]
GC64: [ON, OFF]
- FLAVOR: [checkhook, dualnum, gdbjit, nojit]
+ FLAVOR: [checkhook, dualnum, gdbjit, nojit, nounwind]
include:
- BUILDTYPE: Debug
CMAKEFLAGS: -DCMAKE_BUILD_TYPE=Debug -DLUA_USE_ASSERT=ON -DLUA_USE_APICHECK=ON
@@ -48,6 +48,8 @@ jobs:
FLAVORFLAGS: -DLUAJIT_DISABLE_JIT=ON
- FLAVOR: gdbjit
FLAVORFLAGS: -DLUAJIT_USE_GDBJIT=ON
+ - FLAVOR: nounwind
+ FLAVORFLAGS: -DLUAJIT_NO_UNWIND=ON
exclude:
- ARCH: ARM64
GC64: OFF
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ef10f2f..7f5e2afb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,11 @@ if(LUAJIT_DISABLE_UNWIND_JIT)
AppendFlags(TARGET_C_FLAGS -DLUAJIT_DISABLE_UNWIND_JIT)
endif()
+option(LUAJIT_NO_UNWIND "Disable external unwinding.")
+if(LUAJIT_NO_UNWIND)
+ AppendFlags(TARGET_C_FLAGS -DLUAJIT_NO_UNWIND)
+endif()
+
# Disable memory profiler.
option(LUAJIT_DISABLE_MEMPROF "LuaJIT memory profiler support" OFF)
if(LUAJIT_DISABLE_MEMPROF)
diff --git a/src/vm_arm64.dasc b/src/vm_arm64.dasc
index 0a12b5b7..1cf1ea51 100644
--- a/src/vm_arm64.dasc
+++ b/src/vm_arm64.dasc
@@ -3915,6 +3915,7 @@ static void emit_asm_debug(BuildCtx *ctx)
"\t.align 3\n"
".LEFDE1:\n\n", (int)ctx->codesz - fcofs);
#endif
+#if !LJ_NO_UNWIND
fprintf(ctx->fp, "\t.section .eh_frame,\"a\",%%progbits\n");
fprintf(ctx->fp,
".Lframe1:\n"
@@ -3982,6 +3983,7 @@ static void emit_asm_debug(BuildCtx *ctx)
"\t.byte 0x94\n\t.uleb128 4\n" /* offset x20 */
"\t.align 3\n"
".LEFDE3:\n\n", (int)ctx->codesz - fcofs);
+#endif
#endif
break;
#if !LJ_NO_UNWIND
--
2.39.3 (Apple Git-145)
More information about the Tarantool-patches
mailing list