also build on x86-32 an arm-32

Author: RalfJung

.github/workflows/ci.yml

@@ -21,14 +21,13 @@ jobs:
         include:
           - host_target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
-          # Needs a libffi patch: <https://github.com/libffi-rs/libffi-rs/pull/160>
-          # - host_target: i686-unknown-linux-gnu
-          #   os: ubuntu-latest
+          - host_target: i686-unknown-linux-gnu
+            os: ubuntu-latest
           - host_target: aarch64-unknown-linux-gnu
             os: ubuntu-24.04-arm
           # Disabled due to <https://github.com/rust-lang/rust/issues/143184>.
-          # - host_target: armv7-unknown-linux-gnueabihf
-          #   os: ubuntu-24.04-arm
+          - host_target: armv7-unknown-linux-gnueabihf
+            os: ubuntu-24.04-arm
           - host_target: aarch64-apple-darwin
             os: macos-latest
           - host_target: i686-pc-windows-msvc
@@ -38,18 +37,22 @@ jobs:
       HOST_TARGET: ${{ matrix.host_target }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install multilib dependencies
+      - name: i686 multilib setup
         if: ${{ matrix.host_target == 'i686-unknown-linux-gnu' }}
         run: |
           sudo dpkg --add-architecture i386
           sudo apt update
-          sudo apt install gcc-multilib zlib1g-dev:i386 libffi-dev:i386
-      - name: Install multilib dependencies
+          sudo apt install gcc-i686-linux-gnu gcc-multilib zlib1g-dev:i386 libffi-dev:i386
+          echo "CC=i686-linux-gnu-gcc" >> $GITHUB_ENV
+      - name: armv7 multilib setup
         if: ${{ matrix.host_target == 'armv7-unknown-linux-gnueabihf' }}
         run: |
           sudo dpkg --add-architecture armhf
           sudo apt update
           sudo apt install gcc-arm-linux-gnueabihf zlib1g-dev:armhf libffi-dev:armhf
+          echo "CC=arm-linux-gnueabihf-gcc" >> $GITHUB_ENV
+          mkdir -p .cargo
+          echo '[target.armv7-unknown-linux-gnueabihf] linker = "arm-linux-gnueabihf-gcc"' >> .cargo/config.toml
       - uses: ./.github/workflows/setup
         with:
           toolchain_flags: "--host ${{ matrix.host_target }}"

Cargo.lock

@@ -37,7 +37,7 @@ features = ['unprefixed_malloc_on_supported_platforms']
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
-libffi = "4.0.0"
+libffi = { git = "https://github.com/RalfJung/libffi-rs", branch = "multilib" }
 libloading = "0.8"
 
 [target.'cfg(target_os = "linux")'.dependencies]

Cargo.toml

@@ -146,6 +146,10 @@ case $HOST_TARGET in
     MANY_SEEDS=64 TEST_TARGET=x86_64-apple-darwin run_tests
     MANY_SEEDS=64 TEST_TARGET=x86_64-pc-windows-gnu run_tests
     ;;
+  i686-unknown-linux-gnu)
+    # Host
+    GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests
+    ;;
   aarch64-unknown-linux-gnu)
     # Host
     GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=64 TEST_BENCH=1 CARGO_MIRI_ENV=1 run_tests