From 54648091dd65ecc2b414399916d6fea96ab4d0a9 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Fri, 17 Feb 2023 18:46:32 +0000
Subject: [PATCH] Update to compiler-builtins 0.1.87

---
 build_sysroot/Cargo.lock                      |  4 +--
 build_sysroot/Cargo.toml                      |  3 +--
 ...owngrade-compiler-builtins-to-0.1.86.patch | 26 -------------------
 src/lib.rs                                    |  2 +-
 4 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 patches/0029-sysroot-Downgrade-compiler-builtins-to-0.1.86.patch

diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index b7e0b68a2a2..3f9b374be23 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -50,9 +50,9 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.86"
+version = "0.1.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dae98c88e576098d7ab13ebcb40cc43e5114b2beafe61a87cda9200649ff205"
+checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50"
 dependencies = [
  "rustc-std-workspace-core",
 ]
diff --git a/build_sysroot/Cargo.toml b/build_sysroot/Cargo.toml
index cde60ce2e05..8219e6b6ccf 100644
--- a/build_sysroot/Cargo.toml
+++ b/build_sysroot/Cargo.toml
@@ -8,8 +8,7 @@ alloc = { path = "./sysroot_src/library/alloc" }
 std = { path = "./sysroot_src/library/std", features = ["panic_unwind", "backtrace"] }
 test = { path = "./sysroot_src/library/test" }
 
-# FIXME allow 0.1.87 and later once #1353 is fixed
-compiler_builtins = { version = "=0.1.86", default-features = false, features = ["no-asm"] }
+compiler_builtins = { version = "0.1.87", default-features = false, features = ["no-asm"] }
 
 [patch.crates-io]
 rustc-std-workspace-core = { path = "./sysroot_src/library/rustc-std-workspace-core" }
diff --git a/patches/0029-sysroot-Downgrade-compiler-builtins-to-0.1.86.patch b/patches/0029-sysroot-Downgrade-compiler-builtins-to-0.1.86.patch
deleted file mode 100644
index c5fa6aaec2b..00000000000
--- a/patches/0029-sysroot-Downgrade-compiler-builtins-to-0.1.86.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ff23f6113098987318b674088b924e22750be18c Mon Sep 17 00:00:00 2001
-From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
-Date: Fri, 17 Feb 2023 18:37:48 +0100
-Subject: [PATCH] Downgrade compiler-builtins to 0.1.86
-
-0.1.87 doesn't work on Windows when using cg_clif
----
- library/std/Cargo.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
-index 349cd91..300f812 100644
---- a/library/std/Cargo.toml
-+++ b/library/std/Cargo.toml
-@@ -16,7 +16,7 @@ panic_unwind = { path = "../panic_unwind", optional = true }
- panic_abort = { path = "../panic_abort" }
- core = { path = "../core" }
- libc = { version = "0.2.138", default-features = false, features = ['rustc-dep-of-std'] }
--compiler_builtins = { version = "0.1.87" }
-+compiler_builtins = { version = "0.1.86" }
- profiler_builtins = { path = "../profiler_builtins", optional = true }
- unwind = { path = "../unwind" }
- hashbrown = { version = "0.12", default-features = false, features = ['rustc-dep-of-std'] }
--- 
-2.26.2.7.g19db9cfb68
-
diff --git a/src/lib.rs b/src/lib.rs
index 5b69bc7cc9b..c7fe382bac4 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -188,7 +188,7 @@ fn init(&self, sess: &Session) {
     }
 
     fn target_features(&self, _sess: &Session, _allow_unstable: bool) -> Vec<rustc_span::Symbol> {
-        vec![Symbol::intern("llvm14-builtins-abi")]
+        vec![]
     }
 
     fn print_version(&self) {