ffi 1.17.2 → 1.17.3

data/ext/ffi_c/libffi/.github/workflows/build.yml

@@ -13,84 +13,44 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
+  build-linux:
+    name: Linux ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} \
+          ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
 
-  build-warp:
-    name: ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
-    runs-on: warp-ubuntu-latest-arm64-2x
+    runs-on: ${{ matrix.runner }}
 
     strategy:
       fail-fast: false
       matrix:
-       include:
-         - HOST: "aarch64-linux-gnu"
+        include:
+          # ---------- existing x86-64 variants ----------
+          - runner: ubuntu-latest
+            HOST:  x86_64-pc-linux-gnu
+            MEVAL: 'export CC=clang CXX=clang++'
 
-    steps:
-      - uses: actions/checkout@v3
+          - runner: ubuntu-latest
+            HOST:  i386-pc-linux-gnu
+            MEVAL: 'export CC="gcc -m32" CXX="g++ -m32"'
 
-      - env:
-          MEVAL: ${{ matrix.MEVAL }}
-          HOST: ${{ matrix.HOST }}
-          LDFLAGS: ${{ matrix.LDFLAGS }}
-          RUNTESTFLAGS: ${{ matrix.RUNTESTFLAGS }}
-          CONFIGURE_OPTIONS: ${{ matrix.CONFIGURE_OPTIONS }}
-        run: |
-          if test x"$MEVAL" != x; then eval ${MEVAL}; fi
-          ./.ci/install.sh
-          ./.ci/build.sh
+          - runner: ubuntu-latest
+            HOST:  x86_64-pc-linux-gnu
+            CONFIGURE_OPTIONS: "--disable-shared"
 
-  build-sim:
-    name: ${{ matrix.HOST }} ${{ matrix.CONFIGURE_OPTIONS }} ${{ matrix.MEVAL }} ${{ matrix.LIBFFI_TEST_OPTIMIZATION }}
-    runs-on: ubuntu-latest
+          - runner: ubuntu-latest
+            HOST:  x86_64-pc-linux-gnu
+            CONFIGURE_OPTIONS: "--enable-shared"
 
-    strategy:
-      fail-fast: false
-      matrix:
-       include:
-         - HOST: "x86_64-pc-linux-gnu"
-           MEVAL: "export CC=clang CXX=clang"
-         - HOST: "i386-pc-linux-gnu"
-           MEVAL: 'export CC="gcc -m32" CXX="g++ -m32"'
-         - HOST: "x86_64-pc-linux-gnu"
-           CONFIGURE_OPTIONS: "--disable-shared"
-         - HOST: "x86_64-pc-linux-gnu"
-           CONFIGURE_OPTIONS: "--enable-shared"
-         - HOST: "m68k-linux-gnu"
-           MEVAL: 'export CC="m68k-linux-gnu-gcc-8 -mcpu=547x" CXX="m68k-linux-gnu-g++-8 -mcpu=547x"'
-           CONFIGURE_OPTIONS: '--disable-shared'
-           QEMU_LD_PREFIX: '/usr/m68k-linux-gnu'
-           QEMU_CPU: 'cfv4e'
-         - HOST: "sh4-linux-gnu"
-           CONFIGURE_OPTIONS: "--disable-shared"
-           QEMU_LD_PREFIX: "/usr/sh4-linux-gnu"
-           QEMU_CPU: 'sh7785'
-         - HOST: "alpha-linux-gnu"
-           CONFIGURE_OPTIONS: "--disable-shared"
-           QEMU_LD_PREFIX: "/usr/alpha-linux-gnu"
-           QEMU_CPU: 'ev4-alpha-cpu'
-         - HOST: "arm32v7-linux-gnu"
-           LIBFFI_TEST_OPTIMIZATION: "-O0"
-           QEMU_CPU: 'any'
-         - HOST: "arm32v7-linux-gnu"
-           LIBFFI_TEST_OPTIMIZATION: "-O2"
-           QEMU_CPU: 'any'
-         - HOST: "arm32v7-linux-gnu"
-           LIBFFI_TEST_OPTIMIZATION: "-O2 -fomit-frame-pointer"
-           QEMU_CPU: 'any'
-         - HOST: "powerpc-eabisim"
-           RUNTESTFLAGS: "--target_board powerpc-eabisim"
-         - HOST: "or1k-elf"
-           RUNTESTFLAGS: "--target_board or1k-sim"
-         - HOST: "m32r-elf"
-           RUNTESTFLAGS: "--target_board m32r-sim"
-         - HOST: "bfin-elf"
-           RUNTESTFLAGS: "--target_board bfin-sim"
-         - MEVAL: "export PATH=/opt/moxielogic/bin:$PATH CC=moxie-elf-gcc CXX=moxie-elf-g++"
-           HOST: "moxie-elf"
-           LDFLAGS: "-Tsim.ld"
-           RUNTESTFLAGS: "--target_board moxie-sim"
+          - runner: ubuntu-latest
+            HOST:  x86_64-pc-linux-gnu
+            CONFIGURE_OPTIONS: "--disable-exec-static-tramp"
+
+          # ---------- new native arm64 build ----------
+          - runner: ubuntu-22.04-arm     # or ubuntu-24.04-arm
+            HOST:  aarch64-unknown-linux-gnu
+            MEVAL: 'export CC=clang CXX=clang++'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - env:
           MEVAL: ${{ matrix.MEVAL }}
