Skip to content

Commit

Permalink
Android: Recompile LuaJIT binaries with NDK 26.1.10909125.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikuAuahDark
MikuAuahDark committed Jan 26, 2024
1 parent 17eb2fe commit 2071a68
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 32 deletions.
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/arm64-v8a/jit/bcsave.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Save LuaJIT bytecode: luajit -b[options] input output
-- Stop handling options.
- Use stdin as input and/or stdout as output.
File types: c h obj o raw (default)
File types: c cc h obj o raw (default)
]]
os.exit(1)
end
Expand Down Expand Up @@ -81,7 +81,7 @@ end
------------------------------------------------------------------------------

local map_type = {
raw = "raw", c = "c", h = "h", o = "obj", obj = "obj",
raw = "raw", c = "c", cc = "c", h = "h", o = "obj", obj = "obj",
}

local map_arch = {
Expand Down
5 changes: 2 additions & 3 deletions libs/LuaJIT/android/arm64-v8a/jit/dis_arm64.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ local function disass_ins(ctx)
elseif p == "U" then
local rn = map_regs.x[band(rshift(op, 5), 31)]
local sz = band(rshift(op, 30), 3)
local imm12 = lshift(arshift(lshift(op, 10), 20), sz)
local imm12 = lshift(rshift(lshift(op, 10), 20), sz)
if imm12 ~= 0 then
x = "["..rn..", #"..imm12.."]"
else
Expand Down Expand Up @@ -985,8 +985,7 @@ local function disass_ins(ctx)
x = x.."]"
end
elseif p == "P" then
local opcv, sh = rshift(op, 26), 2
if opcv >= 0x2a then sh = 4 elseif opcv >= 0x1b then sh = 3 end
local sh = 2 + rshift(op, 31 - band(rshift(op, 26), 1))
local imm7 = lshift(arshift(lshift(op, 10), 25), sh)
local rn = map_regs.x[band(rshift(op, 5), 31)]
local ind = band(rshift(op, 23), 3)
Expand Down
2 changes: 1 addition & 1 deletion libs/LuaJIT/android/arm64-v8a/jit/vmdef.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- This is a generated file. DO NOT EDIT!

assert(require("jit").version == "LuaJIT 2.1.1694316387", "LuaJIT core/library version mismatch")
assert(require("jit").version == "LuaJIT 2.1.1700008891", "LuaJIT core/library version mismatch")

return {

Expand Down
Binary file modified libs/LuaJIT/android/arm64-v8a/libluajit.a
View file
Binary file not shown.
Binary file modified libs/LuaJIT/android/arm64-v8a/libluajit.so
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/arm64-v8a/luajit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#include "lua.h"

#define LUAJIT_VERSION "LuaJIT 2.1.1694316387"
#define LUAJIT_VERSION "LuaJIT 2.1.1700008891"
#define LUAJIT_VERSION_NUM 20199 /* Deprecated. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1694316387
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1700008891
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2023 Mike Pall"
#define LUAJIT_URL "https://luajit.org/"

Expand Down
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/armeabi-v7a/jit/bcsave.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Save LuaJIT bytecode: luajit -b[options] input output
-- Stop handling options.
- Use stdin as input and/or stdout as output.
File types: c h obj o raw (default)
File types: c cc h obj o raw (default)
]]
os.exit(1)
end
Expand Down Expand Up @@ -81,7 +81,7 @@ end
------------------------------------------------------------------------------

local map_type = {
raw = "raw", c = "c", h = "h", o = "obj", obj = "obj",
raw = "raw", c = "c", cc = "c", h = "h", o = "obj", obj = "obj",
}

