From 56bece70fc8b057dbb914ef235bdf0fb071c0530 Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Sun, 10 Aug 2025 22:59:18 +0300
Subject: [PATCH 1/5] CI: sink linux abi into matrix

---
 .github/workflows/CI-linux.yml | 41 +++++++++++++++-------------------
 .github/workflows/CI.yml       | 15 +++++++------
 .github/workflows/rustfmt.yml  |  1 +
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/CI-linux.yml b/.github/workflows/CI-linux.yml
index bd19d425..0a61dbb6 100644
--- a/.github/workflows/CI-linux.yml
+++ b/.github/workflows/CI-linux.yml
@@ -13,6 +13,9 @@ on:
       builder-target:
         required: true
         type: string
+      rust-toolchain-abi:
+        required: true
+        type: string
       distro-image:
         required: true
         type: string
@@ -136,14 +139,6 @@ jobs:
           GCC_ARCH=${{ inputs.builder-target }}
           fi
           echo "GCC_ARCH=$(echo ${GCC_ARCH})" >> $GITHUB_ENV
-          if [ "${{ inputs.builder-target }}" = "armv6" ]; then
-          ABI=gnueabi
-          elif [ "${{ inputs.builder-target }}" = "armv7" ]; then
-          ABI=gnueabihf
-          else
-          ABI=gnu
-          fi
-          echo "ABI=$(echo ${ABI})" >> $GITHUB_ENV
           if    [ "${{ inputs.builder-target }}" = "s390x" ]      \
              || [ "${{ inputs.builder-target }}" = "powerpc64" ];
           then
@@ -199,24 +194,24 @@ jobs:
           . "$HOME/.cargo/env"
 
           eatmydata apt install \
-            gcc-${{ env.GCC_ARCH }}-linux-${{ env.ABI }} \
+            gcc-${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }} \
             libc6-dev-${{ env.LIBC6_ARCH }}-cross \
             qemu-user \
             qemu-user-binfmt \
             ;
-          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ env.ABI }}-clang
-          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ env.ABI }}-clang++
-          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ env.ABI }}-ld
-          rustup target add ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }}
-          LINKER="${{ inputs.builder-target }}-unknown-linux-${{ env.ABI }}-clang"
+          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-clang
+          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-clang++
+          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-ld
+          rustup target add ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }}
+          LINKER="${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-clang"
           if [ "${{ inputs.builder-target }}" = "powerpc64" ]; then
           # LLD/clang does not support powerpc64 ELFv1 ABI
-          LINKER="${{ env.GCC_ARCH }}-linux-${{ env.ABI }}-gcc"
+          LINKER="${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }}-gcc"
           fi
           tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
-          [target.${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }}]
+          [target.${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }}]
           linker = "${LINKER}"
-          runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-linux-${{ env.ABI }}"
+          runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }}"
           EOT
       - name: Install necessary packages for code coverage
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -272,7 +267,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo check --target ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo check --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Run Clippy
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -280,7 +275,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo clippy --target ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo clippy --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Build
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -288,7 +283,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo build --target ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }} --profile ${{ inputs.flavor }}
+          cargo build --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Run tests
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -296,7 +291,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo test --target ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }} --profile ${{ inputs.flavor }}
+          cargo test --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Run tests to collect code coverage
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -307,7 +302,7 @@ jobs:
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
           cargo clean
-          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Aggregate code coverage
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -315,7 +310,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-unknown-linux-${{ env.ABI }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Upload coverage reports to Codecov
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8ed20b7e..94e7b71c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -42,13 +42,13 @@ jobs:
       matrix:
         os: [ linux ]
         stack:
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686"        }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6"       }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64"   }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le" }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64"     }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        abi: "gnu"       }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       abi: "gnueabi"   }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       abi: "gnueabihf" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     abi: "gnu"       }
         distro:
           - { image: "debian:trixie-slim", LLVM: 19 }
         rust-toolchain-name: [ stable, nightly ]
@@ -59,6 +59,7 @@ jobs:
       runs-on: ${{ matrix.stack.runs-on }}
       builder-host: ${{ matrix.stack.host }}
       builder-target: ${{ matrix.stack.target }}
+      rust-toolchain-abi: ${{ matrix.stack.abi }}
       distro-image: ${{ matrix.distro.image }}
       distro-LLVM: ${{ matrix.distro.LLVM }}
       rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index 71bf6441..d33fd59e 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -19,6 +19,7 @@ jobs:
       runs-on: "ubuntu-latest"
       builder-host: x86_64
       builder-target: x86_64
