diff --git a/0001-xous-add-senres.patch b/0001-xous-add-senres.patch index a85bb58..41e288e 100644 --- a/0001-xous-add-senres.patch +++ b/0001-xous-add-senres.patch @@ -1,7 +1,7 @@ -From 2a901d63f36d5c28715672f51c44a4b6f3f2e6fe Mon Sep 17 00:00:00 2001 +From ac5f967c1dedf665805d9eef22bd0d0161c7e5e3 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 6 Aug 2024 22:45:11 +0800 -Subject: [PATCH 1/4] xous: add senres +Subject: [PATCH 1/5] xous: add senres Senres is a method for sending and receiving structs. It is a cut-down version of rkyv and similar modules. @@ -25,7 +25,7 @@ index a64cd068560..b4f122fc4be 100644 +mod senres; diff --git a/library/std/src/sys/pal/xous/senres.rs b/library/std/src/sys/pal/xous/senres.rs new file mode 100644 -index 00000000000..1f84478aa97 +index 00000000000..3511ad53288 --- /dev/null +++ b/library/std/src/sys/pal/xous/senres.rs @@ -0,0 +1,628 @@ @@ -360,7 +360,7 @@ index 00000000000..1f84478aa97 + T::try_get_from(self) + } + -+ pub fn try_get_ref_from + ?Sized>(&'a self) -> Result<&T, ()> { ++ pub fn try_get_ref_from + ?Sized>(&'a self) -> Result<&'a T, ()> { + T::try_get_ref_from(self) + } + diff --git a/0002-std-xous-add-support-for-path.patch b/0002-std-xous-add-support-for-path.patch index 14f4651..16cd478 100644 --- a/0002-std-xous-add-support-for-path.patch +++ b/0002-std-xous-add-support-for-path.patch @@ -1,7 +1,7 @@ -From afdf09fa701fbc7202ba96f4a80927cb04b42a3c Mon Sep 17 00:00:00 2001 +From ec265421f0119b78cc11eb5c16ce7babfe37776b Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 6 Aug 2024 22:45:31 +0800 -Subject: [PATCH 2/4] std: xous: add support for path +Subject: [PATCH 2/5] std: xous: add support for path Add support for the Xous-specific path implementation. diff --git a/0003-xous-fs-add-initial-filesystem-support.patch b/0003-xous-fs-add-initial-filesystem-support.patch index aa43a6d..fe17c7a 100644 --- a/0003-xous-fs-add-initial-filesystem-support.patch +++ b/0003-xous-fs-add-initial-filesystem-support.patch @@ -1,7 +1,7 @@ -From 7880a8b8e029709dda0e2f2c10584d4266dd99fb Mon Sep 17 00:00:00 2001 +From a30bd1caabe9d801c0fd57d89eadbce48d8aa010 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 7 Nov 2023 10:41:10 +0800 -Subject: [PATCH 3/4] xous: fs: add initial filesystem support +Subject: [PATCH 3/5] xous: fs: add initial filesystem support Signed-off-by: Sean Cross --- diff --git a/0004-std-not-for-upstreaming-customize-tests-for-Xous.patch b/0004-std-not-for-upstreaming-customize-tests-for-Xous.patch index ffd3ddb..09297ed 100644 --- a/0004-std-not-for-upstreaming-customize-tests-for-Xous.patch +++ b/0004-std-not-for-upstreaming-customize-tests-for-Xous.patch @@ -1,7 +1,7 @@ -From bfa87652afdee573d7635bf966e69b6e9ed32b08 Mon Sep 17 00:00:00 2001 +From 6b8975e7371f9c209dad6956b179ca99d874a509 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Sun, 24 Dec 2023 15:15:01 +0800 -Subject: [PATCH 4/4] std: (not for upstreaming) customize tests for Xous +Subject: [PATCH 4/5] std: (not for upstreaming) customize tests for Xous Signed-off-by: Sean Cross --- @@ -13,7 +13,7 @@ Signed-off-by: Sean Cross 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/library/std/src/collections/hash/map/tests.rs b/library/std/src/collections/hash/map/tests.rs -index fa8ea95b891..3cadfe2688a 100644 +index b79ad1c3119..7568db8f59e 100644 --- a/library/std/src/collections/hash/map/tests.rs +++ b/library/std/src/collections/hash/map/tests.rs @@ -270,11 +270,11 @@ fn test_lots_of_insertions() { diff --git a/0005-xous-sync-remove-rustc_const_stable-attribute.patch b/0005-xous-sync-remove-rustc_const_stable-attribute.patch new file mode 100644 index 0000000..cfb6884 --- /dev/null +++ b/0005-xous-sync-remove-rustc_const_stable-attribute.patch @@ -0,0 +1,44 @@ +From d96ec8307917d12db361c8c920dca52d8fcca5bf Mon Sep 17 00:00:00 2001 +From: Sean Cross +Date: Tue, 29 Oct 2024 22:39:48 +0800 +Subject: [PATCH 5/5] xous: sync: remove `rustc_const_stable` attribute + +These functions had `#[rustc_const_stable(feature = "const_locks", since += "1.63.0")]` on them because they were originally taken from +`no_threads`. with d066dfd these no longer compile. Since other +platforms do not have this attribute, remove it. This fixes the build +for Xous. + +Signed-off-by: Sean Cross +--- + library/std/src/sys/sync/condvar/xous.rs | 1 - + library/std/src/sys/sync/mutex/xous.rs | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/library/std/src/sys/sync/condvar/xous.rs b/library/std/src/sys/sync/condvar/xous.rs +index cb55a3e3369..b9e5f47abfc 100644 +--- a/library/std/src/sys/sync/condvar/xous.rs ++++ b/library/std/src/sys/sync/condvar/xous.rs +@@ -20,7 +20,6 @@ unsafe impl Sync for Condvar {} + + impl Condvar { + #[inline] +- #[rustc_const_stable(feature = "const_locks", since = "1.63.0")] + pub const fn new() -> Condvar { + Condvar { counter: AtomicUsize::new(0), timed_out: AtomicUsize::new(0) } + } +diff --git a/library/std/src/sys/sync/mutex/xous.rs b/library/std/src/sys/sync/mutex/xous.rs +index 233e638f913..c6b954c1711 100644 +--- a/library/std/src/sys/sync/mutex/xous.rs ++++ b/library/std/src/sys/sync/mutex/xous.rs +@@ -24,7 +24,6 @@ pub struct Mutex { + + impl Mutex { + #[inline] +- #[rustc_const_stable(feature = "const_locks", since = "1.63.0")] + pub const fn new() -> Mutex { + Mutex { locked: AtomicUsize::new(0), contended: AtomicBool::new(false) } + } +-- +2.34.1 +