Skip to content

Commit 44790a9

Browse files
committed
Merge branch 'master' into sync_from_rust_2025_09_29
2 parents 68c97a8 + 5c50a42 commit 44790a9

File tree

8 files changed

+31
-41
lines changed

8 files changed

+31
-41
lines changed

.github/workflows/stdarch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
# TODO: remove when we have binutils version 2.43 in the repo.
4242
- name: Install more recent binutils
4343
run: |
44-
echo "deb http://archive.ubuntu.com/ubuntu oracular main universe" | sudo tee /etc/apt/sources.list.d/oracular-copies.list
44+
echo "deb http://archive.ubuntu.com/ubuntu plucky main universe" | sudo tee /etc/apt/sources.list.d/plucky-copies.list
4545
sudo apt-get update
4646
sudo apt-get install binutils
4747

build_system/src/test.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,8 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
714714
let path = get_sysroot_dir().join("sysroot_src/library/coretests");
715715
let _ = remove_dir_all(path.join("target"));
716716
// TODO(antoyo): run in release mode when we fix the failures.
717-
run_cargo_command(&[&"test"], Some(&path), env, args)?;
717+
// TODO(antoyo): Stop skipping funnel shift tests when those operations are fixed.
718+
run_cargo_command(&[&"test", &"--", &"--skip", &"test_funnel_shift"], Some(&path), env, args)?;
718719
Ok(())
719720
}
720721

example/mini_core_hello_world.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
)]
77
#![no_core]
88
#![allow(dead_code, internal_features, non_camel_case_types)]
9-
#![rustfmt_skip]
9+
#![cfg_attr(rustfmt, rustfmt_skip)]
1010

1111
extern crate mini_core;
1212

libgccjit.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4e995bd73c4490edfe5080ec6014d63aa9abed5f
1+
4a8c8ec7c375a2f6bb5ca832efa45375a590bb5d

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2025-08-25"
2+
channel = "nightly-2025-09-16"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

src/archive.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
use std::path::Path;
2+
3+
use rustc_codegen_ssa::back::archive::{
4+
ArArchiveBuilder, ArchiveBuilder, ArchiveBuilderBuilder, DEFAULT_OBJECT_READER,
5+
};
6+
use rustc_session::Session;
7+
8+
pub(crate) struct ArArchiveBuilderBuilder;
9+
10+
impl ArchiveBuilderBuilder for ArArchiveBuilderBuilder {
11+
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder + 'a> {
12+
Box::new(ArArchiveBuilder::new(sess, &DEFAULT_OBJECT_READER))
13+
}
14+
15+
fn create_dll_import_lib(
16+
&self,
17+
_sess: &Session,
18+
_lib_name: &str,
19+
_import_name_and_ordinal_vector: Vec<(String, Option<u16>)>,
20+
_output_path: &Path,
21+
) {
22+
unimplemented!("creating dll imports is not yet supported");
23+
}
24+
}

src/intrinsic/mod.rs

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -73,44 +73,8 @@ fn get_simple_intrinsic<'gcc, 'tcx>(
7373
sym::fabsf64 => "fabs",
7474
sym::minnumf32 => "fminf",
7575
sym::minnumf64 => "fmin",
76-
sym::minimumf32 => "fminimumf",
77-
sym::minimumf64 => "fminimum",
78-
sym::minimumf128 => {
79-
// GCC doesn't have the intrinsic we want so we use the compiler-builtins one
80-
// https://docs.rs/compiler_builtins/latest/compiler_builtins/math/full_availability/fn.fminimumf128.html
81-
let f128_type = cx.type_f128();
82-
return Some(cx.context.new_function(
83-
None,
84-
FunctionType::Extern,
85-
f128_type,
86-
&[
87-
cx.context.new_parameter(None, f128_type, "a"),
88-
cx.context.new_parameter(None, f128_type, "b"),
89-
],
90-
"fminimumf128",
91-
false,
92-
));
93-
}
9476
sym::maxnumf32 => "fmaxf",
9577
sym::maxnumf64 => "fmax",
96-
sym::maximumf32 => "fmaximumf",
97-
sym::maximumf64 => "fmaximum",
98-
sym::maximumf128 => {
99-
// GCC doesn't have the intrinsic we want so we use the compiler-builtins one
100-
// https://docs.rs/compiler_builtins/latest/compiler_builtins/math/full_availability/fn.fmaximumf128.html
101-
let f128_type = cx.type_f128();
102-
return Some(cx.context.new_function(
103-
None,
104-
FunctionType::Extern,
105-
f128_type,
106-
&[
107-
cx.context.new_parameter(None, f128_type, "a"),
108-
cx.context.new_parameter(None, f128_type, "b"),
109-
],
110-
"fmaximumf128",
111-
false,
112-
));
113-
}
11478
sym::copysignf32 => "copysignf",
11579
sym::copysignf64 => "copysign",
11680
sym::floorf32 => "floorf",

tests/failing-ui-tests.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,4 @@ tests/ui/linkage-attr/raw-dylib/elf/glibc-x86_64.rs
8888
tests/ui/explicit-tail-calls/recursion-etc.rs
8989
tests/ui/explicit-tail-calls/indexer.rs
9090
tests/ui/explicit-tail-calls/drop-order.rs
91+
tests/ui/c-variadic/valid.rs

0 commit comments

Comments
 (0)