mozilla-arm-disable-edsp.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Tue, 09 Oct 2012 13:43:09 +0200
changeset 556 a30fcfcd2e53
parent 457 0c2249d015b6
child 680 be770d3cbc02
permissions -rw-r--r--
manual merge from firefox16 changes

# 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