From a3356d2609af11a63d4f0d4c4a91a8754d7f296c Mon Sep 17 00:00:00 2001
From: john-1 <john-1@users.noreply.github.com>
Date: Tue, 21 Apr 2026 15:05:51 +0300
Subject: [PATCH] Switch CI and build.sh to arm-hisiv500-linux toolchain

The arm-himix200-linux toolchain (GCC 6.3) fails to compile board.c
due to GCC 6+ rejecting weak aliases to non-static inline functions.
The arm-hisiv500-linux toolchain (GCC 4.9) compiles cleanly and matches
the vendor SDK.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/build.yml | 29 +++++++++++++++++++----------
 build.sh                    |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2012cd..f654e75 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,12 @@ jobs:
         board: [hi3516av200, hi3519v101]
 
     steps:
+      - name: Install 32-bit libs
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update -qq
+          sudo apt-get install -y -qq zlib1g:i386 libc6:i386 libstdc++6:i386
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -23,7 +29,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: toolchain
-          key: arm-himix200-linux-v1
+          key: arm-hisiv500-linux-v2
 
       - name: Download toolchain
         if: steps.cache-tc.outputs.cache-hit != 'true'
@@ -31,21 +37,24 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           gh release download v1 -R OpenIPC/toolchains \
-            -p 'arm-himix200-linux.tgz.part*'
-          cat arm-himix200-linux.tgz.part* > arm-himix200-linux.tgz
-          rm arm-himix200-linux.tgz.part*
+            -p 'arm-hisiv500-linux.tgz'
           mkdir -p toolchain
-          tar xzf arm-himix200-linux.tgz -C toolchain
-          tar xjf toolchain/arm-himix200-linux/arm-himix200-linux.tar.bz2 -C toolchain
-          rm arm-himix200-linux.tgz
+          tar xzf arm-hisiv500-linux.tgz -C toolchain
+          tar xjf toolchain/arm-hisiv500-linux/arm-hisiv500-linux.tar.bz2 -C toolchain
+          rm arm-hisiv500-linux.tgz
+          # Create short-name symlinks (target/bin/ has absolute symlinks that won't work)
+          cd toolchain/arm-hisiv500-linux/bin
+          for f in arm-hisiv500-linux-uclibcgnueabi-*; do
+            ln -sf "$f" "${f/-uclibcgnueabi/}"
+          done
 
       - name: Build
         run: |
-          export PATH="$PWD/toolchain/arm-himix200-linux/bin:$PATH"
+          export PATH="$PWD/toolchain/arm-hisiv500-linux/bin:$PATH"
           make ${{ matrix.board }}_config
           cp reg_info_${{ matrix.board }}.bin .reg
-          make CROSS_COMPILE=arm-himix200-linux- -j$(nproc)
-          make CROSS_COMPILE=arm-himix200-linux- mini-boot.bin
+          make CROSS_COMPILE=arm-hisiv500-linux- -j$(nproc)
+          make CROSS_COMPILE=arm-hisiv500-linux- mini-boot.bin
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
diff --git a/build.sh b/build.sh
index 0eced9f..0f83aed 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 export ARCH=arm
-export CROSS_COMPILE=${CROSS_COMPILE:-arm-himix200-linux-}
+export CROSS_COMPILE=${CROSS_COMPILE:-arm-hisiv500-linux-}
 
 OUTPUTDIR="${OUTPUTDIR:-.}"
 SOCS="hi3516av200 hi3519v101"