local map_arch = {
Expand Down
5 changes: 2 additions & 3 deletions libs/LuaJIT/android/armeabi-v7a/jit/dis_arm64.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ local function disass_ins(ctx)
elseif p == "U" then
local rn = map_regs.x[band(rshift(op, 5), 31)]
local sz = band(rshift(op, 30), 3)
local imm12 = lshift(arshift(lshift(op, 10), 20), sz)
local imm12 = lshift(rshift(lshift(op, 10), 20), sz)
if imm12 ~= 0 then
x = "["..rn..", #"..imm12.."]"
else
Expand Down Expand Up @@ -985,8 +985,7 @@ local function disass_ins(ctx)
x = x.."]"
end
elseif p == "P" then
local opcv, sh = rshift(op, 26), 2
if opcv >= 0x2a then sh = 4 elseif opcv >= 0x1b then sh = 3 end
local sh = 2 + rshift(op, 31 - band(rshift(op, 26), 1))
local imm7 = lshift(arshift(lshift(op, 10), 25), sh)
local rn = map_regs.x[band(rshift(op, 5), 31)]
local ind = band(rshift(op, 23), 3)
Expand Down
2 changes: 1 addition & 1 deletion libs/LuaJIT/android/armeabi-v7a/jit/vmdef.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- This is a generated file. DO NOT EDIT!

assert(require("jit").version == "LuaJIT 2.1.1694316387", "LuaJIT core/library version mismatch")
assert(require("jit").version == "LuaJIT 2.1.1700008891", "LuaJIT core/library version mismatch")

return {

Expand Down
Binary file modified libs/LuaJIT/android/armeabi-v7a/libluajit.a
View file
Binary file not shown.
Binary file modified libs/LuaJIT/android/armeabi-v7a/libluajit.so
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/armeabi-v7a/luajit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#include "lua.h"

#define LUAJIT_VERSION "LuaJIT 2.1.1694316387"
#define LUAJIT_VERSION "LuaJIT 2.1.1700008891"
#define LUAJIT_VERSION_NUM 20199 /* Deprecated. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1694316387
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1700008891
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2023 Mike Pall"
#define LUAJIT_URL "https://luajit.org/"

Expand Down
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/x86/jit/bcsave.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Save LuaJIT bytecode: luajit -b[options] input output
-- Stop handling options.
- Use stdin as input and/or stdout as output.
File types: c h obj o raw (default)
File types: c cc h obj o raw (default)
]]
os.exit(1)
end
Expand Down Expand Up @@ -81,7 +81,7 @@ end
------------------------------------------------------------------------------

local map_type = {
raw = "raw", c = "c", h = "h", o = "obj", obj = "obj",
raw = "raw", c = "c", cc = "c", h = "h", o = "obj", obj = "obj",
}

local map_arch = {
Expand Down
5 changes: 2 additions & 3 deletions libs/LuaJIT/android/x86/jit/dis_arm64.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ local function disass_ins(ctx)
elseif p == "U" then
local rn = map_regs.x[band(rshift(op, 5), 31)]
local sz = band(rshift(op, 30), 3)
local imm12 = lshift(arshift(lshift(op, 10), 20), sz)
local imm12 = lshift(rshift(lshift(op, 10), 20), sz)
if imm12 ~= 0 then
x = "["..rn..", #"..imm12.."]"
else
Expand Down Expand Up @@ -985,8 +985,7 @@ local function disass_ins(ctx)
x = x.."]"
end
elseif p == "P" then
local opcv, sh = rshift(op, 26), 2
if opcv >= 0x2a then sh = 4 elseif opcv >= 0x1b then sh = 3 end
local sh = 2 + rshift(op, 31 - band(rshift(op, 26), 1))
local imm7 = lshift(arshift(lshift(op, 10), 25), sh)
local rn = map_regs.x[band(rshift(op, 5), 31)]
local ind = band(rshift(op, 23), 3)
Expand Down
2 changes: 1 addition & 1 deletion libs/LuaJIT/android/x86/jit/vmdef.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- This is a generated file. DO NOT EDIT!

assert(require("jit").version == "LuaJIT 2.1.1694316387", "LuaJIT core/library version mismatch")
assert(require("jit").version == "LuaJIT 2.1.1700008891", "LuaJIT core/library version mismatch")

return {

Expand Down
Binary file modified libs/LuaJIT/android/x86/libluajit.a
View file
Binary file not shown.
Binary file modified libs/LuaJIT/android/x86/libluajit.so
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/x86/luajit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#include "lua.h"

#define LUAJIT_VERSION "LuaJIT 2.1.1694316387"
#define LUAJIT_VERSION "LuaJIT 2.1.1700008891"
#define LUAJIT_VERSION_NUM 20199 /* Deprecated. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1694316387
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1700008891
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2023 Mike Pall"
#define LUAJIT_URL "https://luajit.org/"

Expand Down
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/x86_64/jit/bcsave.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Save LuaJIT bytecode: luajit -b[options] input output
-- Stop handling options.
- Use stdin as input and/or stdout as output.
File types: c h obj o raw (default)
File types: c cc h obj o raw (default)
]]
os.exit(1)
end
Expand Down Expand Up @@ -81,7 +81,7 @@ end
------------------------------------------------------------------------------

