Skip to content

Commit da63add

Browse files
committed
Merge branch 'master' into sync_from_rust_2025_07_21
2 parents 4475b1c + f682d09 commit da63add

File tree

4 files changed

+26
-38
lines changed

4 files changed

+26
-38
lines changed

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

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-07-04"
2+
channel = "nightly-2025-07-21"
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
@@ -74,44 +74,8 @@ fn get_simple_intrinsic<'gcc, 'tcx>(
7474
sym::fabsf64 => "fabs",
7575
sym::minnumf32 => "fminf",
7676
sym::minnumf64 => "fmin",
77-
sym::minimumf32 => "fminimumf",
78-
sym::minimumf64 => "fminimum",
79-
sym::minimumf128 => {
80-
// GCC doesn't have the intrinsic we want so we use the compiler-builtins one
81-
// https://docs.rs/compiler_builtins/latest/compiler_builtins/math/full_availability/fn.fminimumf128.html
82-
let f128_type = cx.type_f128();
83-
return Some(cx.context.new_function(
84-
None,
85-
FunctionType::Extern,
86-
f128_type,
87-
&[
88-
cx.context.new_parameter(None, f128_type, "a"),
89-
cx.context.new_parameter(None, f128_type, "b"),
90-
],
91-
"fminimumf128",
92-
false,
93-
));
94-
}
9577
sym::maxnumf32 => "fmaxf",
9678
sym::maxnumf64 => "fmax",
97-
sym::maximumf32 => "fmaximumf",
98-
sym::maximumf64 => "fmaximum",
99-
sym::maximumf128 => {
100-
// GCC doesn't have the intrinsic we want so we use the compiler-builtins one
101-
// https://docs.rs/compiler_builtins/latest/compiler_builtins/math/full_availability/fn.fmaximumf128.html
102-
let f128_type = cx.type_f128();
103-
return Some(cx.context.new_function(
104-
None,
105-
FunctionType::Extern,
106-
f128_type,
107-
&[
108-
cx.context.new_parameter(None, f128_type, "a"),
109-
cx.context.new_parameter(None, f128_type, "b"),
110-
],
111-
"fmaximumf128",
112-
false,
113-
));
114-
}
11579
sym::copysignf32 => "copysignf",
11680
sym::copysignf64 => "copysign",
11781
sym::floorf32 => "floorf",

0 commit comments

Comments
 (0)