Merge pull request #121 from rust-cross/fix-120

Use `x86-linux-*` for i585/i686 Rust targets on zig 0.11+

Author: messense

.github/workflows/CI.yml

@@ -59,8 +59,17 @@ jobs:
       - run: zig version
       - run: cargo build
       - name: Install Rust targets
+        shell: bash
         run: |
-          rustup target add aarch64-unknown-linux-gnu x86_64-unknown-linux-gnu aarch64-apple-darwin x86_64-apple-darwin x86_64-pc-windows-gnu i686-pc-windows-gnu
+          rustup target add aarch64-unknown-linux-gnu \
+            x86_64-unknown-linux-gnu \
+            i686-unknown-linux-gnu \
+            arm-unknown-linux-gnueabihf \
+            armv7-unknown-linux-gnueabihf \
+            aarch64-apple-darwin \
+            x86_64-apple-darwin \
+            x86_64-pc-windows-gnu \
+            i686-pc-windows-gnu
       - name: Test bindgen
         shell: bash
         run: |
@@ -108,15 +117,14 @@ jobs:
             ./target/x86_64-unknown-linux-gnu/debug/cargo-zigbuild --help
       - name: Linux - Test glibc build
         run: |
-          rustup target add arm-unknown-linux-gnueabihf
-          rustup target add armv7-unknown-linux-gnueabihf
           cargo run zigbuild --target aarch64-unknown-linux-gnu
           cargo run zigbuild --target aarch64-unknown-linux-gnu.2.17
 
           cargo run zigbuild --target aarch64-unknown-linux-gnu --manifest-path tests/hello-cmake/Cargo.toml
           cargo run zigbuild --target aarch64-unknown-linux-gnu --manifest-path tests/hello-rustls/Cargo.toml
           cargo run zigbuild --target armv7-unknown-linux-gnueabihf --manifest-path tests/hello-rustls/Cargo.toml
           cargo run zigbuild --target arm-unknown-linux-gnueabihf --manifest-path tests/hello-rustls/Cargo.toml
+          cargo run zigbuild --target i686-unknown-linux-gnu --manifest-path tests/hello-rustls/Cargo.toml
 
           # Test building shared library
           cargo run zigbuild --target aarch64-unknown-linux-gnu --manifest-path tests/libhello/Cargo.toml

src/zig.rs

@@ -102,11 +102,13 @@ impl Zig {
                 } else if arg == "-lwindows" || arg == "-l:libpthread.a" || arg == "-lgcc" {
                     return None;
                 } else if arg == "-Wl,--disable-auto-image-base"
+                    || arg == "-Wl,--dynamicbase"
                     || arg == "-Wl,--large-address-aware"
                 {
                     // https://github.com/rust-lang/rust/blob/f0bc76ac41a0a832c9ee621e31aaf1f515d3d6a5/compiler/rustc_target/src/spec/windows_gnu_base.rs#L23
+                    // https://github.com/rust-lang/rust/blob/2fb0e8d162a021f8a795fb603f5d8c0017855160/compiler/rustc_target/src/spec/windows_gnu_base.rs#L22
                     // https://github.com/rust-lang/rust/blob/f0bc76ac41a0a832c9ee621e31aaf1f515d3d6a5/compiler/rustc_target/src/spec/i686_pc_windows_gnu.rs#L16
-                    // zig doesn't support --disable-auto-image-base, --large-address-aware
+                    // zig doesn't support --disable-auto-image-base, --dynamicbase, and --large-address-aware
                     return None;
                 }
             } else if arg == "-Wl,--no-undefined-version" {
@@ -710,8 +712,20 @@ pub fn prepare_zig_linker(target: &str) -> Result<ZigWrapper> {
                 },
                 "armv5te" => ("arm", "-mcpu=generic+soft_float+strict_align"),
                 "armv7" => ("arm", "-mcpu=generic+v7a+vfp3-d32+thumb2-neon"),
-                "i586" => ("i386", "-mcpu=pentium"),
-                "i686" => ("i386", "-mcpu=pentium4"),
+                arch_str @ ("i586" | "i686") => {
+                    let cpu_arg = if arch_str == "i586" {
+                        "-mcpu=pentium"
+                    } else {
+                        "-mcpu=pentium4"
+                    };
+                    let zig_version = Zig::zig_version()?;
+                    let zig_arch = if zig_version.major == 0 && zig_version.minor >= 11 {
+                        "x86"
+                    } else {
+                        "i386"
+                    };
+                    (zig_arch, cpu_arg)
+                }
                 "riscv64gc" => ("riscv64", "-mcpu=generic_rv64+m+a+f+d+c"),
                 "s390x" => ("s390x", "-mcpu=z10-vector"),
                 _ => (arch.as_str(), ""),