From 1b539c3df84bc9d9ea2e796d838528297589e105 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 19 Mar 2025 01:26:15 +0000
Subject: [PATCH] rust: update to 1.85.1

---
 packages/rust/rust/package.mk                 |  6 +--
 .../rust-137460-fix-1.85.0-bootstrap.patch    | 42 -------------------
 .../arm-libreelec-linux-gnueabihf.json        |  1 +
 3 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 packages/rust/rust/patches/rust-137460-fix-1.85.0-bootstrap.patch

diff --git a/packages/rust/rust/package.mk b/packages/rust/rust/package.mk
index 11e2485b3d..2394a6790e 100644
--- a/packages/rust/rust/package.mk
+++ b/packages/rust/rust/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rust"
-PKG_VERSION="1.85.0"
-PKG_SHA256="2f4f3142ffb7c8402139cfa0796e24baaac8b9fd3f96b2deec3b94b4045c6a8a"
+PKG_VERSION="1.85.1"
+PKG_SHA256="0f2995ca083598757a8d9a293939e569b035799e070f419a686b0996fb94238a"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-src.tar.gz"
@@ -33,7 +33,7 @@ configure_host() {
   esac
 
   cat >${PKG_BUILD}/config.toml  <<END
-change-id = 133207
+change-id = 134650
 
 [llvm]
 download-ci-llvm = false
diff --git a/packages/rust/rust/patches/rust-137460-fix-1.85.0-bootstrap.patch b/packages/rust/rust/patches/rust-137460-fix-1.85.0-bootstrap.patch
deleted file mode 100644
index c7b8b394c8..0000000000
--- a/packages/rust/rust/patches/rust-137460-fix-1.85.0-bootstrap.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7 Mon Sep 17 00:00:00 2001
-From: onur-ozkan <work@onurozkan.dev>
-Date: Sun, 23 Feb 2025 08:23:51 +0300
-Subject: [PATCH] downgrade bootstrap `cc`
-
-Signed-off-by: onur-ozkan <work@onurozkan.dev>
----
- src/bootstrap/Cargo.lock | 4 ++--
- src/bootstrap/Cargo.toml | 4 +++-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock
-index a47f3af60cbd5..890e64e2babbc 100644
---- a/src/bootstrap/Cargo.lock
-+++ b/src/bootstrap/Cargo.lock
-@@ -88,9 +88,9 @@ dependencies = [
- 
- [[package]]
- name = "cc"
--version = "1.2.0"
-+version = "1.1.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
-+checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
- dependencies = [
-  "shlex",
- ]
-diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
-index ed51862390d40..2c1d85b01e6af 100644
---- a/src/bootstrap/Cargo.toml
-+++ b/src/bootstrap/Cargo.toml
-@@ -37,7 +37,9 @@ test = false
- # Most of the time updating these dependencies requires modifications to the
- # bootstrap codebase(e.g., https://github.com/rust-lang/rust/issues/124565);
- # otherwise, some targets will fail. That's why these dependencies are explicitly pinned.
--cc = "=1.2.0"
-+#
-+# Do not upgrade this crate unless https://github.com/rust-lang/cc-rs/issues/1317 is fixed.
-+cc = "=1.1.22"
- cmake = "=0.1.48"
- 
- build_helper = { path = "../build_helper" }
diff --git a/packages/rust/rust/targets/arm-libreelec-linux-gnueabihf.json b/packages/rust/rust/targets/arm-libreelec-linux-gnueabihf.json
index 351e10419e..556f81c263 100644
--- a/packages/rust/rust/targets/arm-libreelec-linux-gnueabihf.json
+++ b/packages/rust/rust/targets/arm-libreelec-linux-gnueabihf.json
@@ -10,6 +10,7 @@
   "has-rpath": true,
   "has-thread-local": true,
   "is-builtin": false,
+  "llvm-floatabi": "hard",
   "llvm-target": "arm-unknown-linux-gnueabihf",
   "max-atomic-width": 64,
   "os": "linux",