From: Peter Michael Green Date: Fri, 16 Sep 2022 17:42:22 +0000 (+0000) Subject: deapply raspbian patches. X-Git-Tag: archive/raspbian/102.2.0esr-1+rpi1~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bc1dfabfe7dce14147bfbfb5132166b8a0272c25;p=firefox-esr.git deapply raspbian patches. --- diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure index abce09fde69..3b755e27db9 100644 --- a/build/moz.configure/arm.configure +++ b/build/moz.configure/arm.configure @@ -261,11 +261,11 @@ set_define("HAVE_ARM_NEON", have_arm_neon) # This matches media/webrtc/trunk/webrtc/build/common.gypi. @depends(arm_target.arm_arch, when=have_arm_neon) def build_arm_neon(arm_arch): - return arm_arch >= 700 + return arm_arch >= 7 -#set_config("BUILD_ARM_NEON", build_arm_neon) -#set_define("BUILD_ARM_NEON", build_arm_neon) +set_config("BUILD_ARM_NEON", build_arm_neon) +set_define("BUILD_ARM_NEON", build_arm_neon) set_config("ARM_ARCH", depends(arm_target.arm_arch)(lambda x: str(x))) diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure index 056de343ddb..eb7bbf760de 100644 --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure @@ -236,14 +236,9 @@ def rust_compiler(rustc_info, cargo_info): @depends(rustc, when=rust_compiler) -@imports("sys") -@imports(_from="__builtin__", _import='repr') @imports(_from="__builtin__", _import="ValueError") def rust_supported_targets(rustc): - #HACK: if there are multiple matches the algorithm uses the last one - #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered out = check_cmd_output(rustc, "--print", "target-list").splitlines() - out.append("arm-unknown-linux-gnueabihf") data = {} for t in out: try: diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h index 3f5ad40145c..b08fc9490b1 100644 --- a/gfx/qcms/qcmsint.h +++ b/gfx/qcms/qcmsint.h @@ -96,18 +96,18 @@ void qcms_transform_data_bgra_out_lut_altivec(const qcms_transform *transform, unsigned char *dest, size_t length); -//void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform, -// const unsigned char *src, -// unsigned char *dest, -// size_t length); -//void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform, -// const unsigned char *src, -// unsigned char *dest, -// size_t length); -//void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform, -// const unsigned char *src, -// unsigned char *dest, -// size_t length); +void qcms_transform_data_rgb_out_lut_neon(const qcms_transform *transform, + const unsigned char *src, + unsigned char *dest, + size_t length); +void qcms_transform_data_rgba_out_lut_neon(const qcms_transform *transform, + const unsigned char *src, + unsigned char *dest, + size_t length); +void qcms_transform_data_bgra_out_lut_neon(const qcms_transform *transform, + const unsigned char *src, + unsigned char *dest, + size_t length); extern bool qcms_supports_iccv4; extern bool qcms_supports_neon; diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs index d432ab5e5a2..7987ae2f317 100644 --- a/gfx/qcms/src/lib.rs +++ b/gfx/qcms/src/lib.rs @@ -62,8 +62,8 @@ pub use transform::DataType; pub use transform::Transform; #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] mod transform_avx; -//#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))] -//mod transform_neon; +#[cfg(all(any(target_arch = "aarch64", target_arch = "arm"), feature = "neon"))] +mod transform_neon; #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] mod transform_sse2; mod transform_util; diff --git a/gfx/qcms/src/transform.rs b/gfx/qcms/src/transform.rs index 6f1938ead6f..b688f6c77f1 100644 --- a/gfx/qcms/src/transform.rs +++ b/gfx/qcms/src/transform.rs @@ -21,11 +21,11 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/*#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] +#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] use crate::transform_neon::{ qcms_transform_data_bgra_out_lut_neon, qcms_transform_data_rgb_out_lut_neon, qcms_transform_data_rgba_out_lut_neon, -};*/ +}; use crate::{ chain::chain_transform, double_to_s15Fixed16Number, @@ -1368,7 +1368,7 @@ pub fn transform_create( } } - /*#[cfg(all(target_arch = "arm", feature = "neon"))] + #[cfg(all(target_arch = "arm", feature = "neon"))] let neon_supported = is_arm_feature_detected!("neon"); #[cfg(all(target_arch = "aarch64", feature = "neon"))] let neon_supported = is_aarch64_feature_detected!("neon"); @@ -1382,7 +1382,7 @@ pub fn transform_create( } else if in_type == BGRA8 { transform.transform_fn = Some(qcms_transform_data_bgra_out_lut_neon) } - }*/ + } if transform.transform_fn.is_none() { if in_type == RGB8 { diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h index b5b15f5d75b..fafd7d6fc1e 100644 --- a/modules/fdlibm/src/math_private.h +++ b/modules/fdlibm/src/math_private.h @@ -35,7 +35,7 @@ typedef long double __double_t; #else typedef double __double_t; #endif -#define double_t __double_t +typedef __double_t double_t; /* * The original fdlibm code used statements like: