Skip to content

Commit 34236a6

Browse files
github-actions[bot]bjorn3samueltardieulolbinarycattgross35
authored
Merge subtree update for toolchain nightly-2025-07-14 (model-checking#421)
This is an automated PR to merge library subtree updates from 2025-07-10 (rust-lang/rust@e43d139) to 2025-07-14 (rust-lang/rust@e9182f1), inclusive. This is a clean merge, no conflicts were detected. **Do not remove or edit the following annotations:** git-subtree-dir: library git-subtree-split: 9d16539 --------- Signed-off-by: Ayush Singh <[email protected]> Signed-off-by: xizheyin <[email protected]> Signed-off-by: Huang Qi <[email protected]> Co-authored-by: bjorn3 <[email protected]> Co-authored-by: Samuel Tardieu <[email protected]> Co-authored-by: binarycat <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: Jakub Beránek <[email protected]> Co-authored-by: Tshepang Mbambo <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Matthias Krüger <[email protected]> Co-authored-by: Jacob Pratt <[email protected]> Co-authored-by: mejrs <[email protected]> Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Laine Taffin Altman <[email protected]> Co-authored-by: Marijn Schouten <[email protected]> Co-authored-by: Oli Scherer <[email protected]> Co-authored-by: Alice Ryhl <[email protected]> Co-authored-by: Jubilee <[email protected]> Co-authored-by: Trevor Gross <[email protected]> Co-authored-by: Folkert de Vries <[email protected]> Co-authored-by: MetaNova <[email protected]> Co-authored-by: Kurt Heiritz (pseudo) <[email protected]> Co-authored-by: Daniel Bloom <[email protected]> Co-authored-by: krikera <[email protected]> Co-authored-by: Pavel Grigorenko <[email protected]> Co-authored-by: Michael Goulet <[email protected]> Co-authored-by: Bastian Kersting <[email protected]> Co-authored-by: Deadbeef <[email protected]> Co-authored-by: Cheng Xu <[email protected]> Co-authored-by: The Miri Cronjob Bot <[email protected]> Co-authored-by: Chris Denton <[email protected]> Co-authored-by: наб <[email protected]> Co-authored-by: kilavvy <[email protected]> Co-authored-by: quaternic <[email protected]> Co-authored-by: Ralf Jung <[email protected]> Co-authored-by: zachs18 <[email protected]> Co-authored-by: dianqk <[email protected]> Co-authored-by: Nurzhan Sakén <[email protected]> Co-authored-by: Jeremy Smart <[email protected]> Co-authored-by: Scott McMurray <[email protected]> Co-authored-by: Benjamin Schulz <[email protected]> Co-authored-by: Amanieu d'Antras <[email protected]> Co-authored-by: Josh Stone <[email protected]> Co-authored-by: klensy <[email protected]> Co-authored-by: clubby789 <[email protected]> Co-authored-by: Tsukasa OI <[email protected]> Co-authored-by: Jana Dönszelmann <[email protected]> Co-authored-by: Daniel Paoliello <[email protected]> Co-authored-by: Urgau <[email protected]> Co-authored-by: Ayush Singh <[email protected]> Co-authored-by: Ben Kimock <[email protected]> Co-authored-by: Joshua Gentry <[email protected]> Co-authored-by: dvdsk <[email protected]> Co-authored-by: Yotam Ofek <[email protected]> Co-authored-by: Simonas Kazlauskas <[email protected]> Co-authored-by: xizheyin <[email protected]> Co-authored-by: 许杰友 Jieyou Xu (Joe) <[email protected]> Co-authored-by: Md. Yeasin Arafat <[email protected]> Co-authored-by: ltdk <[email protected]> Co-authored-by: okaneco <[email protected]> Co-authored-by: Esteban Küber <[email protected]> Co-authored-by: sayantn <[email protected]> Co-authored-by: George Tokmaji <[email protected]> Co-authored-by: Moulins <[email protected]> Co-authored-by: B I Mohammed Abbas <[email protected]> Co-authored-by: yukang <[email protected]> Co-authored-by: Roger Curley <[email protected]> Co-authored-by: LevitatingBusinessMan (Rein Fernhout) <[email protected]> Co-authored-by: Harvey Hunt <[email protected]> Co-authored-by: Colten <[email protected]> Co-authored-by: Huang Qi <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]> Co-authored-by: gitbot <git@bot> Co-authored-by: Michael Tautschnig <[email protected]>
1 parent c176f19 commit 34236a6

File tree

104 files changed

+1260
-1060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+1260
-1060
lines changed

‎.github/workflows/flux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
FIXPOINT_VERSION: "556104ba5508891c357b0bdf819ce706e93d9349"
12-
FLUX_VERSION: "844e2fc0caa6aa96d72f2fcb627a27bf2495d82e"
12+
FLUX_VERSION: "f6bdf90c54ad6eed51b25c125f251cac01cfe170"
1313

1414
jobs:
1515
check-flux-on-core:

‎library/compiler-builtins/.github/workflows/main.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,25 @@ jobs:
195195
run: ./ci/update-musl.sh
196196
- run: cargo clippy --workspace --all-targets
197197

198+
build-custom:
199+
name: Build custom target
200+
runs-on: ubuntu-24.04
201+
timeout-minutes: 10
202+
steps:
203+
- uses: actions/checkout@v4
204+
- name: Install Rust
205+
run: |
206+
rustup update nightly --no-self-update
207+
rustup default nightly
208+
rustup component add rust-src
209+
- uses: Swatinem/rust-cache@v2
210+
- run: |
211+
# Ensure we can build with custom target.json files (these can interact
212+
# poorly with build scripts)
213+
cargo build -p compiler_builtins -p libm \
214+
--target etc/thumbv7em-none-eabi-renamed.json \
215+
-Zbuild-std=core
216+
198217
benchmarks:
199218
name: Benchmarks
200219
timeout-minutes: 20
@@ -331,6 +350,7 @@ jobs:
331350
success:
332351
needs:
333352
- benchmarks
353+
- build-custom
334354
- clippy
335355
- extensive
336356
- miri

‎library/compiler-builtins/builtins-test-intrinsics/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ fn main() {
66
println!("cargo::rerun-if-changed=../configure.rs");
77

88
let target = builtins_configure::Target::from_env();
9-
builtins_configure::configure_f16_f128(&target);
109
builtins_configure::configure_aliases(&target);
1110
}

‎library/compiler-builtins/builtins-test/benches/float_cmp.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ float_bench! {
177177
],
178178
}
179179

