gandc/zapret2
Template
1
0
Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-03-14 06:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

github,linux-builder: revert to lj_alloc for arm64 and mips64

Browse Source
This commit is contained in:
bol-van
2026-03-03 19:25:33 +03:00
parent 96f58adc7a
commit f59ddbb645
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build.yml vendored
View File

@@ -100,6 +100,7 @@ jobs:
export PKG_CONFIG_PATH=$DEPS_DIR/lib/pkgconfig export PKG_CONFIG_PATH=$DEPS_DIR/lib/pkgconfig
export STAGING_DIR=$RUNNER_TEMP export STAGING_DIR=$RUNNER_TEMP
OPTIMIZE=-Oz OPTIMIZE=-Oz
SYSMALLOC=-DLUAJIT_USE_SYSMALLOC
case "$ARCH" in case "$ARCH" in
lexra) lexra)
OPTIMIZE=-Os OPTIMIZE=-Os
@@ -107,6 +108,10 @@ jobs:
arm) arm)
CPU="-mcpu=cortex-a7 -mthumb" CPU="-mcpu=cortex-a7 -mthumb"
;; ;;
arm64|mips64)
# not safe without GC64
SYSMALLOC=
;;
esac esac
MINSIZE="$OPTIMIZE $MINSIZE" MINSIZE="$OPTIMIZE $MINSIZE"
@@ -131,9 +136,10 @@ jobs:
*) *)
HOSTCC="cc -m32" HOSTCC="cc -m32"
esac esac
echo ARCH=$ARCH SYSMALLOC=$SYSMALLOC
( (
cd luajit2-* cd luajit2-*
make BUILDMODE=static XCFLAGS="-DLUAJIT_USE_SYSMALLOC -DLUAJIT_DISABLE_FFI" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$CPU $MINSIZE $CFLAGS" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS" -j$(nproc) make BUILDMODE=static XCFLAGS="$SYSMALLOC -DLUAJIT_DISABLE_FFI" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$CPU $MINSIZE $CFLAGS" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS" -j$(nproc)
make install PREFIX= DESTDIR=$DEPS_DIR make install PREFIX= DESTDIR=$DEPS_DIR
) )
LJIT=1 LJIT=1
@@ -236,10 +242,15 @@ jobs:
export RANLIB=$TOOLCHAIN/bin/llvm-ranlib export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
export STRIP=$TOOLCHAIN/bin/llvm-strip export STRIP=$TOOLCHAIN/bin/llvm-strip
export PKG_CONFIG_PATH=$DEPS_DIR/lib/pkgconfig export PKG_CONFIG_PATH=$DEPS_DIR/lib/pkgconfig
SYSMALLOC=-DLUAJIT_USE_SYSMALLOC
case "$ABI" in case "$ABI" in
armeabi-v7a) armeabi-v7a)
CPU="-mthumb" CPU="-mthumb"
;; ;;
arm64-v8a)
# not safe without GC64
SYSMALLOC=
;;
esac esac
# luajit # luajit
@@ -253,7 +264,7 @@ jobs:
esac esac
( (
cd luajit2-* cd luajit2-*
make BUILDMODE=static XCFLAGS="-DLUAJIT_USE_SYSMALLOC -DLUAJIT_DISABLE_FFI" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$CPU $MINSIZE $CFLAGS" TARGET_LDFLAGS="$LDMINSIZE $LDFLAGS" -j$(nproc) make BUILDMODE=static XCFLAGS="$SYSMALLOC -DLUAJIT_DISABLE_FFI" HOST_CC="$HOSTCC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$CPU $MINSIZE $CFLAGS" TARGET_LDFLAGS="$LDMINSIZE $LDFLAGS" -j$(nproc)
make install PREFIX= DESTDIR=$DEPS_DIR make install PREFIX= DESTDIR=$DEPS_DIR
) )
LJIT=1 LJIT=1

11
docs/compile/builder-linux/build_deps.sh
View File

@@ -62,11 +62,20 @@ build_lua()
build_luajit() build_luajit()
{ {
local CFL="$CFLAGS" local CFL="$CFLAGS"
local SYSMALLOC=
( (
cd luajit2-* cd luajit2-*
CFLAGS="-Os" CFLAGS="-Os"
make clean make clean
make BUILDMODE=static XCFLAGS="-DLUAJIT_USE_SYSMALLOC -DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOST_CC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFL" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS" case $TARGET in
aarch64*|mips64*)
# sysmalloc can cause troubles without GC64. GC64 slows down by 10-15%. better not to use sysmalloc and leave lj_alloc.
;;
*)
# save some exe size
SYSMALLOC=-DLUAJIT_USE_SYSMALLOC
esac
make BUILDMODE=static XCFLAGS="$SYSMALLOC -DLUAJIT_DISABLE_FFI $CFLAGS_PIC" HOST_CC="$HOST_CC" CROSS= CC="$CC" TARGET_AR="$AR rcus" TARGET_STRIP=$STRIP TARGET_CFLAGS="$OPTIMIZE $MINSIZE $CFL" TARGET_LDFLAGS="$CPU $LDMINSIZE $LDFLAGS"
make install PREFIX= DESTDIR="$STAGING_DIR" make install PREFIX= DESTDIR="$STAGING_DIR"
) )
} }