@@ -105,297 +65,119 @@ jobs:
           ./.ci/install.sh
           ./.ci/build.sh
 
-  build-cfarm:
-    name: ${{ matrix.CFARM_TRIPLE }} ${{ matrix.CFARM_CC }}
-    runs-on: ubuntu-latest
+  build-macos:
+    name: MacOS ${{ matrix.platform }} ${{ matrix.compilers }}
+    runs-on: ${{ matrix.platform }}
 
     strategy:
       fail-fast: false
       matrix:
-       include:
-         - CFARM_HOST: cfarm185.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: aarch64-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm185.fsffrance.org
-           CFARM_PORT: 22
-           CFARM_TRIPLE: aarch64-lto-linux-gnu
-           CFARM_CC: "gcc -flto"
-           CFARM_CXX: "g++ -flto"
-         - CFARM_HOST: cfarm400.cfarm.net
-           CFARM_PORT: 25465
-           CFARM_TRIPLE: loongarch64-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm230.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: mips-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm211.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: sparc64-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm211.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: sparc64-linux-gnu
-           CFARM_CC: "gcc -m32"
-           CFARM_CXX: "g++ -m32"
-         - CFARM_HOST: cfarm91.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: riscv64-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm103.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: aarch64-m1-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm112.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: powerpc64le-linux-gnu
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
-         - CFARM_HOST: cfarm111.cfarm.net
-           CFARM_PORT: 22
-           CFARM_TRIPLE: powerpc-ibm-aix7.1.5.0
-           CFARM_CC: "gcc"
-           CFARM_CXX: "g++"
+        platform: [macos-13, macos-14, macos-15]
+        compilers: [CC=gcc-15 CXX=g++-15, CC=clang CXX=g++-15]
 
     steps:
+      - run: git config --global core.autocrlf input
+      - uses: actions/checkout@v4
+      - run: ./.ci/install.sh
+      - run: ${{ matrix.compilers }} ./.ci/build.sh
 
