reapply raspbian patches.

diff --git a/build/moz.configure/arm.configure b/build/moz.configure/arm.configure
index a9204d40cde9ac656c3ee1344cd99ab924e710d3..82313257d4bdf33462ccc3f41cc967ce8772e258 100644 (file)
--- 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 >= 7
+    return arm_arch >= 700
 
 
-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 10c8947bc071ee8bd6a7eca1ab83b23191dc0eb4..10864af5ed3ca81ee73a227a465f4b013e598407 100644 (file)
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -249,9 +249,14 @@ def rust_compiler(rustc_info, cargo_info, target):
 
 
 @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 b08fc9490b1f7c9570972ebd7dac676f93be85a4..3f5ad40145c3912404a31add465f3c073b802467 100644 (file)
--- 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 7dde58e7d983a7ac9f5f0da8f57bffad53725a51..0e7f9a98cf3df40acfad844ce020ead6e58dbb10 100644 (file)
--- a/gfx/qcms/src/lib.rs
+++ b/gfx/qcms/src/lib.rs
@@ -64,8 +64,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 4b6dffd38d00b98743b664153a731a58948b2648..e744a0c5c49121080e953a2c5b6cc6a46a500239 100644 (file)
--- a/gfx/qcms/src/transform.rs
+++ b/gfx/qcms/src/transform.rs
@@ -21,11 +21,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #![allow(clippy::missing_safety_doc)]
-#[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,
@@ -1369,7 +1369,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");
@@ -1383,7 +1383,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 fafd7d6fc1e0d810eb086e21c4663cc81cf55fb3..b5b15f5d75b90d68b655bd6e389f55d342685b0a 100644 (file)
--- 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
-typedef __double_t  double_t;
+#define double_t __double_t
 
 /*
  * The original fdlibm code used statements like: