bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Drop llvm14-builtins-abi with compiler_builtins 0.1.87

Browse source
This commit is contained in:
Josh Stone 2023-02-10 16:13:31 -08:00
parent a06aaa4a9e
commit ffdbd58d85
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock
View file

@ -883,9 +883,9 @@ dependencies = [
[[package]] [[package]]
name = "compiler_builtins" name = "compiler_builtins"
version = "0.1.85" version = "0.1.87"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13e81c6cd7ab79f51a0c927d22858d61ad12bd0b3865f0b13ece02a4486aeabb" checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50"
dependencies = [ dependencies = [
"cc", "cc",
"rustc-std-workspace-core", "rustc-std-workspace-core",

13
compiler/rustc_codegen_llvm/src/llvm_util.rs
View file

@ -211,7 +211,7 @@ pub fn check_tied_features(
/// Must express features in the way Rust understands them /// Must express features in the way Rust understands them
pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> { pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> {
let target_machine = create_informational_target_machine(sess); let target_machine = create_informational_target_machine(sess);
let mut features: Vec<Symbol> = supported_target_features(sess) supported_target_features(sess)
.iter() .iter()
.filter_map(|&(feature, gate)| { .filter_map(|&(feature, gate)| {
if sess.is_nightly_build() || allow_unstable || gate.is_none() { if sess.is_nightly_build() || allow_unstable || gate.is_none() {
@ -231,16 +231,7 @@ pub fn target_features(sess: &Session, allow_unstable: bool) -> Vec<Symbol> {
true true
}) })
.map(|feature| Symbol::intern(feature)) .map(|feature| Symbol::intern(feature))
.collect(); .collect()
// LLVM 14 changed the ABI for i128 arguments to __float/__fix builtins on Win64
// (see https://reviews.llvm.org/D110413). This unstable target feature is intended for use
// by compiler-builtins, to export the builtins with the expected, LLVM-version-dependent ABI.
// The target feature can be dropped once we no longer support older LLVM versions.
if sess.is_nightly_build() {
features.push(Symbol::intern("llvm14-builtins-abi"));
}
features
} }
pub fn print_version() { pub fn print_version() {

2
library/std/Cargo.toml
View file

@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
panic_abort = { path = "../panic_abort" } panic_abort = { path = "../panic_abort" }
core = { path = "../core" } core = { path = "../core" }
libc = { version = "0.2.138", default-features = false, features = ['rustc-dep-of-std'] } libc = { version = "0.2.138", default-features = false, features = ['rustc-dep-of-std'] }
compiler_builtins = { version = "0.1.85" } compiler_builtins = { version = "0.1.87" }
profiler_builtins = { path = "../profiler_builtins", optional = true } profiler_builtins = { path = "../profiler_builtins", optional = true }
unwind = { path = "../unwind" } unwind = { path = "../unwind" }
hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] } hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }