* [PATCH v2] librsvg: Disable 64bit atomics in crossbeam for rv32
@ 2021-10-24 6:59 Khem Raj
2021-10-24 7:06 ` [OE-core] " Alexander Kanavin
0 siblings, 1 reply; 2+ messages in thread
From: Khem Raj @ 2021-10-24 6:59 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
This fixes
| error[E0412]: cannot find type `AtomicU64` in module `core::sync::atomic`
| --> /usr/src/debug/librsvg/2.52.2-r0/librsvg-2.52.2/vendor/crossbeam-utils/src/atomic/consume.rs: 78:14
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Add riscv32 to NO_ATOMIC_CAS
...m-utils-check-only-the-architecture-not-the-.patch | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
index 488c607480..0c1cf59eff 100644
--- a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
+++ b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
@@ -16,8 +16,6 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
vendor/crossbeam-utils/no_atomic.rs | 78 ++++++++-------------
3 files changed, 38 insertions(+), 52 deletions(-)
-diff --git a/vendor/crossbeam-utils/.cargo-checksum.json b/vendor/crossbeam-utils/.cargo-checksum.json
-index 4ffc417..2d476df 100644
--- a/vendor/crossbeam-utils/.cargo-checksum.json
+++ b/vendor/crossbeam-utils/.cargo-checksum.json
@@ -1 +1,3 @@
@@ -25,9 +23,7 @@ index 4ffc417..2d476df 100644
\ No newline at end of file
+{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d",
+"build.rs":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354",
-+"no_atomic.rs":"fda07862ab8c3ac999b58b494fa963e4024a0979037f4c37cf2069d78ab6e5ba","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
-diff --git a/vendor/crossbeam-utils/build.rs b/vendor/crossbeam-utils/build.rs
-index 9c924ad..e97953c 100644
++"no_atomic.rs":"dcbd845deda197b13361238a6aab60b6d8124fb588fd0b33740e127441db3f1a","src/atomic/atomic_cell.rs":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/cache_padded.rs":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/parker.rs":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/sharded_lock.rs":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/wait_group.rs":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/thread.rs":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/atomic_cell.rs":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
--- a/vendor/crossbeam-utils/build.rs
+++ b/vendor/crossbeam-utils/build.rs
@@ -20,17 +20,19 @@ fn main() {
@@ -53,11 +49,9 @@ index 9c924ad..e97953c 100644
println!("cargo:rustc-cfg=crossbeam_no_atomic_64");
} else {
// Otherwise, assuming `"max-atomic-width" == 64`.
-diff --git a/vendor/crossbeam-utils/no_atomic.rs b/vendor/crossbeam-utils/no_atomic.rs
-index 522b3b8..8096630 100644
--- a/vendor/crossbeam-utils/no_atomic.rs
+++ b/vendor/crossbeam-utils/no_atomic.rs
-@@ -2,58 +2,40 @@
+@@ -2,58 +2,41 @@
// It is not intended for manual editing.
const NO_ATOMIC_CAS: &[&str] = &[
@@ -125,6 +119,7 @@ index 522b3b8..8096630 100644
+ "mipsisa32r6",
+ "mipsisa32r6el",
+ "powerpc",
++ "riscv32",
+ "riscv32gc",
+ "riscv32imac",
+ "thumbv7em",
--
2.33.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [OE-core] [PATCH v2] librsvg: Disable 64bit atomics in crossbeam for rv32
2021-10-24 6:59 [PATCH v2] librsvg: Disable 64bit atomics in crossbeam for rv32 Khem Raj
@ 2021-10-24 7:06 ` Alexander Kanavin
0 siblings, 0 replies; 2+ messages in thread
From: Alexander Kanavin @ 2021-10-24 7:06 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 7689 bytes --]
Thanks :)
Alex
On Sun, 24 Oct 2021 at 08:59, Khem Raj <raj.khem@gmail.com> wrote:
> This fixes
> | error[E0412]: cannot find type `AtomicU64` in module `core::sync::atomic`
> | -->
> /usr/src/debug/librsvg/2.52.2-r0/librsvg-2.52.2/vendor/crossbeam-utils/src/atomic/
> consume.rs: 78:14
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Add riscv32 to NO_ATOMIC_CAS
>
> ...m-utils-check-only-the-architecture-not-the-.patch | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git
> a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
> b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
> index 488c607480..0c1cf59eff 100644
> ---
> a/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
> +++
> b/meta/recipes-gnome/librsvg/librsvg/0001-crossbeam-utils-check-only-the-architecture-not-the-.patch
> @@ -16,8 +16,6 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> vendor/crossbeam-utils/no_atomic.rs | 78 ++++++++-------------
> 3 files changed, 38 insertions(+), 52 deletions(-)
>
> -diff --git a/vendor/crossbeam-utils/.cargo-checksum.json
> b/vendor/crossbeam-utils/.cargo-checksum.json
> -index 4ffc417..2d476df 100644
> --- a/vendor/crossbeam-utils/.cargo-checksum.json
> +++ b/vendor/crossbeam-utils/.cargo-checksum.json
> @@ -1 +1,3 @@
> @@ -25,9 +23,7 @@ index 4ffc417..2d476df 100644
> \ No newline at end of file
>
> +{"files":{"CHANGELOG.md":"5242f1740c65509c465c9a36326d344722facff5f5e58dd064f7b77806b83a46","Cargo.toml":"ac35a7b8ccb16f1ab256951576537aa4179a316c068929c2acef89e0adc12319","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"dfa9fbed47c344c134a63c84b7c0e4651baeac1554b7b3266d0e38643743fc33","benches/
> atomic_cell.rs
> ":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d",
> +"build.rs
> ":"15c1a41a88373231cbc17c7de5ade07c6098455af9cdeef81b576f37ed923354",
> -+"no_atomic.rs
> ":"fda07862ab8c3ac999b58b494fa963e4024a0979037f4c37cf2069d78ab6e5ba","src/atomic/
> atomic_cell.rs
> ":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/
> consume.rs
> ":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/
> mod.rs
> ":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/
> seq_lock.rs
> ":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/
> seq_lock_wide.rs
> ":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/
> backoff.rs
> ":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/
> cache_padded.rs
> ":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/
> lib.rs
> ":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/
> mod.rs
> ":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/
> parker.rs
> ":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/
> sharded_lock.rs
> ":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/
> wait_group.rs
> ":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/
> thread.rs
> ":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/
> atomic_cell.rs
> ":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/
> cache_padded.rs
> ":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/
> parker.rs
> ":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/
> sharded_lock.rs
> ":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/
> thread.rs
> ":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/
> wait_group.rs
> ":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
> -diff --git a/vendor/crossbeam-utils/build.rs b/vendor/crossbeam-utils/
> build.rs
> -index 9c924ad..e97953c 100644
> ++"no_atomic.rs
> ":"dcbd845deda197b13361238a6aab60b6d8124fb588fd0b33740e127441db3f1a","src/atomic/
> atomic_cell.rs
> ":"1a3a1e073340317b5ce7a94e29c6a87db89ff7e00da6b92cb3c0339364c3b084","src/atomic/
> consume.rs
> ":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/
> mod.rs
> ":"7f6afd5bd0da1f7b51765ab04da4e5f683588ac2d23506e61bf7007bb1e61ba2","src/atomic/
> seq_lock.rs
> ":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/
> seq_lock_wide.rs
> ":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/
> backoff.rs
> ":"7cc7754e15f69b52e92a70d4f49d1bc274693455a0933a2d7eb0605806566af3","src/
> cache_padded.rs
> ":"6a512698115ad0d5a5b163dbd7a83247e1f1c146c4a30f3fc74b952e3b767b59","src/
> lib.rs
> ":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/
> mod.rs
> ":"59986f559a8f170a4b3247ab2eea2460b09809d87c8110ed88e4e7103d3519dc","src/sync/
> parker.rs
> ":"ba8f75bff31b8be9275808e8f393e71cc682dfc1109ceccb12f69a3700cff5be","src/sync/
> sharded_lock.rs
> ":"14be659744918d0b27db24c56b41c618b0f0484b6761da46561023d96c4c120f","src/sync/
> wait_group.rs
> ":"32e946a7581c55f8aa9904527b92b177c538fa0cf7cbcfa1d1f25990582cb6ea","src/
> thread.rs
> ":"0eb5ec1d3c1b40600d88eb70539d14276e32307f5bed2b679f50f6a20777a01e","tests/
> atomic_cell.rs
> ":"6c9453384ecbbe76f8b97b62f022d478d3a76b4eae1e960f49790970f5d52158","tests/
> cache_padded.rs
> ":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/
> parker.rs
> ":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/
> sharded_lock.rs
> ":"726025ce6351fb56ed629d5a56bdf6e833b7afc5dedfa08de0b056c726b6c26d","tests/
> thread.rs
> ":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/
> wait_group.rs
> ":"ad8f0cdfed31f9594a2e0737234d418f8b924d784a4db8d7e469deab8c95f5f8"},"package":"d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"}
> --- a/vendor/crossbeam-utils/build.rs
> +++ b/vendor/crossbeam-utils/build.rs
> @@ -20,17 +20,19 @@ fn main() {
> @@ -53,11 +49,9 @@ index 9c924ad..e97953c 100644
> println!("cargo:rustc-cfg=crossbeam_no_atomic_64");
> } else {
> // Otherwise, assuming `"max-atomic-width" == 64`.
> -diff --git a/vendor/crossbeam-utils/no_atomic.rs
> b/vendor/crossbeam-utils/no_atomic.rs
> -index 522b3b8..8096630 100644
> --- a/vendor/crossbeam-utils/no_atomic.rs
> +++ b/vendor/crossbeam-utils/no_atomic.rs
> -@@ -2,58 +2,40 @@
> +@@ -2,58 +2,41 @@
> // It is not intended for manual editing.
>
> const NO_ATOMIC_CAS: &[&str] = &[
> @@ -125,6 +119,7 @@ index 522b3b8..8096630 100644
> + "mipsisa32r6",
> + "mipsisa32r6el",
> + "powerpc",
> ++ "riscv32",
> + "riscv32gc",
> + "riscv32imac",
> + "thumbv7em",
> --
> 2.33.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#157323):
> https://lists.openembedded.org/g/openembedded-core/message/157323
> Mute This Topic: https://lists.openembedded.org/mt/86550391/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
[-- Attachment #2: Type: text/html, Size: 12956 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-24 7:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-24 6:59 [PATCH v2] librsvg: Disable 64bit atomics in crossbeam for rv32 Khem Raj
2021-10-24 7:06 ` [OE-core] " Alexander Kanavin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.