+      rust-toolchain-abi: "gnu"
       distro-image: "debian:trixie-slim"
       distro-LLVM: 19
       rust-toolchain-name: stable

From 631c22253944c22ebabb87fee6344d70ad3e354f Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Sun, 10 Aug 2025 23:14:51 +0300
Subject: [PATCH 2/5] CI: sink linux vendor into matrix

---
 .github/workflows/CI-linux.yml | 27 +++++++++++++++------------
 .github/workflows/CI.yml       | 15 ++++++++-------
 .github/workflows/rustfmt.yml  |  1 +
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/CI-linux.yml b/.github/workflows/CI-linux.yml
index 0a61dbb6..51e6aa1f 100644
--- a/.github/workflows/CI-linux.yml
+++ b/.github/workflows/CI-linux.yml
@@ -13,6 +13,9 @@ on:
       builder-target:
         required: true
         type: string
+      target-vendor:
+        required: true
+        type: string
       rust-toolchain-abi:
         required: true
         type: string
@@ -199,17 +202,17 @@ jobs:
             qemu-user \
             qemu-user-binfmt \
             ;
-          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-clang
-          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-clang++
-          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-ld
-          rustup target add ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }}
-          LINKER="${{ inputs.builder-target }}-unknown-linux-${{ inputs.rust-toolchain-abi }}-clang"
+          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-clang
+          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-clang++
+          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-ld
+          rustup target add ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}
+          LINKER="${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-clang"
           if [ "${{ inputs.builder-target }}" = "powerpc64" ]; then
           # LLD/clang does not support powerpc64 ELFv1 ABI
           LINKER="${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }}-gcc"
           fi
           tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
-          [target.${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }}]
+          [target.${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}]
           linker = "${LINKER}"
           runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }}"
           EOT
@@ -267,7 +270,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo check --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo check --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Run Clippy
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -275,7 +278,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo clippy --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo clippy --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Build
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -283,7 +286,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo build --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo build --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Run tests
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -291,7 +294,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo test --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo test --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Run tests to collect code coverage
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -302,7 +305,7 @@ jobs:
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
           cargo clean
-          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Aggregate code coverage
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -310,7 +313,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-unknown-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Upload coverage reports to Codecov
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 94e7b71c..ddcbdf6e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -42,13 +42,13 @@ jobs:
       matrix:
         os: [ linux ]
         stack:
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        abi: "gnu"       }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       abi: "gnueabi"   }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       abi: "gnueabihf" }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        vendor: "unknown", abi: "gnu"       }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       vendor: "unknown", abi: "gnueabi"   }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       vendor: "unknown", abi: "gnueabihf" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   vendor: "unknown", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", vendor: "unknown", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       vendor: "unknown", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     vendor: "unknown", abi: "gnu"       }
         distro:
           - { image: "debian:trixie-slim", LLVM: 19 }
         rust-toolchain-name: [ stable, nightly ]
@@ -59,6 +59,7 @@ jobs:
       runs-on: ${{ matrix.stack.runs-on }}
       builder-host: ${{ matrix.stack.host }}
       builder-target: ${{ matrix.stack.target }}
+      target-vendor: ${{ matrix.stack.vendor }}
       rust-toolchain-abi: ${{ matrix.stack.abi }}
       distro-image: ${{ matrix.distro.image }}
       distro-LLVM: ${{ matrix.distro.LLVM }}
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index d33fd59e..055c7ba4 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -19,6 +19,7 @@ jobs:
       runs-on: "ubuntu-latest"
       builder-host: x86_64
       builder-target: x86_64
+      target-vendor: "unknown"
       rust-toolchain-abi: "gnu"
       distro-image: "debian:trixie-slim"
       distro-LLVM: 19

From c903ebbf6c23dd3e9036b5d1fbecd54337a0bbd8 Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Sun, 10 Aug 2025 23:18:58 +0300
Subject: [PATCH 3/5] CI: sink triple os into matrix

---
 .github/workflows/CI-linux.yml | 33 ++++++++++++++++++---------------
 .github/workflows/CI.yml       | 15 ++++++++-------
 .github/workflows/rustfmt.yml  |  1 +
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/CI-linux.yml b/.github/workflows/CI-linux.yml
index 51e6aa1f..3d7c41ce 100644
--- a/.github/workflows/CI-linux.yml
+++ b/.github/workflows/CI-linux.yml
@@ -16,6 +16,9 @@ on:
       target-vendor:
         required: true
         type: string
+      target-os:
+        required: true
+        type: string
       rust-toolchain-abi:
         required: true
         type: string
@@ -197,24 +200,24 @@ jobs:
           . "$HOME/.cargo/env"
 
           eatmydata apt install \
-            gcc-${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }} \
+            gcc-${{ env.GCC_ARCH }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} \
             libc6-dev-${{ env.LIBC6_ARCH }}-cross \
             qemu-user \
             qemu-user-binfmt \
             ;
-          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-clang
-          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-clang++
-          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-ld
-          rustup target add ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}
-          LINKER="${{ inputs.builder-target }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}-clang"
+          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang
+          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang++
+          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-ld
+          rustup target add ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}
+          LINKER="${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang"
           if [ "${{ inputs.builder-target }}" = "powerpc64" ]; then
           # LLD/clang does not support powerpc64 ELFv1 ABI
-          LINKER="${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }}-gcc"
+          LINKER="${{ env.GCC_ARCH }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-gcc"
           fi
           tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
-          [target.${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }}]
+          [target.${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}]
           linker = "${LINKER}"
-          runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-linux-${{ inputs.rust-toolchain-abi }}"
+          runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}"
           EOT
       - name: Install necessary packages for code coverage
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -270,7 +273,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo check --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo check --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Run Clippy
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -278,7 +281,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo clippy --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo clippy --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Build
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -286,7 +289,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo build --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo build --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Run tests
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -294,7 +297,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo test --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo test --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Run tests to collect code coverage
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -305,7 +308,7 @@ jobs:
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
           cargo clean
-          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Aggregate code coverage
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -313,7 +316,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-linux-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
       - name: Upload coverage reports to Codecov
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index ddcbdf6e..e42901c8 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -42,13 +42,13 @@ jobs:
       matrix:
         os: [ linux ]
         stack:
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        vendor: "unknown", abi: "gnu"       }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       vendor: "unknown", abi: "gnueabi"   }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       vendor: "unknown", abi: "gnueabihf" }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   vendor: "unknown", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", vendor: "unknown", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       vendor: "unknown", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     vendor: "unknown", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        vendor: "unknown", os: "linux", abi: "gnu"       }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       vendor: "unknown", os: "linux", abi: "gnueabi"   }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       vendor: "unknown", os: "linux", abi: "gnueabihf" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   vendor: "unknown", os: "linux", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", vendor: "unknown", os: "linux", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       vendor: "unknown", os: "linux", abi: "gnu"       }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     vendor: "unknown", os: "linux", abi: "gnu"       }
         distro:
           - { image: "debian:trixie-slim", LLVM: 19 }
         rust-toolchain-name: [ stable, nightly ]
@@ -60,6 +60,7 @@ jobs:
       builder-host: ${{ matrix.stack.host }}
       builder-target: ${{ matrix.stack.target }}
       target-vendor: ${{ matrix.stack.vendor }}
+      target-os: ${{ matrix.stack.os }}
       rust-toolchain-abi: ${{ matrix.stack.abi }}
       distro-image: ${{ matrix.distro.image }}
       distro-LLVM: ${{ matrix.distro.LLVM }}
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index 055c7ba4..e4168402 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -20,6 +20,7 @@ jobs:
       builder-host: x86_64
       builder-target: x86_64
       target-vendor: "unknown"
+      target-os: "linux"
       rust-toolchain-abi: "gnu"
       distro-image: "debian:trixie-slim"
       distro-LLVM: 19

From 597390a7a2f1a70ce50d6dd45e0b29cc732b8901 Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Sun, 10 Aug 2025 23:23:27 +0300
Subject: [PATCH 4/5] CI: fixup rest of jobs

---
 .github/workflows/CI.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e42901c8..3cacacd8 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -17,8 +17,8 @@ jobs:
       matrix:
         os: [ linux ]
         stack:
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "x86_64"  }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "x86_64",  vendor: "unknown", os: "linux", abi: "gnu"  }
+          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64", vendor: "unknown", os: "linux", abi: "gnu" }
         distro:
           - { image: "debian:trixie-slim", LLVM: 19 }
         rust-toolchain-name: [ stable, nightly ]
@@ -29,6 +29,9 @@ jobs:
       runs-on: ${{ matrix.stack.runs-on }}
       builder-host: ${{ matrix.stack.host }}
       builder-target: ${{ matrix.stack.target }}
+      target-vendor: ${{ matrix.stack.vendor }}
+      target-os: ${{ matrix.stack.os }}
+      rust-toolchain-abi: ${{ matrix.stack.abi }}
       distro-image: ${{ matrix.distro.image }}
       distro-LLVM: ${{ matrix.distro.LLVM }}
       rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
@@ -122,6 +125,9 @@ jobs:
       runs-on: ubuntu-latest
       builder-host: x86_64
       builder-target: x86_64
+      target-vendor: "unknown"
+      target-os: "linux"
+      rust-toolchain-abi: "gnu"
       distro-image: "debian:trixie-slim"
       distro-LLVM: 19
       rust-toolchain-name: stable

From 70e3c00cff35f50d306373698211af4a2e98850c Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Mon, 11 Aug 2025 00:44:59 +0300
Subject: [PATCH 5/5] wip

---
 .github/workflows/CI-linux.yml |  45 ++++--
 .github/workflows/CI.yml       | 286 ++++++++++++++++++---------------
 2 files changed, 190 insertions(+), 141 deletions(-)

diff --git a/.github/workflows/CI-linux.yml b/.github/workflows/CI-linux.yml
index 3d7c41ce..294007ee 100644
--- a/.github/workflows/CI-linux.yml
+++ b/.github/workflows/CI-linux.yml
@@ -114,14 +114,16 @@ jobs:
              || [ "${{ inputs.builder-target }}" = "s390x" ]       \
              || [ "${{ inputs.builder-target }}" = "armv7" ];
           then
-          RUST_TARGET=${{ inputs.builder-target }}
+          RUST_TARGET_ARCH=${{ inputs.builder-target }}
           elif [ "${{ inputs.builder-target }}" = "armv6" ]; then
-          RUST_TARGET=arm
+          RUST_TARGET_ARCH=arm
           elif [ "${{ inputs.builder-target }}" = "riscv64" ]; then
-          RUST_TARGET=riscv64gc
+          RUST_TARGET_ARCH=riscv64gc
           else
           exit 1
           fi
+          echo "RUST_TARGET_ARCH=$(echo ${RUST_TARGET_ARCH})" >> $GITHUB_ENV
+          RUST_TARGET=${RUST_TARGET_ARCH}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}
           echo "RUST_TARGET=$(echo ${RUST_TARGET})" >> $GITHUB_ENV
           if [ "${{ inputs.builder-target }}" = "i686" ]; then
           LIBC6_ARCH=i386
@@ -167,6 +169,7 @@ jobs:
           . "$HOME/.cargo/env"
           eatmydata rustup toolchain install ${{ inputs.rust-toolchain-name }} --allow-downgrade --profile minimal
           eatmydata rustup default ${{ inputs.rust-toolchain-name }}
+          eatmydata rustup target add ${{ env.RUST_TARGET }}
           if [ "${{ inputs.flavor }}" = "RustFmt" ]; then
           eatmydata rustup component add rustfmt
           elif [ "${{ inputs.flavor }}" = "doc" ]; then
@@ -192,9 +195,9 @@ jobs:
           else
           exit 1
           fi
-      - name: Install necessary packages for cross-compilation
+      - name: Install necessary packages for same-os cross-arch compilation
         timeout-minutes: 2
-        if: (inputs.flavor == 'dev' || inputs.flavor == 'release') && inputs.builder-host != inputs.builder-target
+        if: (inputs.flavor == 'dev' || inputs.flavor == 'release') && inputs.target-os == 'linux' && inputs.builder-host != inputs.builder-target
         run: |
           set -xe
           . "$HOME/.cargo/env"
@@ -208,14 +211,28 @@ jobs:
           ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang
           ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang++
           ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-ld
-          rustup target add ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}
           LINKER="${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang"
           if [ "${{ inputs.builder-target }}" = "powerpc64" ]; then
           # LLD/clang does not support powerpc64 ELFv1 ABI
           LINKER="${{ env.GCC_ARCH }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-gcc"
           fi
           tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
-          [target.${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}]
+          [target.${{ env.RUST_TARGET }}]
+          linker = "${LINKER}"
+          runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}"
+          EOT
+      - name: Install necessary packages for cross-os same-arch compilation
+        timeout-minutes: 2
+        if: (inputs.flavor == 'dev' || inputs.flavor == 'release') && inputs.target-os == 'windows' && inputs.builder-host == inputs.builder-target
+        run: |
+          set -xe
+          . "$HOME/.cargo/env"
+          ln -s /usr/local/bin/clang /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang
+          ln -s /usr/local/bin/clang++ /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang++
+          ln -s /usr/local/bin/ld /usr/local/bin/${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-ld
+          LINKER="${{ inputs.builder-target }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}-clang"
+          tee -a "$HOME/.cargo/config.toml" > /dev/null <<EOT
+          [target.${{ env.RUST_TARGET }}]
           linker = "${LINKER}"
           runner = "qemu-${{ env.LIBC6_ARCH }} -L /usr/${{ env.GCC_ARCH }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }}"
           EOT
@@ -273,7 +290,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo check --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo check --target ${{ env.RUST_TARGET }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Run Clippy
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -281,7 +298,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo clippy --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }} --all-targets --all-features
+          cargo clippy --target ${{ env.RUST_TARGET }} --profile ${{ inputs.flavor }} --all-targets --all-features
       - name: Build
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -289,7 +306,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo build --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo build --target ${{ env.RUST_TARGET }} --profile ${{ inputs.flavor }}
       - name: Run tests
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc'
@@ -297,7 +314,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo test --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo test --target ${{ env.RUST_TARGET }} --profile ${{ inputs.flavor }}
       - name: Run tests to collect code coverage
         timeout-minutes: 2
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -308,7 +325,7 @@ jobs:
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
           cargo clean
-          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov --no-report --target ${{ env.RUST_TARGET }} --profile ${{ inputs.flavor }}
       - name: Aggregate code coverage
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -316,7 +333,7 @@ jobs:
           set -xe
           . "$HOME/.cargo/env"
           cd "$SRC_DIR"
-          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }}-${{ inputs.target-vendor }}-${{ inputs.target-os }}-${{ inputs.rust-toolchain-abi }} --profile ${{ inputs.flavor }}
+          cargo llvm-cov report --codecov --output-path $SRC_DIR/codecov.json --target ${{ env.RUST_TARGET }} --profile ${{ inputs.flavor }}
       - name: Upload coverage reports to Codecov
         timeout-minutes: 1
         if: inputs.flavor != 'RustFmt' && inputs.flavor != 'doc' && (inputs.builder-host == inputs.builder-target || (env.ENDIANNESS == 'big' && inputs.builder-target != 's390x')) && (github.event_name == 'pull_request' || env.CODECOV_TOKEN_EXISTS == 'true')
@@ -325,7 +342,7 @@ jobs:
           OS: ${{ inputs.os }}
           BUILDER_HOST: ${{ inputs.builder-host }}
           BUILDER_TARGET: ${{ inputs.builder-target }}
-          RUST_TOOLCHAIN: ${{ inputs.rust-toolchain-name }}
+          RUST_TOOLCHAIN: ${{ env.RUST_TARGET }}
           LLVM_VER: ${{ inputs.distro-LLVM }}
           RUST_PROFILE: ${{ inputs.flavor }}
         with:
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3cacacd8..09b49a50 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -11,18 +11,50 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  linux-fast:
+  # linux-fast:
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ linux ]
+  #       stack:
+  #         - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "x86_64",  vendor: "unknown", os: "linux", abi: "gnu"  }
+  #         - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64", vendor: "unknown", os: "linux", abi: "gnu" }
+  #       distro:
+  #         - { image: "debian:trixie-slim", LLVM: 19 }
+  #       rust-toolchain-name: [ stable, nightly ]
+  #       flavor: [ dev, release ]
+  #   uses: ./.github/workflows/CI-linux.yml
+  #   with:
+  #     os: ${{ matrix.os }}
+  #     runs-on: ${{ matrix.stack.runs-on }}
+  #     builder-host: ${{ matrix.stack.host }}
+  #     builder-target: ${{ matrix.stack.target }}
+  #     target-vendor: ${{ matrix.stack.vendor }}
+  #     target-os: ${{ matrix.stack.os }}
+  #     rust-toolchain-abi: ${{ matrix.stack.abi }}
+  #     distro-image: ${{ matrix.distro.image }}
+  #     distro-LLVM: ${{ matrix.distro.LLVM }}
+  #     rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
+  #     flavor: ${{ matrix.flavor }}
+  #   secrets:
+  #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  windows-cross:
     strategy:
       fail-fast: false
       matrix:
         os: [ linux ]
         stack:
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "x86_64",  vendor: "unknown", os: "linux", abi: "gnu"  }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64", vendor: "unknown", os: "linux", abi: "gnu" }
+          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "x86_64",  vendor: "pc", os: "windows" }
+          # - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",    vendor: "pc", os: "windows" }
+          # - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "aarch64", vendor: "pc", os: "windows" }
         distro:
           - { image: "debian:trixie-slim", LLVM: 19 }
