pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/devel/cargo-c
Module Name: pkgsrc
Committed By: he
Date: Sat Feb 15 16:10:05 UTC 2025
Modified Files:
pkgsrc/devel/cargo-c: distinfo
Added Files:
pkgsrc/devel/cargo-c/patches:
patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs
patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs
patch-.._vendor_memchr-2.7.2_src_memchr.rs
patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs
patch-.._vendor_memchr-2.7.2_src_vector.rs
patch-.._vendor_zerocopy-0.7.33_src_lib.rs
Log Message:
devel/cargo-c: add patches so this builds on big-endian aarch64.
This copies patches from main rust; neon cannot at present be
used in big-endian mode with rust.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/cargo-c/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs \
pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs \
pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memchr.rs \
pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs \
pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_vector.rs \
pkgsrc/devel/cargo-c/patches/patch-.._vendor_zerocopy-0.7.33_src_lib.rs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/cargo-c/distinfo
diff -u pkgsrc/devel/cargo-c/distinfo:1.18 pkgsrc/devel/cargo-c/distinfo:1.19
--- pkgsrc/devel/cargo-c/distinfo:1.18 Sun May 5 16:08:21 2024
+++ pkgsrc/devel/cargo-c/distinfo Sat Feb 15 16:10:05 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2024/05/05 16:08:21 pin Exp $
+$NetBSD: distinfo,v 1.19 2025/02/15 16:10:05 he Exp $
BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
@@ -994,3 +994,9 @@ BLAKE2s (zeroize-1.7.0.crate) = baa7e9c6
SHA512 (zeroize-1.7.0.crate) = 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
Size (zeroize-1.7.0.crate) = 19039 bytes
SHA1 (patch-.._vendor_faster-hex-0.9.0_src_lib.rs) = bf14d6be65a9567c671728efc986e365e6f8b278
+SHA1 (patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs) = 1f61d666c4da0157235c9cc1802e093b6c84d664
+SHA1 (patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs) = d44a710657dc35fd1575aa8c02baf86594051fcc
+SHA1 (patch-.._vendor_memchr-2.7.2_src_memchr.rs) = ccbc0f4c88fa2a6ebd97c4884d3862e748598d16
+SHA1 (patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs) = bc5a6d3d251b149b6de062aa60310687ffa6b41e
+SHA1 (patch-.._vendor_memchr-2.7.2_src_vector.rs) = 39b0f9f75f08e5802140efeb6c89709895e99c65
+SHA1 (patch-.._vendor_zerocopy-0.7.33_src_lib.rs) = 92e3c403c698eb28d1bb2eb1a4838ca99416c470
Added files:
Index: pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs
diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs:1.1
--- /dev/null Sat Feb 15 16:10:05 2025
+++ pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs Sat Feb 15 16:10:05 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-.._vendor_memchr-2.7.2_src_arch_aarch64_memchr.rs,v 1.1 2025/02/15 16:10:05 he Exp $
+
+Do not try to use neon on big-endian aarch64.
+
+--- ../vendor/memchr-2.7.2/src/arch/aarch64/memchr.rs.orig 2025-02-15 09:11:32.497322345 +0000
++++ ../vendor/memchr-2.7.2/src/arch/aarch64/memchr.rs
+@@ -8,7 +8,7 @@ available for `aarch64` targets.)
+
+ macro_rules! defraw {
+ ($ty:ident, $find:ident, $start:ident, $end:ident, $($needles:ident),+) => {{
+- #[cfg(target_feature = "neon")]
++ #[cfg(all(target_feature = "neon", target_endian = "little"))]
+ {
+ use crate::arch::aarch64::neon::memchr::$ty;
+
+@@ -19,7 +19,7 @@ macro_rules! defraw {
+ // enabled.
+ $ty::new_unchecked($($needles),+).$find($start, $end)
+ }
+- #[cfg(not(target_feature = "neon"))]
++ #[cfg(not(all(target_feature = "neon", target_endian = "little")))]
+ {
+ use crate::arch::all::memchr::$ty;
+
Index: pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs
diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs:1.1
--- /dev/null Sat Feb 15 16:10:05 2025
+++ pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs Sat Feb 15 16:10:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._vendor_memchr-2.7.2_src_arch_aarch64_mod.rs,v 1.1 2025/02/15 16:10:05 he Exp $
+
+Don't try to do neon / SIMD on big-endian aarch64.
+
+--- ../vendor/memchr-2.7.2/src/arch/aarch64/mod.rs.orig 2025-02-15 09:14:20.982023231 +0000
++++ ../vendor/memchr-2.7.2/src/arch/aarch64/mod.rs
+@@ -2,6 +2,8 @@
+ Vector algorithms for the `aarch64` target.
+ */
+
++#[cfg(target_endian = "little")]
+ pub mod neon;
+
++#[cfg(target_endian = "little")]
+ pub(crate) mod memchr;
Index: pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memchr.rs
diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memchr.rs:1.1
--- /dev/null Sat Feb 15 16:10:05 2025
+++ pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memchr.rs Sat Feb 15 16:10:05 2025
@@ -0,0 +1,128 @@
+$NetBSD: patch-.._vendor_memchr-2.7.2_src_memchr.rs,v 1.1 2025/02/15 16:10:05 he Exp $
+
+Don't try to do neon / SIMD on big-endian aarch64.
+
+--- ../vendor/memchr-2.7.2/src/memchr.rs.orig 2025-02-15 09:15:43.541439670 +0000
++++ ../vendor/memchr-2.7.2/src/memchr.rs
+@@ -518,14 +518,14 @@ unsafe fn memchr_raw(
+ {
+ crate::arch::wasm32::memchr::memchr_raw(needle, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memchr_raw(needle, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::One::new(needle).find_raw(start, end)
+@@ -551,14 +551,14 @@ unsafe fn memrchr_raw(
+ {
+ crate::arch::wasm32::memchr::memrchr_raw(needle, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memrchr_raw(needle, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::One::new(needle).rfind_raw(start, end)
+@@ -585,14 +585,14 @@ unsafe fn memchr2_raw(
+ {
+ crate::arch::wasm32::memchr::memchr2_raw(needle1, needle2, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memchr2_raw(needle1, needle2, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Two::new(needle1, needle2)
+@@ -620,7 +620,7 @@ unsafe fn memrchr2_raw(
+ {
+ crate::arch::wasm32::memchr::memrchr2_raw(needle1, needle2, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memrchr2_raw(
+ needle1, needle2, start, end,
+@@ -629,7 +629,7 @@ unsafe fn memrchr2_raw(
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Two::new(needle1, needle2)
+@@ -662,7 +662,7 @@ unsafe fn memchr3_raw(
+ needle1, needle2, needle3, start, end,
+ )
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memchr3_raw(
+ needle1, needle2, needle3, start, end,
+@@ -671,7 +671,7 @@ unsafe fn memchr3_raw(
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Three::new(needle1, needle2, needle3)
+@@ -704,7 +704,7 @@ unsafe fn memrchr3_raw(
+ needle1, needle2, needle3, start, end,
+ )
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::memrchr3_raw(
+ needle1, needle2, needle3, start, end,
+@@ -713,7 +713,7 @@ unsafe fn memrchr3_raw(
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::Three::new(needle1, needle2, needle3)
+@@ -736,14 +736,14 @@ unsafe fn count_raw(needle: u8, start: *
+ {
+ crate::arch::wasm32::memchr::count_raw(needle, start, end)
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ crate::arch::aarch64::memchr::count_raw(needle, start, end)
+ }
+ #[cfg(not(any(
+ target_arch = "x86_64",
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ crate::arch::all::memchr::One::new(needle).count_raw(start, end)
Index: pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs
diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs:1.1
--- /dev/null Sat Feb 15 16:10:05 2025
+++ pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs Sat Feb 15 16:10:05 2025
@@ -0,0 +1,78 @@
+$NetBSD: patch-.._vendor_memchr-2.7.2_src_memmem_searcher.rs,v 1.1 2025/02/15 16:10:05 he Exp $
+
+Don't try to use neon / SIMD on big-endian aarch64.
+
+--- ../vendor/memchr-2.7.2/src/memmem/searcher.rs.orig 2025-02-15 09:20:25.984377323 +0000
++++ ../vendor/memchr-2.7.2/src/memmem/searcher.rs
+@@ -3,7 +3,7 @@ use crate::arch::all::{
+ rabinkarp, twoway,
+ };
+
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ use crate::arch::aarch64::neon::packedpair as neon;
+ #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
+ use crate::arch::wasm32::simd128::packedpair as simd128;
+@@ -129,7 +129,7 @@ impl Searcher {
+ Searcher::twoway(needle, rabinkarp, prestrat)
+ }
+ }
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ {
+ if let Some(pp) = neon::Finder::with_pair(needle, pair) {
+ if do_packed_search(needle) {
+@@ -152,7 +152,7 @@ impl Searcher {
+ #[cfg(not(any(
+ all(target_arch = "x86_64", target_feature = "sse2"),
+ all(target_arch = "wasm32", target_feature = "simd128"),
+- target_arch = "aarch64"
++ all(target_arch = "aarch64", target_endian = "little")
+ )))]
+ {
+ if prefilter.is_none() {
+@@ -253,7 +253,7 @@ union SearcherKind {
+ avx2: crate::arch::x86_64::avx2::packedpair::Finder,
+ #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
+ simd128: crate::arch::wasm32::simd128::packedpair::Finder,
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ neon: crate::arch::aarch64::neon::packedpair::Finder,
+ }
+
+@@ -421,7 +421,7 @@ unsafe fn searcher_kind_simd128(
+ /// # Safety
+ ///
+ /// Callers must ensure that the `searcher.kind.neon` union field is set.
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ unsafe fn searcher_kind_neon(
+ searcher: &Searcher,
+ _prestate: &mut PrefilterState,
+@@ -686,7 +686,7 @@ impl Prefilter {
+ }
+
+ /// Return a prefilter using a aarch64 neon vector algorithm.
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ #[inline]
+ fn neon(finder: neon::Finder, needle: &[u8]) -> Prefilter {
+ trace!("building aarch64 neon prefilter");
+@@ -763,7 +763,7 @@ union PrefilterKind {
+ avx2: crate::arch::x86_64::avx2::packedpair::Finder,
+ #[cfg(all(target_arch = "wasm32", target_feature = "simd128"))]
+ simd128: crate::arch::wasm32::simd128::packedpair::Finder,
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ neon: crate::arch::aarch64::neon::packedpair::Finder,
+ }
+
+@@ -852,7 +852,7 @@ unsafe fn prefilter_kind_simd128(
+ /// # Safety
+ ///
+ /// Callers must ensure that the `strat.kind.neon` union field is set.
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ unsafe fn prefilter_kind_neon(
+ strat: &Prefilter,
+ haystack: &[u8],
Index: pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_vector.rs
diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_vector.rs:1.1
--- /dev/null Sat Feb 15 16:10:05 2025
+++ pkgsrc/devel/cargo-c/patches/patch-.._vendor_memchr-2.7.2_src_vector.rs Sat Feb 15 16:10:05 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._vendor_memchr-2.7.2_src_vector.rs,v 1.1 2025/02/15 16:10:05 he Exp $
+
+Do not try to use neon on big-endian aarch64.
+
+--- ../vendor/memchr-2.7.2/src/vector.rs.orig 2025-02-15 09:24:32.108467529 +0000
++++ ../vendor/memchr-2.7.2/src/vector.rs
+@@ -293,7 +293,7 @@ mod x86avx2 {
+ }
+ }
+
+-#[cfg(target_arch = "aarch64")]
++#[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ mod aarch64neon {
+ use core::arch::aarch64::*;
+
Index: pkgsrc/devel/cargo-c/patches/patch-.._vendor_zerocopy-0.7.33_src_lib.rs
diff -u /dev/null pkgsrc/devel/cargo-c/patches/patch-.._vendor_zerocopy-0.7.33_src_lib.rs:1.1
--- /dev/null Sat Feb 15 16:10:05 2025
+++ pkgsrc/devel/cargo-c/patches/patch-.._vendor_zerocopy-0.7.33_src_lib.rs Sat Feb 15 16:10:05 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-.._vendor_zerocopy-0.7.33_src_lib.rs,v 1.1 2025/02/15 16:10:05 he Exp $
+
+Do not try to use neon on big-endian aarch64.
+
+--- ../vendor/zerocopy-0.7.33/src/lib.rs.orig 2025-02-15 10:03:46.503394929 +0000
++++ ../vendor/zerocopy-0.7.33/src/lib.rs
+@@ -3725,7 +3725,7 @@ mod simd {
+ powerpc64, powerpc64, vector_bool_long, vector_double, vector_signed_long, vector_unsigned_long
+ );
+ simd_arch_mod!(
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ aarch64, aarch64, float32x2_t, float32x4_t, float64x1_t, float64x2_t, int8x8_t, int8x8x2_t,
+ int8x8x3_t, int8x8x4_t, int8x16_t, int8x16x2_t, int8x16x3_t, int8x16x4_t, int16x4_t,
+ int16x8_t, int32x2_t, int32x4_t, int64x1_t, int64x2_t, poly8x8_t, poly8x8x2_t, poly8x8x3_t,
+@@ -8018,7 +8018,7 @@ mod tests {
+ vector_signed_long,
+ vector_unsigned_long
+ );
+- #[cfg(target_arch = "aarch64")]
++ #[cfg(all(target_arch = "aarch64", target_endian = "little"))]
+ #[rustfmt::skip]
+ test_simd_arch_mod!(
+ aarch64, float32x2_t, float32x4_t, float64x1_t, float64x2_t, int8x8_t, int8x8x2_t,
Home |
Main Index |
Thread Index |
Old Index