-      - uses: actions/checkout@v3
-
-      - name: Run autogen
-        run: |
-          wget --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 -t 0 -qO - https://ftpmirror.gnu.org/autoconf/autoconf-2.71.tar.gz | tar -xvzf -
-          mkdir -p ~/i
-          (cd autoconf-2.71; ./configure --prefix=$HOME/i; make; make install)
-          rm -rf autoconf-2.71
-          PATH=$HOME/i/bin:$PATH ./autogen.sh
-          echo "${{ secrets.CFARM_KEY }}" > /tmp/cfk
-          chmod go-rw /tmp/cfk
-
-      - name: Generate build dir name
-        run: |
-          echo BUILD_DIR=t/$GITHUB_RUN_NUMBER-$RANDOM >> $GITHUB_ENV
-
-      - name: Check for host availability
-        id: check-host
-        run: |
-          set +e
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -p ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }} "mkdir -p ${{ env.BUILD_DIR }}"
-          if test $? -ne 0; then
-            echo "Remote host is unavailable."
-            echo "HOST_OK=NO" >> $GITHUB_OUTPUT
-          else
-            echo "Remote host is available."
-            echo "HOST_OK=YES" >> $GITHUB_OUTPUT
-          fi
-          set -e
-
-      - name: Show host availability
-        run: |
-          echo ${{ steps.check-host.outputs.HOST_OK }}
-
-      - name: Copy source to remote host
-        if: ${{ steps.check-host.outputs.HOST_OK == 'YES' }}
-        run: |
-          echo ${{ steps.check-host.outputs.HOST_OK }}
-          scp -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -P ${{ matrix.CFARM_PORT }} -r * ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }}:${{ env.BUILD_DIR }}
-
-      - name: Run configure and make
-        if: ${{ steps.check-host.outputs.HOST_OK == 'YES' }}
-        run: |
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -p ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }} "${{ matrix.CFARM_CC }} --version"
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -p ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }} "(cd ${{ env.BUILD_DIR }}; if test -f ~/.profile; then source ~/.profile; fi; CC='${{ matrix.CFARM_CC }}' CXX='${{ matrix.CFARM_CXX }}' ./configure --host=${{ matrix.CFARM_TRIPLE }}) || true; exit 0"
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -p ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }} "(cd ${{ env.BUILD_DIR }}; if test -f ~/.profile; then source ~/.profile; fi; make;) || true; exit 0"
-
-      - name: Run tests
-        if: ${{ steps.check-host.outputs.HOST_OK == 'YES' }}
-        run: |
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -p ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }} "(cd ${{ env.BUILD_DIR }}; if test -f ~/.profile; then source ~/.profile; fi; GCC_COLORS= make check & CHECKPID=\$!; while kill -0 \$CHECKPID 2>/dev/null; do echo 'Waiting for tests to finish'; sleep 5; done;)"
-
-      - name: Copy results and clean up
-        if: ${{ steps.check-host.outputs.HOST_OK == 'YES' }}
-        run: |
-          scp -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -P ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }}:${{ env.BUILD_DIR }}/*/testsuite/*.log .
-          ssh -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ConnectionAttempts=3 -i /tmp/cfk -p ${{ matrix.CFARM_PORT }} ${{ secrets.CFARM_USERNAME }}@${{ matrix.CFARM_HOST }} "rm -rf ${{ env.BUILD_DIR }}"
-
-      - name: Install rlgl and run
-        if: ${{ steps.check-host.outputs.HOST_OK == 'YES' }}
-        run: |
-          wget -qO - https://rl.gl/cli/rlgl-linux-amd64.tgz | \
-               tar --strip-components=2 -xvzf - ./rlgl/rlgl;
-          ./rlgl l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
-          ./rlgl e -l project=libffi -l sha=${GITHUB_SHA:0:7} -l CC='${{ matrix.CFARM_CC }}' -l build-host=${{ matrix.CFARM_TRIPLE }} --policy=https://github.com/libffi/rlgl-policy.git libffi.log
-          exit $?
-
-  build:
-    name: Cygwin ${{ matrix.arch }}
+  build-non-msvc:
+    name: Windows ${{ matrix.width }}-bit ${{ matrix.compiler }}
     runs-on: windows-latest
 
     strategy:
       fail-fast: false
       matrix:
         include:
+          # Cygwin 32-bit
+          - host: i686-pc-cygwin
+            width: 32
+            arch: x86
+            target: i686-pc-cygwin
+            gcc_prefix: /usr/i686-pc-cygwin
+            compiler: gcc
           - host: i686-pc-cygwin
+            width: 32
             arch: x86
-          - host: x86_64-pc-cygwin
+            target: i686-pc-cygwin
+            gcc_prefix: /usr/i686-pc-cygwin
+            compiler: clang
+          # MinGW-w64 64-bit
+          - host: x86_64-w64-mingw32
+            width: 64
             arch: x64
+            target: x86_64-w64-mingw32
+            gcc_prefix: /usr/${{ github.workspace }}/mingw64      # unused but keeps the table homogeneous
+            compiler: clang
+          - host: x86_64-w64-mingw32
+            width: 64
+            arch: x64
+            target: x86_64-w64-mingw32
+            gcc_prefix: /usr/${{ github.workspace }}/mingw64      # unused but keeps the table homogeneous
+            compiler: gcc
 
     steps:
       - run: git config --global core.autocrlf input
+      - uses: actions/checkout@v4
 
-      - uses: actions/checkout@v3
-
-      - name: Set up Cygwin
-        uses: egor-tensin/setup-cygwin@v3
+      # ──────────────────────────────── Cygwin & tool-chains ────────────────────────────────
+      - uses: egor-tensin/setup-cygwin@v4
         with:
-          platform: ${{ matrix.arch }}
-          packages: wget gcc-core make dejagnu automake autoconf libtool texinfo dos2unix unzip
-
-      - run: |
-          set -x
-          cd $(cygpath $RUNNER_WORKSPACE)/libffi
-          wget https://rl.gl/cli/rlgl-windows-amd64.zip
-          unzip rlgl-windows-amd64.zip
-          autoreconf -f -v -i
-          ./configure
-          make -j 4
-          TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci GCC_COLORS= make check || true
-          ./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
-          ./rlgl/rlgl.exe e \
-                          -l project=libffi \
-                          -l sha=${GITHUB_SHA:0:7} \
-                          -l CC=gcc \
-                          -l host=${{ matrix.host }} \
-                          --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
+          # gcc / g++ are needed so Clang can reuse their start-files & libraries
+          packages: >
+            wget make dejagnu automake autoconf libtool texinfo unzip dos2unix
+            clang gcc-core gcc-g++
+            cygwin32-gcc-core cygwin32-gcc-g++ cygwin32-runtime cygwin32-libgcc1
+
+      # ──────────────────────────────── Common environment ────────────────────────────────
+      - name: Export build env
+        shell: bash
+        run: |
+          echo "GCC_PREFIX=${{ matrix.gcc_prefix }}"      >> $GITHUB_ENV
+          echo "CC=${{ matrix.compiler }} --target=${{ matrix.target }} -B${{ matrix.gcc_prefix }}/bin \
+                -L${{ matrix.gcc_prefix }}/lib -I${{ matrix.gcc_prefix }}/include"          >> $GITHUB_ENV
+          echo "CXX=${{ matrix.compiler }} --target=${{ matrix.target }} -B${{ matrix.gcc_prefix }}/bin \
+                -L${{ matrix.gcc_prefix }}/lib -I${{ matrix.gcc_prefix }}/include"          >> $GITHUB_ENV
+          # make sure the cross-gcc bin dir is found *before* /usr/bin (64-bit)
+          echo "${{ matrix.gcc_prefix }}/bin" >> $GITHUB_PATH
+
+      # ──────────────────────────────── Pick version from configure.ac ─────────────────────
+      - id: ver
+        name: Read libffi version
         shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
+        run: |
+          cd "$(cygpath $RUNNER_WORKSPACE)/libffi"
+          version=$(sed -nE 's/^AC_INIT\(\[libffi\],[[:space:]]*\[([^]]+)\].*/\1/p' configure.ac)
+          [[ $version ]] || { echo "Could not parse version"; exit 1; }
+          echo "version=$version" >> "$GITHUB_OUTPUT"
 
