Re-apply hard-float toolchain configuration

Re-applies the target architecture and FPU changes from cc50788
(reverted on dev in a3b718c) on top of the soft-float baseline: Cortex-M7
with hardware VFPv5 FPU (-mfloat-abi=hard), plus uClibc-ng built with
UCLIBC_HAS_FPU=y. Hard-float support and the resulting device-side fixes
are being developed here rather than on dev directly.

README.md

@@ -21,15 +21,16 @@
 | OpenSSL      | 3.0.13 | Криптография              |
 | LibVNCServer | 0.9.14 | VNC-сервер                |
 | FreeType     | 2.13.2 | Рендеринг шрифтов         |
+| libnl        | 3.2.0  | Netlink для Linux         |
 
 Все библиотеки собираются статически.
 
 ## Характеристики целевой платформы
 
-- **Архитектура:** ARM 32-bit (ARMv7-m)
+- **Архитектура:** ARM 32-bit (ARMv7E-M, Cortex-M7 / i.MX RT1050)
 - **Набор инструкций:** Thumb
 - **ABI:** EABI с поддержкой FDPIC
-- **Плавающая точка:** программная (soft float)
+- **Плавающая точка:** аппаратная (FPU VFPv5, `fpv5-d16`, `-mfloat-abi=hard`)
 - **Потоки:** отключены
 - **TLS:** отключён
 
@@ -41,6 +42,8 @@
 - cmake
 - wget
 - bzip2
+- bison (или yacc)
+- flex
 - tar
 - стандартные утилиты (grep, sed и т.д.)
 
@@ -48,7 +51,7 @@
 
 ```bash
 sudo apt update
-sudo apt install -y make gcc g++ cmake wget bzip2 tar sed grep xz-utils
+sudo apt install -y make gcc g++ cmake wget bzip2 bison flex tar sed grep xz-utils
 ```
 
 ## Использование
@@ -102,7 +105,7 @@ source ./env.sh
 | Переменная | Значение | Назначение |
 |------------|----------|------------|
 | `CFLAGS`   | `-O2` | Базовые флаги оптимизации |
-| `CFLAGS_FOR_TARGET`   | `-Os -mthumb` | Оптимизация по размеру, Thumb для target |
+| `CFLAGS_FOR_TARGET`   | `-Os -mthumb -mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard` | Оптимизация по размеру, Thumb, аппаратный FPU для target |
 | `LDFLAGS`  | `-Wl,--fdpic` | Линковка с поддержкой FDPIC (при полной настройке toolchain) |
 
 ## Структура каталогов
@@ -111,6 +114,7 @@ source ./env.sh
 build-toolchain/
 ├── build-toolchain.sh          # Основной скрипт сборки
 ├── build-libraries.sh          # Сборка дополнительных библиотек
+├── package-toolchain.sh        # Упаковка готового тулчейна
 ├── download_prerequisites.sh   # Загрузка исходников
 ├── scripts/
 │   └── env.sh                  # Настройка окружения (копируется в архив)

build-libraries.sh

@@ -13,7 +13,7 @@ TARGET="arm-uclinuxfdpiceabi"
 TOOLCHAIN="${TARGET}"
 TOOLCHAIN_PATH="${INSTALL_DIR}/bin"
 CFLAGS_TOOLSET='-O2'
-CFLAGS_TARGET='-Os -mthumb'
+CFLAGS_TARGET='-Os -mthumb -mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard'
 _ORIG_PATH="$PATH"
 
 export SYSROOT="${SYSROOT_DIR}"
@@ -38,7 +38,7 @@ export LDFLAGS=""
 export CFLAGS_FOR_TARGET="${CFLAGS_TARGET}"
 export CXXFLAGS_FOR_TARGET="${CFLAGS_TARGET}"
 export LDFLAGS_FOR_TARGET='-Wl,--fdpic'
-export SUBARCH=armv7-m
+export SUBARCH=armv7e-m
 export SUBMODE=thumb
 export PATH="${TOOLCHAIN_PATH}:${_ORIG_PATH}"
 
@@ -89,6 +89,30 @@ make install
 
 # ==================================================================
 
+cd "${LIB_BUILD_DIR}/libnl-${LIBNL_VER}"
+if ! command -v flex >/dev/null 2>&1; then
+    echo "Ошибка: для сборки libnl нужен flex (пакет flex)."
+    exit 1
+fi
+if ! command -v bison >/dev/null 2>&1; then
+    echo "Ошибка: для сборки libnl нужен bison (byacc не подходит)."
+    exit 1
+fi
+export YACC="bison -y"
+export LEX="flex"
+./configure \
+    --host="${TARGET}" \
+    --prefix="${SYSROOT_USR_DIR}" \
+    --libdir="${SYSROOT_USR_DIR}/lib" \
+    --disable-shared \
+    --enable-static \
+    --disable-cli
+make -j$(nproc)
+make install
+unset YACC LEX
+
+# ==================================================================
+
 OPENSSL_S_SERVER_FILE="${LIB_BUILD_DIR}/openssl-${OPENSSL_VER}/apps/s_server.c"
 if [ -f "${OPENSSL_S_SERVER_FILE}" ] && ! grep -q '^#include <sys/stat.h>$' "${OPENSSL_S_SERVER_FILE}"; then
     echo "== Патч OpenSSL: добавляю <sys/stat.h> в apps/s_server.c =="
