fixed ARM build firefox12
authorAdrian Schr?ter <adrian@suse.de>
Fri, 25 May 2012 09:12:54 +0200
branchfirefox12
changeset 450 586eaa2c4dce
parent 449 feee012b5199
fixed ARM build
MozillaFirefox/MozillaFirefox.changes
MozillaFirefox/MozillaFirefox.spec
MozillaFirefox/mozilla-arm-disable-edsp.patch
mozilla-arm-disable-edsp.patch
series
--- a/MozillaFirefox/MozillaFirefox.changes	Wed May 16 10:56:46 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Fri May 25 09:12:54 2012 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 23 14:40:16 UTC 2012 - adrian@suse.de
+
+- fix build on arm
+
 -------------------------------------------------------------------
 Wed May 16 05:34:01 UTC 2012 - wr@rosenauer.org
 
--- a/MozillaFirefox/MozillaFirefox.spec	Wed May 16 10:56:46 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Fri May 25 09:12:54 2012 +0200
@@ -94,6 +94,7 @@
 Patch16:        mozilla-revert_621446.patch
 Patch17:        mozilla-libnotify.patch
 Patch18:        mozilla-gcc47.patch
+Patch19:        mozilla-arm-disable-edsp.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -226,6 +227,7 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 #
 %patch31 -p1
 %patch32 -p1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-arm-disable-edsp.patch	Fri May 25 09:12:54 2012 +0200
@@ -0,0 +1,1 @@
+../mozilla-arm-disable-edsp.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-arm-disable-edsp.patch	Fri May 25 09:12:54 2012 +0200
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Adrian Schröter <adrian@suse.de>
+# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f
+disable ESDP support (no BNC or BMO reference yet :-()
+
+diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h
+--- a/xpcom/glue/arm.h
++++ b/xpcom/glue/arm.h
+@@ -143,17 +143,17 @@ namespace mozilla {
+     extern bool NS_COM_GLUE neon_enabled;
+ #endif
+ #endif
+   }
+ 
+ #if defined(MOZILLA_PRESUME_EDSP)
+ #  define MOZILLA_MAY_SUPPORT_EDSP 1
+   inline bool supports_edsp() { return true; }
+-#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \
++#elif 0 \
+    && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
+   inline bool supports_edsp() { return arm_private::edsp_enabled; }
+ #else
+   inline bool supports_edsp() { return false; }
+ #endif
+ 
+ #if defined(MOZILLA_PRESUME_ARMV6)
+ #  define MOZILLA_MAY_SUPPORT_ARMV6 1
--- a/series	Wed May 16 10:56:46 2012 +0200
+++ b/series	Fri May 25 09:12:54 2012 +0200
@@ -21,6 +21,7 @@
 mozilla-revert_621446.patch
 mozilla-libnotify.patch
 mozilla-gcc47.patch
+mozilla-arm-disable-edsp.patch
 #mozilla-yarr-pcre.patch
 
 # Firefox patches