-  build-msys2:
-
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - MSYSTEM: MINGW32
-            MSYS2_ARCH: i686
-          - MSYSTEM: MINGW64
-            MSYS2_ARCH: x86_64
-    name: ${{ matrix.MSYSTEM }}
-
-    steps:
-      - run: git config --global core.autocrlf input
-      - uses: actions/checkout@v3
-
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.MSYSTEM }}
-          update: true
-          install: >-
-            base-devel
-            autoconf-wrapper
-            autoconf
-            automake
-            libtool
-            make
-            dejagnu
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-gcc
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-gcc-libs
-            unzip
-
-      - run: |
-          set -x
-          cd $(cygpath $RUNNER_WORKSPACE)/libffi
+      # ──────────────────────────────── Build & test ───────────────────────────────────────
+      - name: Build and test
+        shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
+        run: |
+          set -euo pipefail
+          cd "$(cygpath $RUNNER_WORKSPACE)/libffi"
           wget https://rl.gl/cli/rlgl-windows-amd64.zip
           unzip rlgl-windows-amd64.zip
-          autoreconf -f -v -i
-          CC=${{ matrix.MSYS2_ARCH }}-w64-mingw32-gcc CXX=${{ matrix.MSYS2_ARCH }}-w64-mingw32-g++ ./configure
-          make
-          TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci GCC_COLORS= make check || true
-          ./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
-          ./rlgl/rlgl.exe e \
-                          -l project=libffi \
-                          -l sha=${GITHUB_SHA:0:7} \
-                          -l CC=${{ matrix.MSYS2_ARCH }}-w64-mingw32-gcc \
-                          -l host=x86_64-pc-cygwin \
-                          --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
-        shell: msys2 {0}
-
-  build-msys2-clang:
-
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - MSYSTEM: MINGW32
-            MSYS2_ARCH: i686
-          - MSYSTEM: MINGW64
-            MSYS2_ARCH: x86_64
-    name: ${{ matrix.MSYSTEM }}
-
-    steps:
-      - run: git config --global core.autocrlf input
-      - uses: actions/checkout@v3
+          autoreconf -fvi
+          ./configure \
+            --enable-shared \
+            --build=${{ matrix.host }} --host=${{ matrix.host }} \
+            CPPFLAGS="-DFFI_BUILDING_DLL -DUSE_STATIC_RTL" \
+            CFLAGS="-DFFI_BUILDING_DLL -DUSE_STATIC_RTL"
 
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.MSYSTEM }}
-          update: true
-          install: >-
-            base-devel
-            autoconf-wrapper
-            autoconf
-            automake
-            libtool
-            make
-            dejagnu
-            clang
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-gcc
-            mingw-w64-${{ matrix.MSYS2_ARCH }}-gcc-libs
-            unzip
-
-      - run: |
-          set -x
-          cd $(cygpath $RUNNER_WORKSPACE)/libffi
-          wget https://rl.gl/cli/rlgl-windows-amd64.zip
-          unzip rlgl-windows-amd64.zip
-          autoreconf -f -v -i
-          CC=clang CXX=clang ./configure
           make