local map_type = {
raw = "raw", c = "c", h = "h", o = "obj", obj = "obj",
raw = "raw", c = "c", cc = "c", h = "h", o = "obj", obj = "obj",
}

local map_arch = {
Expand Down
5 changes: 2 additions & 3 deletions libs/LuaJIT/android/x86_64/jit/dis_arm64.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ local function disass_ins(ctx)
elseif p == "U" then
local rn = map_regs.x[band(rshift(op, 5), 31)]
local sz = band(rshift(op, 30), 3)
local imm12 = lshift(arshift(lshift(op, 10), 20), sz)
local imm12 = lshift(rshift(lshift(op, 10), 20), sz)
if imm12 ~= 0 then
x = "["..rn..", #"..imm12.."]"
else
Expand Down Expand Up @@ -985,8 +985,7 @@ local function disass_ins(ctx)
x = x.."]"
end
elseif p == "P" then
local opcv, sh = rshift(op, 26), 2
if opcv >= 0x2a then sh = 4 elseif opcv >= 0x1b then sh = 3 end
local sh = 2 + rshift(op, 31 - band(rshift(op, 26), 1))
local imm7 = lshift(arshift(lshift(op, 10), 25), sh)
local rn = map_regs.x[band(rshift(op, 5), 31)]
local ind = band(rshift(op, 23), 3)
Expand Down
2 changes: 1 addition & 1 deletion libs/LuaJIT/android/x86_64/jit/vmdef.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- This is a generated file. DO NOT EDIT!

assert(require("jit").version == "LuaJIT 2.1.1694316387", "LuaJIT core/library version mismatch")
assert(require("jit").version == "LuaJIT 2.1.1700008891", "LuaJIT core/library version mismatch")

return {

Expand Down
Binary file modified libs/LuaJIT/android/x86_64/libluajit.a
View file
Binary file not shown.
Binary file modified libs/LuaJIT/android/x86_64/libluajit.so
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions libs/LuaJIT/android/x86_64/luajit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

#include "lua.h"

#define LUAJIT_VERSION "LuaJIT 2.1.1694316387"
#define LUAJIT_VERSION "LuaJIT 2.1.1700008891"
#define LUAJIT_VERSION_NUM 20199 /* Deprecated. */
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1694316387
#define LUAJIT_VERSION_SYM luaJIT_version_2_1_1700008891
#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2023 Mike Pall"
#define LUAJIT_URL "https://luajit.org/"

Expand Down
1 change: 1 addition & 0 deletions libs/LuaJIT/android_build_readme.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ wsl make ^
TARGET_LDFLAGS=-fuse-ld=lld ^
TARGET_STRIP=llvm-strip.exe ^
TARGET_SONAME=libluajit.so ^
CCDEBUG=-g ^
"GIT_RELVER=cp ../.relver luajit_relver.txt" ^
amalg -j%NUMBER_OF_PROCESSORS%
if not "%ERRORLEVEL%" == "0" goto :error
Expand Down

0 comments on commit 2071a68

Please sign in to comment.