aboutsummaryrefslogtreecommitdiff
path: root/devel/electron35/files/patch-build_rust_allocator_lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'devel/electron35/files/patch-build_rust_allocator_lib.rs')
-rw-r--r--devel/electron35/files/patch-build_rust_allocator_lib.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/devel/electron35/files/patch-build_rust_allocator_lib.rs b/devel/electron35/files/patch-build_rust_allocator_lib.rs
index 89fddf278294..90c48fdb94cc 100644
--- a/devel/electron35/files/patch-build_rust_allocator_lib.rs
+++ b/devel/electron35/files/patch-build_rust_allocator_lib.rs
@@ -1,6 +1,6 @@
---- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
+--- build/rust/allocator/lib.rs.orig 2025-08-26 21:24:10 UTC
+++ build/rust/allocator/lib.rs
-@@ -0,0 +1,119 @@
+@@ -0,0 +1,125 @@
+// Copyright 2025 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -92,6 +92,12 @@
+ /// As part of rustc's contract for using `#[global_allocator]` without
+ /// rustc-generated shims we must define this symbol, since we are opting in
+ /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
++ #[rustc_std_internal_symbol]
++ #[linkage = "weak"]
++ fn __rust_no_alloc_shim_is_unstable_v2() {}
++
++ // TODO(crbug.com/422538133) Remove after rolling past
++ // https://github.com/rust-lang/rust/pull/141061
+ #[no_mangle]
+ #[linkage = "weak"]
+ static __rust_no_alloc_shim_is_unstable: u8 = 0;