-          TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci make check || true
+          # sanity-check
+          file */.libs/*ffi-*.dll
+
+          TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci GCC_COLORS= make check || true
           ./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
           ./rlgl/rlgl.exe e \
                           -l project=libffi \
                           -l sha=${GITHUB_SHA:0:7} \
-                          -l CC=clang \
-                          -l host=x86_64-pc-cygwin \
+                          -l CC=${{ matrix.compiler }} \
+                          -l host=${{ matrix.host }} \
                           --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
-        shell: msys2 {0}
-
-  build-macos:
-    runs-on: ${{ matrix.platform }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [macos-11, macos-12]
-        compilers: [CC=gcc CXX=g++, CC=clang CXX=clang]
-
-    name: ${{ matrix.platform }} ${{ matrix.compilers }}
-
-    steps:
-      - run: git config --global core.autocrlf input
-      - uses: actions/checkout@v3
-      - run: ./.ci/install.sh
-      - run: ${{ matrix.compilers }} ./.ci/build.sh
 
   build-msvc:
     name: Windows ${{ matrix.width }}-bit Visual C++
@@ -409,32 +191,61 @@ jobs:
             width: 32
             arch: x86
             tools: amd64_x86
-          - host: x86_64-pc-cygwin
+          - host: x86_64-w64-mingw32
             width: 64
             arch: x64
             tools: amd64
 
     steps:
       - run: git config --global core.autocrlf input
-      - uses: actions/checkout@v3
-      - uses: egor-tensin/setup-cygwin@v3
+      - uses: actions/checkout@v4
+      - uses: egor-tensin/setup-cygwin@v4
         with:
           platform: x64
           packages: wget make dejagnu automake autoconf libtool texinfo unzip dos2unix
-      - uses: ilammy/msvc-dev-cmd@v1.12.0
+      - uses: ilammy/msvc-dev-cmd@v1.13.0
         with:
           arch: ${{ matrix.tools }}
 
+      - name: Read libffi version from configure.ac
+        id: ver
+        shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
+        run: |
+          cd $(cygpath $RUNNER_WORKSPACE)/libffi
+          # Pull the second bracketed field from the AC_INIT line.
+          # Example line: AC_INIT([libffi],[3.5.0],[http://…])
+          ls -l
+          grep AC_INIT configure.ac
+          ver=$(sed -nE 's/^AC_INIT\(\[libffi\],[[:space:]]*\[([^]]+)\].*/\1/p' configure.ac)
+          [[ -n "$ver" ]] || { echo "Could not parse version!"; exit 1; }
+          echo "version=$ver" >> "$GITHUB_OUTPUT"
+
       - name: Build and test
         run: |
