Skip to content

Commit c65244c

Browse files
authored
Rollup merge of rust-lang#131308 - mati865:gnullvm-f16-f128, r=tgross35
enable f16 and f128 on windows-gnullvm targets Continuation of rust-lang#130959
2 parents 6a809c7 + 0f71b38 commit c65244c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

std/build.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ fn main() {
77
let target_vendor =
88
env::var("CARGO_CFG_TARGET_VENDOR").expect("CARGO_CFG_TARGET_VENDOR was not set");
99
let target_env = env::var("CARGO_CFG_TARGET_ENV").expect("CARGO_CFG_TARGET_ENV was not set");
10+
let target_abi = env::var("CARGO_CFG_TARGET_ABI").expect("CARGO_CFG_TARGET_ABI was not set");
1011
let target_pointer_width: u32 = env::var("CARGO_CFG_TARGET_POINTER_WIDTH")
1112
.expect("CARGO_CFG_TARGET_POINTER_WIDTH was not set")
1213
.parse()
@@ -101,7 +102,7 @@ fn main() {
101102
// Unsupported <https://github.com/llvm/llvm-project/issues/94434>
102103
("arm64ec", _) => false,
103104
// MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054>
104-
("x86_64", "windows") if target_env == "gnu" => false,
105+
("x86_64", "windows") if target_env == "gnu" && target_abi != "llvm" => false,
105106
// Infinite recursion <https://github.com/llvm/llvm-project/issues/97981>
106107
("csky", _) => false,
107108
("hexagon", _) => false,
@@ -129,7 +130,7 @@ fn main() {
129130
// ABI unsupported <https://github.com/llvm/llvm-project/issues/41838>
130131
("sparc", _) => false,
131132
// MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054>
132-
("x86_64", "windows") if target_env == "gnu" => false,
133+
("x86_64", "windows") if target_env == "gnu" && target_abi != "llvm" => false,
133134
// 64-bit Linux is about the only platform to have f128 symbols by default
134135
(_, "linux") if target_pointer_width == 64 => true,
135136
// Almost all OSs are missing symbol. compiler-builtins will have to add them.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy