[Tarantool-patches] [PATCH luajit 2/2] OSX/iOS/ARM64: Fix bytecode embedding in Mach-O object file.

Sergey Kaplun skaplun at tarantool.org
Mon Apr 8 18:16:44 MSK 2024


Hi, Sergey!
The version on branch LGTM, except a single nit regarding the commit
message below.

On 14.03.24, Sergey Bronnikov wrote:
> From: sergeyb at tarantool.org
> 
> Thanks to Carlo Cabrera.
> 
> (cherry picked from commit b98b37231bd2dcb79e10b0f974cefd91eb0d7b3a)
> 
> Mach-O FAR object files generated by LuaJIT for arm64 had an incorrect

Typo: s/FAR/FAT/

> format because FFI structure used for generation was wrong:
> `mach_fat_obj` instead of `mach_fat_obj_64`.

I suggest reformulating this as the following:

| Mach-O FAT object files generated by LuaJIT for arm64 had an incorrect
| format due to the usage of the 32-bit version of FFI structure.
| This patch adds the 64-bit structure definition and uses it for arm64.

> 
> Sergey Bronnikov:
> * added the description and a test for the problem
> 
> Part of tarantool/tarantool#9595
> ---
>  src/jit/bcsave.lua                                 | 14 +++++++++++++-
>  ...-fix_generation_of_mach-o_object_files.test.lua |  4 +++-
>  2 files changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/src/jit/bcsave.lua b/src/jit/bcsave.lua
> index 7aec1555..069cf1a3 100644
> --- a/src/jit/bcsave.lua
> +++ b/src/jit/bcsave.lua

<snipped>

> diff --git a/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua b/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua
> index 0519e134..0a11f163 100644
> --- a/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua
> +++ b/test/tarantool-tests/lj-865-fix_generation_of_mach-o_object_files.test.lua

<snipped>

> -- 
> 2.34.1
> 

-- 
Best regards,
Sergey Kaplun


More information about the Tarantool-patches mailing list