proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-01-04 09:43:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cherry-pick libc/wasi fix

Browse Source 
https://github.com/rust-lang/libc/pull/2528

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-02-07 20:49:17 +01:00 committed by Ximin Luo
parent 8c7f677448
commit dd43787aaa
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/patches/series vendored
View File

@ -5,6 +5,7 @@ u-ignore-reproducible-failure.patch
u-reproducible-build.patch
u-ignore-endian-big-diff.patch
u-cc-627.patch
u-fix-libc-wasi-scope.patch
# not forwarded, or forwarded but unlikely to be merged
u-ignore-ppc-hangs.patch

42
debian/patches/u-fix-libc-wasi-scope.patch vendored Normal file
View File

@ -0,0 +1,42 @@
From 41a86473908e3c8b0f91e4607784533d592421a1 Mon Sep 17 00:00:00 2001
From: Jubilee Young <workingjubilee@gmail.com>
Date: Wed, 10 Nov 2021 16:59:21 -0800
Subject: [PATCH] Scope in Send, Sync for wasi
---
src/lib.rs | 4 ++--
src/wasi.rs | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/vendor/libc/src/lib.rs b/vendor/libc/src/lib.rs
index 19fed28de264..630ee7a0efb7 100644
--- a/vendor/libc/src/lib.rs
+++ b/vendor/libc/src/lib.rs
@@ -63,7 +63,7 @@ cfg_if! {
use core::clone::Clone;
#[doc(hidden)]
#[allow(unused_imports)]
- use core::marker::Copy;
+ use core::marker::{Copy, Send, Sync};
#[doc(hidden)]
#[allow(unused_imports)]
use core::option::Option;
@@ -85,7 +85,7 @@ cfg_if! {
pub use core::clone::Clone;
#[doc(hidden)]
#[allow(unused_imports)]
- pub use core::marker::Copy;
+ pub use core::marker::{Copy, Send, Sync};
#[doc(hidden)]
#[allow(unused_imports)]
pub use core::option::Option;
diff --git a/vendor/libc/src/wasi.rs b/vendor/libc/src/wasi.rs
index f66550b20dfe..ea837328983d 100644
--- a/vendor/libc/src/wasi.rs
+++ b/vendor/libc/src/wasi.rs
@@ -1,3 +1,5 @@
+use super::{Send, Sync};
+
pub use ffi::c_void;
pub type c_char = i8;