-          # export PATH=$PATH:"/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.16.27023/bin/HostX64/x64"
           cd $(cygpath $RUNNER_WORKSPACE)/libffi
           wget https://rl.gl/cli/rlgl-windows-amd64.zip
           unzip rlgl-windows-amd64.zip
           autoreconf -f -v -i
-          ./configure --host=${{ matrix.host }} CC="$(pwd)/msvcc.sh -m${{ matrix.width }}" CXX="$(pwd)/msvcc.sh -m${{ matrix.width }}" LD='link' CPP='cl -nologo -EP' CXXCPP='cl -nologo -EP' CPPFLAGS='-DFFI_BUILDING_DLL' AR='$(pwd)/.ci/ar-lib lib' NM='dumpbin -symbols' STRIP=':' $DEBUG_ARG $SHARED_ARG || cat */config.log
+          ./configure \
+            --enable-shared \
+            --build="${{ matrix.host }}" --host="${{ matrix.host }}" \
+            --disable-docs \
+            CC="$(pwd)/msvcc.sh -m${{ matrix.width }}" \
+            CXX="$(pwd)/msvcc.sh -m${{ matrix.width }}" \
+            LD="link" \
+            LDFLAGS="-no-undefined" \
+            CPP="cl -nologo -EP" \
+            CXXCPP="cl -nologo -EP" \
+            CPPFLAGS="-DFFI_BUILDING_DLL -DUSE_STATIC_RTL" \
+            CFLAGS="-DFFI_BUILDING_DLL -DUSE_STATIC_RTL" \
+            AR='$(pwd)/.ci/ar-lib lib' \
+            NM='dumpbin -symbols' STRIP=':' \
+            $DEBUG_ARG || cat */config.log
           make
+          find ./ -type f -name 'libffi*'
+          ls -l */.libs
           cp $(find . -name 'libffi-?.dll') ${{ matrix.host }}/testsuite/
+          find ./ -name ffi.h
           TERM=none DEJAGNU=$(pwd)/.ci/site.exp BOARDSDIR=$(pwd)/.ci GCC_COLORS= make check || true
           ./rlgl/rlgl.exe l --key=0LIBFFI-0LIBFFI-0LIBFFI-0LIBFFI https://rl.gl
           ./rlgl/rlgl.exe e \
@@ -445,6 +256,72 @@ jobs:
                           --policy=https://github.com/libffi/rlgl-policy.git $(find . -name libffi.log)
         shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
 
