upstream patch to fix build on i686

see: https://bugzilla.mozilla.org/show_bug.cgi?id=1821363

diff --git a/firefox.spec b/firefox.spec
index dba92f7dda4cb9a4729e02b883aad3764e13683f..00f654dc55605dafc7b9c617be528799a1b834c6 100644 (file)
--- a/firefox.spec
+++ b/firefox.spec
@@ -256,6 +256,7 @@ Source196:  https://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i6
 # Source196-md5:       23f05f0557b237d110a4c532aaa22e2a
 Source197:     https://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-TW.xpi
 # Source197-md5:       3b7f687bb6473a99e8cb997f2acb6bad
+Patch0:                xsimd.patch
 Patch4:                %{name}-prefs.patch
 Patch5:                %{name}-pld-bookmarks.patch
 Patch6:                %{name}-no-subshell.patch
@@ -2118,6 +2119,7 @@ unpack() {
 %define __unzip unpack
 %setup -q %(seq -f '-a %g' 100 197 | xargs)
 
+%patch0 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p2

diff --git a/xsimd.patch b/xsimd.patch
new file mode 100644 (file)
index 0000000..b4189c0
--- /dev/null
+++ b/xsimd.patch
@@ -0,0 +1,22 @@
+diff --git a/dom/media/webaudio/AudioNodeEngineGeneric.h b/dom/media/webaudio/AudioNodeEngineGeneric.h
+--- a/dom/media/webaudio/AudioNodeEngineGeneric.h
++++ b/dom/media/webaudio/AudioNodeEngineGeneric.h
+@@ -203,14 +203,14 @@
+     MOZ_ASSERT((aSize % xsimd::batch<float, Arch>::size == 0),
+                "requires tail processing");
+ 
+     MOZ_UNROLL(2)
+     for (unsigned i = 0; i < aSize * 2;
+-         i += 2 * xsimd::batch<std::complex<float>>::size) {
+-      auto in1 = xsimd::batch<std::complex<float>>::load_aligned(
++         i += 2 * xsimd::batch<std::complex<float>, Arch>::size) {
++      auto in1 = xsimd::batch<std::complex<float>, Arch>::load_aligned(
+           reinterpret_cast<const std::complex<float>*>(&aInput[i]));
+-      auto in2 = xsimd::batch<std::complex<float>>::load_aligned(
++      auto in2 = xsimd::batch<std::complex<float>, Arch>::load_aligned(
+           reinterpret_cast<const std::complex<float>*>(&aScale[i]));
+       auto out = in1 * in2;
+       out.store_aligned(reinterpret_cast<std::complex<float>*>(&aOutput[i]));
+     }
+   };
+