From 0becea71dc8d0ed94db8bf9c7c4515c45ab0843a Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Fri, 27 Sep 2024 19:04:35 -0400
Subject: [PATCH 1/2] Enable `f16` tests on x86 Apple platforms

These were disabled because Apple uses a special ABI for `f16`.
`compiler-builtins` merged a fix for this in [1], which has since
propagated to rust-lang/rust. Enable tests since there should be no
remaining issues on these platforms.

[1]: https://github.com/rust-lang/compiler-builtins/pull/675
---
 library/std/build.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/library/std/build.rs b/library/std/build.rs
index 359ae4f20eea8..0278bfcfb08df 100644
--- a/library/std/build.rs
+++ b/library/std/build.rs
@@ -105,9 +105,6 @@ fn main() {
         ("arm64ec", _) => false,
         // MinGW ABI bugs <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115054>
         ("x86_64", "windows") => false,
-        // Apple has a special ABI for `f16` that we do not yet support
-        // FIXME(builtins): fixed by <https://github.com/rust-lang/compiler-builtins/pull/675>
-        ("x86" | "x86_64", _) if target_vendor == "apple" => false,
         // Missing `__gnu_h2f_ieee` and `__gnu_f2h_ieee`
         ("powerpc" | "powerpc64", _) => false,
         // Missing `__gnu_h2f_ieee` and `__gnu_f2h_ieee`

From 43e4c074676ec0336c3c39894e2388c171da3015 Mon Sep 17 00:00:00 2001
From: Trevor Gross <tmgross@umich.edu>
Date: Fri, 27 Sep 2024 18:59:52 -0400
Subject: [PATCH 2/2] Do not merge: change fallback for testing

---
 library/std/build.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/std/build.rs b/library/std/build.rs
index 0278bfcfb08df..f960aa2254e3d 100644
--- a/library/std/build.rs
+++ b/library/std/build.rs
@@ -113,10 +113,9 @@ fn main() {
         ("riscv32" | "riscv64", _) => false,
         // Most OSs are missing `__extendhfsf` and `__truncsfhf`
         (_, "linux" | "macos") => true,
-        // Almost all OSs besides Linux and MacOS are missing symbols until compiler-builtins can
-        // be updated. <https://github.com/rust-lang/rust/pull/125016> will get some of these, the
-        // next CB update should get the rest.
-        _ => false,
+        // TODO: only for testing, this line will wind up changed as part of
+        // <https://github.com/rust-lang/rust/pull/129385>.
+        _ => true,
     };
 
     let has_reliable_f128 = match (target_arch.as_str(), target_os.as_str()) {