From dd43787aaa4ba8b9038fcfe76910941dbcc0443c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 7 Feb 2022 20:49:17 +0100
Subject: [PATCH] cherry-pick libc/wasi fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 debian/patches/series                      |  1 +
 debian/patches/u-fix-libc-wasi-scope.patch | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 debian/patches/u-fix-libc-wasi-scope.patch

diff --git a/debian/patches/series b/debian/patches/series
index ad41179e12..b35666f7cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
diff --git a/debian/patches/u-fix-libc-wasi-scope.patch b/debian/patches/u-fix-libc-wasi-scope.patch
new file mode 100644
index 0000000000..9c523efe61
--- /dev/null
+++ b/debian/patches/u-fix-libc-wasi-scope.patch
@@ -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;