FreeBSD Bugzilla – Attachment 220040 Details for
Bug 251425
textproc/ripgrep: Fails to build after lang/rust is updated to 1.48.0
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v1
ripgrep.patch (text/plain), 5.21 KB, created by
Mikael Urankar
on 2020-11-28 09:33:51 UTC
(
hide
)
Description:
v1
Filename:
MIME Type:
Creator:
Mikael Urankar
Created:
2020-11-28 09:33:51 UTC
Size:
5.21 KB
patch
obsolete
>Index: textproc/ripgrep/files/patch-packed_simd >=================================================================== >--- textproc/ripgrep/files/patch-packed_simd (revision 556480) >+++ textproc/ripgrep/files/patch-packed_simd (working copy) >@@ -1,15 +1,14 @@ >-From 950903a66950eaff745b0a029f2051d305df1c22 Mon Sep 17 00:00:00 2001 >-From: Justus K <justus.k@protonmail.com> >-Date: Tue, 22 Sep 2020 15:36:03 +0200 >-Subject: [PATCH] Remove `x86_m8x8_sse_impl` macro >- >---- >- src/codegen/reductions/mask/x86/sse.rs | 32 -------------------------- >- 1 file changed, 32 deletions(-) >- >-diff --git a/src/codegen/reductions/mask/x86/sse.rs b/src/codegen/reductions/mask/x86/sse.rs >-index 7482f943..eb1ef7fa 100644 >---- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs >+--- cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs.orig 2019-02-05 20:18:53 UTC >++++ cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs >+@@ -84,7 +84,6 @@ macro_rules! impl_arch { >+ // FIXME: 64-bit single element types >+ // FIXME: arm/aarch float16x4_t missing >+ impl_arch!( >+- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], >+ [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, >+ poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, >+ uint64x1_t], >+--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs.orig 2019-01-31 15:25:21 UTC > +++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86/sse.rs > @@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { > } >@@ -47,21 +46,7 @@ > - } > - }; > -} >-From 778c0706f356118c7a5dd11c06725fc6c6b84621 Mon Sep 17 00:00:00 2001 >-From: Justus K <justus.k@protonmail.com> >-Date: Tue, 22 Sep 2020 15:27:53 +0200 >-Subject: [PATCH] Replace `_mm_movemask_pi8` with the fallback_impl >- >-This has to be done, because `_mm_movemask_pi8` got removed >-from stdarch in https://github.com/rust-lang/stdarch/pull/890 >---- >- src/codegen/reductions/mask/x86.rs | 8 +------- >- src/lib.rs | 1 - >- 2 files changed, 1 insertion(+), 8 deletions(-) >- >-diff --git a/src/codegen/reductions/mask/x86.rs b/src/codegen/reductions/mask/x86.rs >-index 2ae4ed81..bcfb1a6e 100644 >---- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs >+--- cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs.orig 2019-01-31 15:25:21 UTC > +++ cargo-crates/packed_simd-0.3.3/src/codegen/reductions/mask/x86.rs > @@ -19,13 +19,7 @@ mod avx2; > /// x86 64-bit m8x8 implementation >@@ -78,9 +63,39 @@ > }; > } > >-diff --git a/src/lib.rs b/src/lib.rs >-index c3da0d3c..cbd438c0 100644 >---- cargo-crates/packed_simd-0.3.3/src/lib.rs >+--- cargo-crates/packed_simd-0.3.3/src/codegen/shuffle1_dyn.rs.orig 2019-02-05 20:18:53 UTC >++++ cargo-crates/packed_simd-0.3.3/src/codegen/shuffle1_dyn.rs >+@@ -28,28 +28,7 @@ macro_rules! impl_fallback { >+ macro_rules! impl_shuffle1_dyn { >+ (u8x8) => { >+ cfg_if! { >+- if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"), >+- target_feature = "ssse3"))] { >+- impl Shuffle1Dyn for u8x8 { >+- type Indices = Self; >+- #[inline] >+- fn shuffle1_dyn(self, indices: Self::Indices) -> Self { >+- #[cfg(target_arch = "x86")] >+- use crate::arch::x86::_mm_shuffle_pi8; >+- #[cfg(target_arch = "x86_64")] >+- use crate::arch::x86_64::_mm_shuffle_pi8; >+- >+- unsafe { >+- crate::mem::transmute( >+- _mm_shuffle_pi8( >+- crate::mem::transmute(self.0), >+- crate::mem::transmute(indices.0) >+- ) >+- ) >+- } >+- } >+- } >+- } else if #[cfg(all( >++ if #[cfg(all( >+ any( >+ all(target_aarch = "aarch64", target_feature = "neon"), >+ all(target_aarch = "arm", target_feature = "v7", >+--- cargo-crates/packed_simd-0.3.3/src/lib.rs.orig 2019-02-05 20:18:53 UTC > +++ cargo-crates/packed_simd-0.3.3/src/lib.rs > @@ -210,7 +210,6 @@ > core_intrinsics, >@@ -90,25 +105,3 @@ > crate_visibility_modifier, > custom_inner_attributes > )] >- >-From 57d96e45916066fa9b5cdf2bc695e190207e78af Mon Sep 17 00:00:00 2001 >-From: Jubilee Young <workingjubilee@gmail.com> >-Date: Wed, 23 Sep 2020 12:23:29 -0700 >-Subject: [PATCH] Remove __m64 type >- >---- >- src/api/into_bits/arch_specific.rs | 1 - >- 1 file changed, 1 deletion(-) >- >-diff --git a/src/api/into_bits/arch_specific.rs b/src/api/into_bits/arch_specific.rs >-index 6cc2fa37..7b560107 100644 >---- cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs >-+++ cargo-crates/packed_simd-0.3.3/src/api/into_bits/arch_specific.rs >-@@ -84,7 +84,6 @@ macro_rules! impl_arch { >- // FIXME: 64-bit single element types >- // FIXME: arm/aarch float16x4_t missing >- impl_arch!( >-- [x86["x86"]: __m64], [x86_64["x86_64"]: __m64], >- [arm["arm"]: int8x8_t, uint8x8_t, poly8x8_t, int16x4_t, uint16x4_t, >- poly16x4_t, int32x2_t, uint32x2_t, float32x2_t, int64x1_t, >- uint64x1_t],
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 251425
: 220040