@@ -104,7 +128,7 @@ cd "${LIB_BUILD_DIR}/openssl-${OPENSSL_VER}"
     no-shared no-dso no-async no-comp no-idea no-tests no-threads no-asm no-secure-memory no-seed no-weak-ssl-ciphers \
     no-afalgeng no-aria no-async no-bf no-blake2 no-camellia no-capieng no-cast no-chacha no-cms no-cmp no-ct \
     no-dgram no-dsa no-dtls no-ecdh no-ecdsa no-engine no-err no-filenames no-gost \
-    no-ocsp no-pinshared no-poly1305 no-posix-io no-rc2 no-rc4 no-rdrand no-rfc3779 no-rmd160 no-scrypt no-sctp no-siphash \
+    no-pinshared no-poly1305 no-posix-io no-rc2 no-rc4 no-rdrand no-rfc3779 no-rmd160 no-scrypt no-sctp no-siphash \
     no-sm3 no-srp no-srtp no-ssl-trace no-ssl3 no-ssl3-method no-ts no-whirlpool enable-ktls \
     -DNO_FORK -DHAVE_FORK=0
 

build-toolchain.sh

@@ -18,9 +18,14 @@ source "$(dirname "$0")/versions.sh"
 # Основные параметры тулчейна
 # ==================================================================
 TARGET="arm-uclinuxfdpiceabi"
-SUBARCH="armv7-m"
+SUBARCH="armv7e-m"
 SUBMODE="thumb"
 
+# Cortex-M7 (i.MX RT1050) с аппаратным FPU (VFPv5, двойная точность)
+TARGET_CPU="cortex-m7"
+TARGET_FPU="fpv5-d16"
+TARGET_FLOAT_ABI="hard"
+
 TOP="$(pwd)"
 CONFIGS_DIR="${TOP}/config"
 
@@ -36,7 +41,7 @@ KERNEL_SYSROOT_USR_DIR="${KERNEL_SYSROOT_DIR}/usr"
 KERNEL_SYSROOT_USR_INCLUDES_DIR="${KERNEL_SYSROOT_USR_DIR}/include"
 
 CFLAGS_TOOLSET='-O2'
-CFLAGS_TARGET='-Os -mthumb'
+CFLAGS_TARGET="-Os -mthumb -mcpu=${TARGET_CPU} -mfpu=${TARGET_FPU} -mfloat-abi=${TARGET_FLOAT_ABI}"
 
 export CFLAGS=$CFLAGS_TOOLSET
 export CFLAGS_FOR_TARGET=$CFLAGS_TARGET
@@ -109,7 +114,9 @@ mkdir -p "${BUILD_DIR}/gcc1" && cd "${BUILD_DIR}/gcc1"
 "${SRC_GCC}/configure" \
     --target="${TARGET}" \
     --prefix="${INSTALL_DIR}" \
-    --with-arch="${SUBARCH}" \
+    --with-cpu="${TARGET_CPU}" \
+    --with-fpu="${TARGET_FPU}" \
+    --with-float="${TARGET_FLOAT_ABI}" \
     --with-mode="${SUBMODE}" \
     --without-headers \
     --with-newlib \
@@ -186,10 +193,12 @@ mkdir -p "${BUILD_DIR}/gcc2" && cd "${BUILD_DIR}/gcc2"
     --target="${TARGET}" \
     --prefix="${INSTALL_DIR}" \
     --with-sysroot="${KERNEL_SYSROOT_DIR}" \
-    --with-arch="${SUBARCH}" \
+    --with-cpu="${TARGET_CPU}" \
+    --with-fpu="${TARGET_FPU}" \
+    --with-float="${TARGET_FLOAT_ABI}" \
     --with-mode="${SUBMODE}" \
     --enable-languages=c,c++ \
-    --disable-threads \
+    --enable-threads=posix \
     --enable-fdpic \
     --disable-libstdcxx-pch \
     --disable-libitm \
@@ -211,21 +220,8 @@ cd "${TOP}"
 # ==================================================================
 # Strip и упаковка
 # ==================================================================
-echo "== Strip toolchain и упаковка =="
-
 cd "${TOP}"
-WDIR=$(mktemp -d)
+bash ./package-toolchain.sh "${TARGET}" "${SUBARCH}" "${INSTALL_DIR}"
-trap 'rm -rf "$WDIR"' EXIT
-
-ARCHIVE_TOOLCHAIN_DIR="${WDIR}/${TARGET}"
-mkdir -p "${ARCHIVE_TOOLCHAIN_DIR}"
-cp -a "${INSTALL_DIR}"/* "${ARCHIVE_TOOLCHAIN_DIR}/"
-cp -a "${TOP}/scripts/env.sh" "${WDIR}/env.sh"
-
-find "${ARCHIVE_TOOLCHAIN_DIR}" -type f -executable -exec strip -p {} \; 2>/dev/null || true
-
-tar -C "$WDIR" --owner=0 --group=0 -cJf "toolset-jlv-${SUBARCH}-gcc${GCC_VER}-uclibc${UCLIBC_VER}.tar.xz" "${TARGET}" "env.sh"
-echo "Готово: toolset-jlv-${SUBARCH}-gcc${GCC_VER}-uclibc${UCLIBC_VER}.tar.xz"
 
 # ==================================================================
 # Очистка

config/config-uClibc-ng-1.0.34

@@ -52,8 +52,8 @@ ARCH_WANTS_LITTLE_ENDIAN=y
 ARCH_HAS_MMU=y
 # ARCH_USE_MMU is not set
 UCLIBC_HAS_FLOATS=y
-# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_FPU=y
-UCLIBC_HAS_SOFT_FLOAT=y
+# UCLIBC_HAS_SOFT_FLOAT is not set
 DO_C99_MATH=y
 DO_XSI_MATH=y
 UCLIBC_HAS_LONG_DOUBLE_MATH=y

download_prerequisites.sh

@@ -42,6 +42,7 @@ toolchain_files=(
 
 # Исходники библиотек
 libs_files=(
+    "https://www.infradead.org/~tgr/libnl/files/libnl-${LIBNL_VER}.tar.gz"
     "https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VER}.tar.gz"
     "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${LIBVNCSERVER_VER}.tar.gz"
     "https://www.openssl.org/source/openssl-${OPENSSL_VER}.tar.gz"

package-toolchain.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+source "$(dirname "$0")/versions.sh"
+
+TOP="$(pwd)"
+TARGET="${1:-arm-uclinuxfdpiceabi}"
+SUBARCH="${2:-armv7-m}"
+INSTALL_DIR="${3:-${TOP}/build/install}"
+
+if [ ! -d "${INSTALL_DIR}" ]; then
+    echo "Ошибка: директория установки не найдена: ${INSTALL_DIR}"
+    exit 1
+fi
+
+if [ ! -f "${TOP}/scripts/env.sh" ]; then
+    echo "Ошибка: файл окружения не найден: ${TOP}/scripts/env.sh"
+    exit 1
+fi
+
+echo "== Strip toolchain и упаковка =="
+
+WDIR="$(mktemp -d)"
+trap 'rm -rf "$WDIR"' EXIT
+
+ARCHIVE_TOOLCHAIN_DIR="${WDIR}/${TARGET}"
+mkdir -p "${ARCHIVE_TOOLCHAIN_DIR}"
+cp -a "${INSTALL_DIR}"/* "${ARCHIVE_TOOLCHAIN_DIR}/"
+cp -a "${TOP}/scripts/env.sh" "${WDIR}/env.sh"
+
+find "${ARCHIVE_TOOLCHAIN_DIR}" -type f -executable -exec strip -p {} \; 2>/dev/null || true
+
+ARCHIVE_NAME="toolset-jlv-${SUBARCH}-gcc${GCC_VER}-uclibc${UCLIBC_VER}.tar.xz"
+tar -C "${WDIR}" --owner=0 --group=0 -cJf "${ARCHIVE_NAME}" "${TARGET}" "env.sh"
+
+echo "Готово: ${ARCHIVE_NAME}"

scripts/env.sh

@@ -1,10 +1,10 @@
 
 TOP=`pwd`
 TARGET=arm-uclinuxfdpiceabi
-CFLAGS_TOOLSET='-O2' 
+CFLAGS_TOOLSET='-O2'
-CFLAGS_TARGET='-Os -mthumb'
+CFLAGS_TARGET='-Os -mthumb -mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard'
 CFLAGS=$CFLAGS_TOOLSET CFLAGS_FOR_TARGET=$CFLAGS_TARGET CXXFLAGS_FOR_TARGET=$CFLAGS_TARGET
-SUBARCH=armv7-m 
+SUBARCH=armv7e-m
-SUBMODE=thumb 
+SUBMODE=thumb
 PATH=${TOP}/${TARGET}/bin:${PATH}
 

versions.sh

@@ -13,3 +13,4 @@ ZLIB_VER="1.2.13"
 OPENSSL_VER="3.0.13"
 LIBVNCSERVER_VER="0.9.14"
 FREETYPE_VER="2.13.2"
+LIBNL_VER="3.2.0"