From 1aaf73858cff4ef358f4731b066d711c4099f24a Mon Sep 17 00:00:00 2001 From: bol-van Date: Sat, 28 Feb 2026 18:20:46 +0300 Subject: [PATCH] builder-linux armv7 thumb --- docs/compile/builder-linux/build_deps.sh | 2 +- docs/compile/builder-linux/build_zapret1.sh | 4 +++- docs/compile/builder-linux/build_zapret2.sh | 2 ++ docs/compile/builder-linux/common.inc | 13 +++++++++---- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/compile/builder-linux/build_deps.sh b/docs/compile/builder-linux/build_deps.sh index 9d6c308..2c1b0c2 100755 --- a/docs/compile/builder-linux/build_deps.sh +++ b/docs/compile/builder-linux/build_deps.sh @@ -91,8 +91,8 @@ ask_target CFLAGS_BASE="$CFLAGS" for t in $TGT; do - buildenv $t CFLAGS="$CFLAGS_BASE $CFLAGS_PIC" + buildenv $t pushd "$DEPS" install_h_files build_netlink diff --git a/docs/compile/builder-linux/build_zapret1.sh b/docs/compile/builder-linux/build_zapret1.sh index 08cc9cc..eb95137 100755 --- a/docs/compile/builder-linux/build_zapret1.sh +++ b/docs/compile/builder-linux/build_zapret1.sh @@ -36,7 +36,9 @@ ask_target [ -d "$ZBIN" ] || mkdir -p "$ZBIN" +CFLAGS_BASE="$CFLAGS" for t in $TGT; do + CFLAGS="$CFLAGS_BASE $MINSIZE $CFLAGS_PIC" buildenv $t translate_target $t || { @@ -48,7 +50,7 @@ for t in $TGT; do make clean OPTIMIZE=$OPTIMIZE \ - CFLAGS="-static-libgcc -I$STAGING_DIR/include $MINSIZE $CFLAGS_PIC $CFLAGS" \ + CFLAGS="-static-libgcc -I$STAGING_DIR/include $CFLAGS" \ LDFLAGS="-L$STAGING_DIR/lib $LDMINSIZE $LDFLAGS_PIE $LDFLAGS" \ make diff --git a/docs/compile/builder-linux/build_zapret2.sh b/docs/compile/builder-linux/build_zapret2.sh index 811ab95..25d3ac6 100755 --- a/docs/compile/builder-linux/build_zapret2.sh +++ b/docs/compile/builder-linux/build_zapret2.sh @@ -36,7 +36,9 @@ ask_target [ -d "$ZBIN" ] || mkdir -p "$ZBIN" +CFLAGS_BASE="$CFLAGS" for t in $TGT; do + CFLAGS="$CFLAGS_BASE" buildenv $t translate_target $t || { diff --git a/docs/compile/builder-linux/common.inc b/docs/compile/builder-linux/common.inc index 77673a2..af53e93 100644 --- a/docs/compile/builder-linux/common.inc +++ b/docs/compile/builder-linux/common.inc @@ -98,12 +98,17 @@ buildenv() LDFLAGS_PIE=-static # not all archs support -static-pie. if does not support - it produces dynamic executable # "-static -static-pie" causes segfaults - [ "$PIE" = 1 ] && case $1 in - arm-*|mips*) + case $1 in + arm-*) + CFLAGS="-march=armv7-a -mthumb $CFLAGS" + ;; + mips*) ;; *) - CFLAGS_PIC=-fPIC - LDFLAGS_PIE="-static-pie" + [ "$PIE" = 1 ] && { + CFLAGS_PIC=-fPIC + LDFLAGS_PIE="-static-pie" + } esac }