rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable MPFR tests on i586

Browse Source 
MPFR does build and run correctly without SSE, but requires
`force-cross` be enabled.
This commit is contained in:
Trevor Gross
2025-01-06 05:15:40 +00:00
parent a882639e7f
commit a9407010b4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/compiler-builtins/libm/ci/docker/i586-unknown-linux-gnu/Dockerfile
View File

@@ -2,4 +2,4 @@ FROM ubuntu:24.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
gcc-multilib libc6-dev ca-certificates gcc-multilib m4 make libc6-dev ca-certificates

2
library/compiler-builtins/libm/ci/run.sh
View File

@@ -45,8 +45,8 @@ case "$target" in
# FIXME(ci): we should be able to enable aarch64 Linux here once GHA # FIXME(ci): we should be able to enable aarch64 Linux here once GHA
# support rolls out. # support rolls out.
x86_64*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;; x86_64*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;;
# i686 works fine, i586 does not
i686*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;; i686*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;;
i586*) extra_flags="$extra_flags --features libm-test/test-multiprecision --features gmp-mpfr-sys/force-cross" ;;
# Apple aarch64 is native # Apple aarch64 is native
aarch64*apple*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;; aarch64*apple*) extra_flags="$extra_flags --features libm-test/test-multiprecision" ;;
esac esac

3
library/compiler-builtins/libm/crates/libm-test/Cargo.toml
View File

@@ -12,7 +12,7 @@ unstable-float = ["libm/unstable-float", "rug?/nightly-float"]
# Generate tests which are random inputs and the outputs are calculated with # Generate tests which are random inputs and the outputs are calculated with
# musl libc. # musl libc.
test-multiprecision = ["dep:az", "dep:rug"] test-multiprecision = ["dep:az", "dep:rug", "dep:gmp-mpfr-sys"]
# Build our own musl for testing and benchmarks # Build our own musl for testing and benchmarks
build-musl = ["dep:musl-math-sys"] build-musl = ["dep:musl-math-sys"]
@@ -26,6 +26,7 @@ short-benchmarks = []
[dependencies] [dependencies]
anyhow = "1.0.90" anyhow = "1.0.90"
az = { version = "1.2.1", optional = true } az = { version = "1.2.1", optional = true }
gmp-mpfr-sys = { version = "1.6.4", optional = true, default-features = false, features = ["mpfr"] }
indicatif = { version = "0.17.9", default-features = false } indicatif = { version = "0.17.9", default-features = false }
libm = { path = "../..", features = ["unstable-public-internals"] } libm = { path = "../..", features = ["unstable-public-internals"] }
libm-macros = { path = "../libm-macros" } libm-macros = { path = "../libm-macros" }