~mozillateam/firefox/firefox-beta.xenial

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
Description: Disable SSE/SSE2 code paths when building on i386,
 because it's not available at build time. This is Debian/Ubuntu specific.
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Forwarded: not-needed

diff -r a3447f709bef dom/base/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -525,7 +525,7 @@
 
 # Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
 # nsTextFragment.cpp
-if CONFIG["INTEL_ARCHITECTURE"]:
+if CONFIG["CPU_ARCH"] == "x86_64":
     SOURCES += ["nsTextFragmentSSE2.cpp"]
     SOURCES["nsTextFragmentSSE2.cpp"].flags += CONFIG["SSE2_FLAGS"]
 
diff -r a3447f709bef dom/base/nsTextFragment.cpp
--- a/dom/base/nsTextFragment.cpp
+++ b/dom/base/nsTextFragment.cpp
@@ -22,6 +22,10 @@
 #include "nsTextFragmentImpl.h"
 #include <algorithm>
 
+#if defined(__i386__)
+#undef MOZILLA_MAY_SUPPORT_SSE2
+#endif
+
 #define TEXTFRAG_WHITE_AFTER_NEWLINE 50
 #define TEXTFRAG_MAX_NEWLINES 7