diff options
author | Mikael Urankar <mikael@FreeBSD.org> | 2020-11-24 12:48:53 +0000 |
---|---|---|
committer | Mikael Urankar <mikael@FreeBSD.org> | 2020-11-24 12:48:53 +0000 |
commit | 4e449e031e7d6145599f30b8f3ecb850eae7c550 (patch) | |
tree | c4dd2d942c9a8dd0a293afb06a81d625bddd8b18 /textproc/ripgrep | |
parent | 4cc3f0f036dbb76b2b8057c528b3c6a41454ccfc (diff) | |
download | ports-4e449e031e7d6145599f30b8f3ecb850eae7c550.tar.gz ports-4e449e031e7d6145599f30b8f3ecb850eae7c550.zip |
lang/rust: Update to 1.48.0
Changes: https://github.com/rust-lang/rust/releases/tag/1.48.0
Reviewed by: jbeich
Tested by: bdragon, jbeich, mikael
Differential Revision: https://reviews.freebsd.org/D27293
Notes
Notes:
svn path=/head/; revision=556157
Diffstat (limited to 'textproc/ripgrep')
-rw-r--r-- | textproc/ripgrep/Makefile | 2 | ||||
-rw-r--r-- | textproc/ripgrep/files/patch-packed_simd | 114 |
2 files changed, 115 insertions, 1 deletions
diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 81a202d96923..2fdecd6e7229 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -3,7 +3,7 @@ PORTNAME= ripgrep DISTVERSION= 12.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi diff --git a/textproc/ripgrep/files/patch-packed_simd b/textproc/ripgrep/files/patch-packed_simd new file mode 100644 index 000000000000..4465e58d0c61 --- /dev/null +++ b/textproc/ripgrep/files/patch-packed_simd @@ -0,0 +1,114 @@ +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/codegen/reductions/mask/x86/sse.rs +@@ -34,35 +34,3 @@ macro_rules! x86_m32x4_sse_impl { + } + }; + } +- +-macro_rules! x86_m8x8_sse_impl { +- ($id:ident) => { +- impl All for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn all(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- // _mm_movemask_pi8(a) creates an 8bit mask containing the most +- // significant bit of each byte of `a`. If all bits are set, +- // then all 8 lanes of the mask are true. +- _mm_movemask_pi8(crate::mem::transmute(self)) +- == u8::max_value() as i32 +- } +- } +- impl Any for $id { +- #[inline] +- #[target_feature(enable = "sse")] +- unsafe fn any(self) -> bool { +- #[cfg(target_arch = "x86")] +- use crate::arch::x86::_mm_movemask_pi8; +- #[cfg(target_arch = "x86_64")] +- use crate::arch::x86_64::_mm_movemask_pi8; +- +- _mm_movemask_pi8(crate::mem::transmute(self)) != 0 +- } +- } +- }; +-} +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 +@@ -19,13 +19,7 @@ mod avx2; + /// x86 64-bit m8x8 implementation + macro_rules! x86_m8x8_impl { + ($id:ident) => { +- cfg_if! { +- if #[cfg(all(target_arch = "x86_64", target_feature = "sse"))] { +- x86_m8x8_sse_impl!($id); +- } else { +- fallback_impl!($id); +- } +- } ++ fallback_impl!($id); + }; + } + +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/lib.rs +@@ -210,7 +210,6 @@ + core_intrinsics, + stmt_expr_attributes, + align_offset, +- mmx_target_feature, + 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], |