diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:41:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:41:35 +0000 |
| commit | 2d861407bd7e9cc56fba8f2f763fe62dddb4da81 (patch) | |
| tree | 32d9a69e31440af23173f321c975471ca10608c0 /gfx | |
| parent | Releasing progress-linux version 115.11.0esr-1~progress7.99u1. (diff) | |
| download | firefox-esr-2d861407bd7e9cc56fba8f2f763fe62dddb4da81.tar.xz firefox-esr-2d861407bd7e9cc56fba8f2f763fe62dddb4da81.zip | |
Merging upstream version 115.12.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/qcms/Cargo.toml | 3 | ||||
| -rw-r--r-- | gfx/qcms/build.rs | 7 | ||||
| -rw-r--r-- | gfx/qcms/src/lib.rs | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml index e976054a7b..f50d6623a1 100644 --- a/gfx/qcms/Cargo.toml +++ b/gfx/qcms/Cargo.toml @@ -20,3 +20,6 @@ cmyk = [] [dependencies] libc = {version = "0.2", optional = true } + +[build-dependencies] +version_check = "0.9" diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs new file mode 100644 index 0000000000..6810a8828e --- /dev/null +++ b/gfx/qcms/build.rs @@ -0,0 +1,7 @@ +extern crate version_check as rustc; + +fn main() { + if rustc::is_min_version("1.78.0").unwrap_or(false) { + println!("cargo:rustc-cfg=stdsimd_split"); + } +} diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs index c311964ee3..fc496816a8 100644 --- a/gfx/qcms/src/lib.rs +++ b/gfx/qcms/src/lib.rs @@ -7,9 +7,11 @@ #![allow(non_upper_case_globals)] // These are needed for the neon SIMD code and can be removed once the MSRV supports the // instrinsics we use -#![cfg_attr(feature = "neon", feature(stdsimd))] +#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] +#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] +#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] #![cfg_attr( - feature = "neon", + all(target_arch = "arm", feature = "neon"), feature(arm_target_feature, raw_ref_op) )] |