-        rust-toolchain-name: [ stable, nightly ]
-        flavor: [ dev, release ]
+        abi: [ gnu, msvc ]
+        # abi: [ gnu ]
+        # rust-toolchain-name: [ stable, nightly ]
+        # flavor: [ dev, release ]
+        rust-toolchain-name: [ stable ]
+        flavor: [ dev ]
     uses: ./.github/workflows/CI-linux.yml
     with:
       os: ${{ matrix.os }}
@@ -31,131 +63,131 @@ jobs:
       builder-target: ${{ matrix.stack.target }}
       target-vendor: ${{ matrix.stack.vendor }}
       target-os: ${{ matrix.stack.os }}
-      rust-toolchain-abi: ${{ matrix.stack.abi }}
+      rust-toolchain-abi: ${{ matrix.abi }}
       distro-image: ${{ matrix.distro.image }}
       distro-LLVM: ${{ matrix.distro.LLVM }}
       rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
       flavor: ${{ matrix.flavor }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-  linux-cross:
-    needs: [ linux-fast, windows-msys2-fast, macOS-fast ]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ linux ]
-        stack:
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        vendor: "unknown", os: "linux", abi: "gnu"       }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       vendor: "unknown", os: "linux", abi: "gnueabi"   }
-          - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       vendor: "unknown", os: "linux", abi: "gnueabihf" }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   vendor: "unknown", os: "linux", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", vendor: "unknown", os: "linux", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       vendor: "unknown", os: "linux", abi: "gnu"       }
-          - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     vendor: "unknown", os: "linux", abi: "gnu"       }
-        distro:
-          - { image: "debian:trixie-slim", LLVM: 19 }
-        rust-toolchain-name: [ stable, nightly ]
-        flavor: [ dev, release ]
-    uses: ./.github/workflows/CI-linux.yml
-    with:
-      os: ${{ matrix.os }}
-      runs-on: ${{ matrix.stack.runs-on }}
-      builder-host: ${{ matrix.stack.host }}
-      builder-target: ${{ matrix.stack.target }}
-      target-vendor: ${{ matrix.stack.vendor }}
-      target-os: ${{ matrix.stack.os }}
-      rust-toolchain-abi: ${{ matrix.stack.abi }}
-      distro-image: ${{ matrix.distro.image }}
-      distro-LLVM: ${{ matrix.distro.LLVM }}
-      rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
-      flavor: ${{ matrix.flavor }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-  windows-msys2-fast:
-    strategy:
-      fail-fast: false
-      matrix:
-        stack:
-          - { os: windows, os-ver: latest, host: "x86_64",  target: "x86_64",  msystem: CLANG64 }
-          - { os: windows, os-ver: 11-arm, host: "aarch64", target: "aarch64", msystem: CLANGARM64 }
-        rust-toolchain-version: [ stable, nightly ]
-        rust-toolchain-abi: [ gnu, msvc ]
-        flavor: [ dev, release ]
-        exclude:
-          - stack: { os: windows, os-ver: 11-arm, host: "aarch64", target: "aarch64", msystem: CLANGARM64 }
-            rust-toolchain-abi: gnu
-    uses: ./.github/workflows/CI-windows-msys2.yml
-    with:
-      os: ${{ matrix.stack.os }}
-      runs-on: ${{ matrix.stack.os }}-${{ matrix.stack.os-ver }}
-      builder-host: ${{ matrix.stack.host }}
-      builder-target: ${{ matrix.stack.target }}
-      msys2-msystem: ${{ matrix.stack.msystem }}
-      rust-toolchain-version: ${{ matrix.rust-toolchain-version }}
-      rust-toolchain-abi: ${{ matrix.rust-toolchain-abi }}
-      flavor: ${{ matrix.flavor }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-  macOS-fast:
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler:
-          - { os: macos, os-ver: 15, host: "aarch64", target: "aarch64", XCode: 16.3, LLVM: 19 }
-          - { os: macos, os-ver: 13, host: "x86_64",  target: "x86_64",  XCode: 15.2, LLVM: 16 }
-        rust-toolchain-name: [ stable, nightly ]
-        flavor: [ dev, release ]
-    uses: ./.github/workflows/CI-macOS.yml
-    with:
-      os: ${{ matrix.compiler.os }}
-      runs-on: ${{ matrix.compiler.os }}-${{ matrix.compiler.os-ver }}
-      builder-host: ${{ matrix.compiler.host }}
-      builder-target: ${{ matrix.compiler.target }}
-      xcode-version: ${{ matrix.compiler.XCode }}
-      LLVM_VER: ${{ matrix.compiler.LLVM }}
-      rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
-      flavor: ${{ matrix.flavor }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-  build-docs:
-    needs: [ linux-fast, linux-cross, windows-msys2-fast, macOS-fast ]
-    uses: ./.github/workflows/CI-linux.yml
-    with:
-      os: linux
-      runs-on: ubuntu-latest
-      builder-host: x86_64
-      builder-target: x86_64
-      target-vendor: "unknown"
-      target-os: "linux"
-      rust-toolchain-abi: "gnu"
-      distro-image: "debian:trixie-slim"
-      distro-LLVM: 19
-      rust-toolchain-name: stable
-      flavor: doc
-  publish-pages:
-    if: github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master'
-    needs: build-docs
-    runs-on: ubuntu-latest
-    permissions:
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Setup Pages
-        timeout-minutes: 1
-        id: pages
-        uses: actions/configure-pages@v2
-      - name: Deploy to GitHub Pages
-        timeout-minutes: 1
-        id: deployment
-        uses: actions/deploy-pages@v4
-      - name: Purge Cloudflare cache
-        timeout-minutes: 1
-        id: cache-purge
-        if: github.repository == 'darktable-org/rawspeed.rs' && github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master'
-        uses: NathanVaughn/actions-cloudflare-purge@v3.1.0
-        with:
-            cf_zone: ${{ secrets.CLOUDFLARE_ZONE }}
-            cf_auth: ${{ secrets.CLOUDFLARE_AUTH_KEY }}
+  # linux-cross:
+  #   needs: [ linux-fast, windows-msys2-fast, macOS-fast ]
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       os: [ linux ]
+  #       stack:
+  #         - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "i686",        vendor: "unknown", os: "linux", abi: "gnu"       }
+  #         - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv6",       vendor: "unknown", os: "linux", abi: "gnueabi"   }
+  #         - { runs-on: "ubuntu-24.04-arm", host: "aarch64", target: "armv7",       vendor: "unknown", os: "linux", abi: "gnueabihf" }
+  #         - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64",   vendor: "unknown", os: "linux", abi: "gnu"       }
+  #         - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "powerpc64le", vendor: "unknown", os: "linux", abi: "gnu"       }
+  #         - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "s390x",       vendor: "unknown", os: "linux", abi: "gnu"       }
+  #         - { runs-on: "ubuntu-latest",    host: "x86_64",  target: "riscv64",     vendor: "unknown", os: "linux", abi: "gnu"       }
+  #       distro:
+  #         - { image: "debian:trixie-slim", LLVM: 19 }
+  #       rust-toolchain-name: [ stable, nightly ]
+  #       flavor: [ dev, release ]
+  #   uses: ./.github/workflows/CI-linux.yml
+  #   with:
+  #     os: ${{ matrix.os }}
+  #     runs-on: ${{ matrix.stack.runs-on }}
+  #     builder-host: ${{ matrix.stack.host }}
+  #     builder-target: ${{ matrix.stack.target }}
+  #     target-vendor: ${{ matrix.stack.vendor }}
+  #     target-os: ${{ matrix.stack.os }}
+  #     rust-toolchain-abi: ${{ matrix.stack.abi }}
+  #     distro-image: ${{ matrix.distro.image }}
+  #     distro-LLVM: ${{ matrix.distro.LLVM }}
+  #     rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
+  #     flavor: ${{ matrix.flavor }}
+  #   secrets:
+  #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  # windows-msys2-fast:
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       stack:
+  #         - { os: windows, os-ver: latest, host: "x86_64",  target: "x86_64",  msystem: CLANG64 }
+  #         - { os: windows, os-ver: 11-arm, host: "aarch64", target: "aarch64", msystem: CLANGARM64 }
+  #       rust-toolchain-version: [ stable, nightly ]
+  #       rust-toolchain-abi: [ gnu, msvc ]
+  #       flavor: [ dev, release ]
+  #       exclude:
+  #         - stack: { os: windows, os-ver: 11-arm, host: "aarch64", target: "aarch64", msystem: CLANGARM64 }
+  #           rust-toolchain-abi: gnu
+  #   uses: ./.github/workflows/CI-windows-msys2.yml
+  #   with:
+  #     os: ${{ matrix.stack.os }}
+  #     runs-on: ${{ matrix.stack.os }}-${{ matrix.stack.os-ver }}
+  #     builder-host: ${{ matrix.stack.host }}
+  #     builder-target: ${{ matrix.stack.target }}
+  #     msys2-msystem: ${{ matrix.stack.msystem }}
+  #     rust-toolchain-version: ${{ matrix.rust-toolchain-version }}
+  #     rust-toolchain-abi: ${{ matrix.rust-toolchain-abi }}
+  #     flavor: ${{ matrix.flavor }}
+  #   secrets:
+  #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  # macOS-fast:
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       compiler:
+  #         - { os: macos, os-ver: 15, host: "aarch64", target: "aarch64", XCode: 16.3, LLVM: 19 }
+  #         - { os: macos, os-ver: 13, host: "x86_64",  target: "x86_64",  XCode: 15.2, LLVM: 16 }
+  #       rust-toolchain-name: [ stable, nightly ]
+  #       flavor: [ dev, release ]
+  #   uses: ./.github/workflows/CI-macOS.yml
+  #   with:
+  #     os: ${{ matrix.compiler.os }}
+  #     runs-on: ${{ matrix.compiler.os }}-${{ matrix.compiler.os-ver }}
+  #     builder-host: ${{ matrix.compiler.host }}
+  #     builder-target: ${{ matrix.compiler.target }}
+  #     xcode-version: ${{ matrix.compiler.XCode }}
+  #     LLVM_VER: ${{ matrix.compiler.LLVM }}
+  #     rust-toolchain-name: ${{ matrix.rust-toolchain-name }}
+  #     flavor: ${{ matrix.flavor }}
+  #   secrets:
+  #     CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  # build-docs:
+  #   needs: [ linux-fast, linux-cross, windows-msys2-fast, macOS-fast ]
+  #   uses: ./.github/workflows/CI-linux.yml
+  #   with:
+  #     os: linux
+  #     runs-on: ubuntu-latest
+  #     builder-host: x86_64
+  #     builder-target: x86_64
+  #     target-vendor: "unknown"
+  #     target-os: "linux"
+  #     rust-toolchain-abi: "gnu"
+  #     distro-image: "debian:trixie-slim"
+  #     distro-LLVM: 19
+  #     rust-toolchain-name: stable
+  #     flavor: doc
+  # publish-pages:
+  #   if: github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master'
+  #   needs: build-docs
+  #   runs-on: ubuntu-latest
+  #   permissions:
+  #     pages: write
+  #     id-token: write
+  #   environment:
+  #     name: github-pages
+  #     url: ${{ steps.deployment.outputs.page_url }}
+  #   steps:
+  #     - name: Setup Pages
+  #       timeout-minutes: 1
+  #       id: pages
+  #       uses: actions/configure-pages@v2
+  #     - name: Deploy to GitHub Pages
+  #       timeout-minutes: 1
+  #       id: deployment
+  #       uses: actions/deploy-pages@v4
+  #     - name: Purge Cloudflare cache
+  #       timeout-minutes: 1
+  #       id: cache-purge
+  #       if: github.repository == 'darktable-org/rawspeed.rs' && github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master'
+  #       uses: NathanVaughn/actions-cloudflare-purge@v3.1.0
+  #       with:
+  #           cf_zone: ${{ secrets.CLOUDFLARE_ZONE }}
+  #           cf_auth: ${{ secrets.CLOUDFLARE_AUTH_KEY }}