+      - name: Add meta information to DLL
+        shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
+        run: |
+          cd $(cygpath $RUNNER_WORKSPACE)/libffi
+
+          # Deconstruct the libffi version
+          ver=${{ steps.ver.outputs.version }}
+          echo "$ver"
+
+          base=${ver%%-*}
+          rc=${ver#*-}
+          [[ $rc == "$ver" ]] && rc=""             # no rc?  rc=""
+
+          maj=$(cut -d. -f1 <<<"$base")
+          min=$(cut -d. -f2 <<<"$base")
+          pat=$(cut -d. -f3 <<<"$base")
+
+          # Decide on build number
+          if [[ $rc =~ ^rc([0-9]+)$ ]]; then
+            build=${BASH_REMATCH[1]}               # rc1 → 1
+          else
+            build=0
+          fi
+
+          # Use rcedit to edit the DLLs resources
+          wget -O rcedit.exe https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-${{ matrix.arch }}.exe
+          chmod +x ./rcedit.exe
+
+          dll_filename=libffi-8.dll
+          ./rcedit.exe "${{ matrix.host }}"/.libs/$dll_filename \
+            --set-file-version "$maj.$min.$pat.$build" \
+            --set-product-version "$maj.$min.$pat.$build" \
+            --set-version-string "CompanyName" "https://github.com/libffi/libffi" \
+            --set-version-string "FileDescription" "Portable foreign function interface library (${{ matrix.arch }})" \
+            --set-version-string "ProductName" "libffi" \
+            --set-version-string "FileVersion" "${{ steps.ver.outputs.version }}" \
+            --set-version-string "LegalCopyright" "Copyright (c) 1996-2025 Anthony Green and others" \
+            --set-version-string "OriginalFilename" "$dll_filename"
+
+      - name: Create binary distribution
+        shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
+        run: |
+          cd $(cygpath $RUNNER_WORKSPACE)/libffi
+          set -euxo pipefail
+
+          pkgdir="libffi-${{ steps.ver.outputs.version }}-x86-${{ matrix.width }}bit-msvc-binaries"
+          mkdir -p "$pkgdir"
+
+          # Copy libraries, headers, and licence into the *same* directory
+          cp "${{ matrix.host }}"/.libs/libffi-8.*          "$pkgdir/"
+          cp "${{ matrix.host }}"/include/*.h               "$pkgdir/"
+          cp LICENSE                                        "$pkgdir/"
+
+      - name: Upload artefact
+        uses: actions/upload-artifact@v4
+        with:
+          name: libffi-${{ steps.ver.outputs.version }}-x86-${{ matrix.width }}bit-msvc-binaries
+          path: libffi-${{ steps.ver.outputs.version }}-x86-${{ matrix.width }}bit-msvc-binaries
+          if-no-files-found: error
+
+      - name: Upload to GitHub Release
+        if: github.ref_type == 'tag'
+        uses: softprops/action-gh-release@v2
+        with:
+          files: libffi-${{ steps.ver.outputs.version }}-x86-${{ matrix.width }}bit-msvc-binaries.zip
+
   build-android:
     name: Android ${{ matrix.host }}
     runs-on: ubuntu-latest
@@ -456,7 +333,7 @@ jobs:
 
     steps:
       - run: git config --global core.autocrlf input
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: ./.ci/install.sh
       - env:
           HOST: ${{ matrix.HOST }}
@@ -469,6 +346,8 @@ jobs:
           export TOOLCHAIN="${ANDROID_NDK_ROOT}"/toolchains/llvm/prebuilt/linux-x86_64
           export CC="${TOOLCHAIN}"/bin/${HOST}${ANDROID_API_LEVEL}-clang
           export CXX="${TOOLCHAIN}"/bin/${HOST}${ANDROID_API_LEVEL}-clang++
+          export CC_FOR_TARGET="${TOOLCHAIN}"/bin/${HOST}${ANDROID_API_LEVEL}-clang
+          export CXX_FOR_TARGET="${TOOLCHAIN}"/bin/${HOST}${ANDROID_API_LEVEL}-clang++
           export LD="${TOOLCHAIN}"/bin/ld.lld
           export AR="${TOOLCHAIN}"/bin/llvm-ar
           export AS="${CC}"