180+
#[cfg(f128_enabled)]
180181
float_bench! {
181182
name: cmp_f128_gt,
182183
sig: (a: f128, b: f128) -> CmpResult,
@@ -189,6 +190,7 @@ float_bench! {
189190
asm: []
190191
}
191192

193+
#[cfg(f128_enabled)]
192194
float_bench! {
193195
name: cmp_f128_unord,
194196
sig: (a: f128, b: f128) -> CmpResult,

‎library/compiler-builtins/builtins-test/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,4 @@ fn main() {
116116
}
117117

118118
builtins_configure::configure_aliases(&target);
119-
builtins_configure::configure_f16_f128(&target);
120119
}

‎library/compiler-builtins/builtins-test/tests/conv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ mod i_to_f {
118118
i128, __floattidf;
119119
}
120120

121-
#[cfg(not(feature = "no-f16-f128"))]
121+
#[cfg(f128_enabled)]
122122
#[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))]
123123
i_to_f! { f128, Quad, not(feature = "no-sys-f128-int-convert"),
124124
u32, __floatunsitf;
@@ -129,7 +129,7 @@ mod i_to_f {
129129
i128, __floattitf;
130130
}
131131

132-
#[cfg(not(feature = "no-f16-f128"))]
132+
#[cfg(f128_enabled)]
133133
#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))]
134134
i_to_f! { f128, Quad, not(feature = "no-sys-f128-int-convert"),
135135
u32, __floatunsikf;

‎library/compiler-builtins/builtins-test/tests/div_rem.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ mod float_div {
147147
f64, __divdf3, Double, all();
148148
}
149149

150-
#[cfg(not(feature = "no-f16-f128"))]
150+
#[cfg(f128_enabled)]
151151
#[cfg(not(any(target_arch = "powerpc", target_arch = "powerpc64")))]
152152
float! {
153153
f128, __divtf3, Quad,
@@ -156,7 +156,7 @@ mod float_div {
156156
not(any(feature = "no-sys-f128", all(target_arch = "aarch64", target_os = "linux")));
157157
}
158158

159-
#[cfg(not(feature = "no-f16-f128"))]
159+
#[cfg(f128_enabled)]
160160
#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))]
161161
float! {
162162
f128, __divkf3, Quad, not(feature = "no-sys-f128");

‎library/compiler-builtins/ci/run.sh

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,29 +54,26 @@ symcheck=(cargo run -p symbol-check --release)
5454
[[ "$target" = "wasm"* ]] && symcheck+=(--features wasm)
5555
symcheck+=(-- build-and-check)
5656

57-
"${symcheck[@]}" -p compiler_builtins --target "$target"
58-
"${symcheck[@]}" -p compiler_builtins --target "$target" --release
59-
"${symcheck[@]}" -p compiler_builtins --target "$target" --features c
60-
"${symcheck[@]}" -p compiler_builtins --target "$target" --features c --release
61-
"${symcheck[@]}" -p compiler_builtins --target "$target" --features no-asm
62-
"${symcheck[@]}" -p compiler_builtins --target "$target" --features no-asm --release
63-
"${symcheck[@]}" -p compiler_builtins --target "$target" --features no-f16-f128
64-
"${symcheck[@]}" -p compiler_builtins --target "$target" --features no-f16-f128 --release
57+
"${symcheck[@]}" "$target" -- -p compiler_builtins
58+
"${symcheck[@]}" "$target" -- -p compiler_builtins --release
59+
"${symcheck[@]}" "$target" -- -p compiler_builtins --features c
60+
"${symcheck[@]}" "$target" -- -p compiler_builtins --features c --release
61+
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-asm
62+
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-asm --release
63+
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-f16-f128
64+
"${symcheck[@]}" "$target" -- -p compiler_builtins --features no-f16-f128 --release
6565

6666
run_intrinsics_test() {
67-
args=(
68-
--target "$target" --verbose \
69-
--manifest-path builtins-test-intrinsics/Cargo.toml
70-
)
71-
args+=( "$@" )
67+
build_args=(--verbose --manifest-path builtins-test-intrinsics/Cargo.toml)
68+
build_args+=("$@")
7269

7370
# symcheck also checks the results of builtins-test-intrinsics
74-
"${symcheck[@]}" "${args[@]}"
71+
"${symcheck[@]}" "$target" -- "${build_args[@]}"
7572

7673
# FIXME: we get access violations on Windows, our entrypoint may need to
7774
# be tweaked.
7875
if [ "${BUILD_ONLY:-}" != "1" ] && ! [[ "$target" = *"windows"* ]]; then
79-
cargo run "${args[@]}"
76+
cargo run --target "$target" "${build_args[@]}"
8077
fi
8178
}
8279

‎library/compiler-builtins/compiler-builtins/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ links = "compiler-rt"
1919
bench = false
2020
doctest = false
2121
test = false
22+
# make sure this crate isn't included in public standard library docs
23+
doc = false
2224

2325
[dependencies]
2426
core = { path = "../../core", optional = true }

‎library/compiler-builtins/compiler-builtins/build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ mod configure;
22

33
use std::env;
44

5-
use configure::{Target, configure_aliases, configure_f16_f128};
5+
use configure::{Target, configure_aliases};
66

77
fn main() {
88
println!("cargo::rerun-if-changed=build.rs");
@@ -12,7 +12,6 @@ fn main() {
1212
let cwd = env::current_dir().unwrap();
1313

1414
configure_check_cfg();
15-
configure_f16_f128(&target);
1615
configure_aliases(&target);
1716

1817
configure_libm(&target);

0 commit comments

Comments
 (0)