Skip to content

Commit 4b4a653

Browse files
authored
Upgrade Rust toolchain to 2025-09-30 (#4388)
Relevant upstream PRs: - rust-lang/rust#147127 (Add a leading dash to linker plugin arguments in the gcc codegen) Resolves: #4387 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.
1 parent 8942fc8 commit 4b4a653

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

kani-compiler/src/codegen_aeneas_llbc/compiler_interface.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ impl CodegenBackend for LlbcCodegenBackend {
198198
println!("Kani-llbc version: {}", env!("CARGO_PKG_VERSION"));
199199
}
200200

201+
fn name(&self) -> &'static str {
202+
"kani-llbc"
203+
}
204+
201205
fn locale_resource(&self) -> &'static str {
202206
// We don't currently support multiple languages.
203207
DEFAULT_LOCALE_RESOURCE
@@ -324,7 +328,14 @@ impl CodegenBackend for LlbcCodegenBackend {
324328
) {
325329
let requested_crate_types = &codegen_results.crate_info.crate_types.clone();
326330
let local_crate_name = codegen_results.crate_info.local_crate_name;
327-
link_binary(sess, &ArArchiveBuilderBuilder, codegen_results, rustc_metadata, outputs);
331+
link_binary(
332+
sess,
333+
&ArArchiveBuilderBuilder,
334+
codegen_results,
335+
rustc_metadata,
336+
outputs,
337+
self.name(),
338+
);
328339
for crate_type in requested_crate_types {
329340
let out_fname = out_filename(sess, *crate_type, outputs, local_crate_name);
330341
let out_path = out_fname.as_path();

kani-compiler/src/codegen_cprover_gotoc/compiler_interface.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,10 @@ impl CodegenBackend for GotocCodegenBackend {
290290
println!("Kani-goto version: {}", env!("CARGO_PKG_VERSION"));
291291
}
292292

293+
fn name(&self) -> &'static str {
294+
"kani-cprover"
295+
}
296+
293297
fn locale_resource(&self) -> &'static str {
294298
// We don't currently support multiple languages.
295299
DEFAULT_LOCALE_RESOURCE
@@ -525,7 +529,14 @@ impl CodegenBackend for GotocCodegenBackend {
525529
let local_crate_name = codegen_results.crate_info.local_crate_name;
526530
// Create the rlib if one was requested.
527531
if requested_crate_types.contains(&CrateType::Rlib) {
528-
link_binary(sess, &ArArchiveBuilderBuilder, codegen_results, rustc_metadata, outputs);
532+
link_binary(
533+
sess,
534+
&ArArchiveBuilderBuilder,
535+
codegen_results,
536+
rustc_metadata,
537+
outputs,
538+
self.name(),
539+
);
529540
}
530541

531542
// But override all the other outputs.

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# SPDX-License-Identifier: Apache-2.0 OR MIT
33

44
[toolchain]
5-
channel = "nightly-2025-09-29"
5+
channel = "nightly-2025-09-30"
66
components = ["llvm-tools", "rustc-dev", "rust-src", "rustfmt"]

0 commit comments

Comments
 (0)