mozilla-arm-disable-edsp.patch
author Adrian Schr?ter <adrian@suse.de>
Fri, 25 May 2012 09:12:54 +0200
branchfirefox12
changeset 450 586eaa2c4dce
child 680 be770d3cbc02
permissions -rw-r--r--
fixed ARM build
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
450
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     1
# HG changeset patch
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     2
# User Adrian Schr├Âter <adrian@suse.de>
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     3
# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     4
disable ESDP support (no BNC or BMO reference yet :-()
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     5
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     6
diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     7
--- a/xpcom/glue/arm.h
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     8
+++ b/xpcom/glue/arm.h
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     9
@@ -143,17 +143,17 @@ namespace mozilla {
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    10
     extern bool NS_COM_GLUE neon_enabled;
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    11
 #endif
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    12
 #endif
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    13
   }
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    14
 
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    15
 #if defined(MOZILLA_PRESUME_EDSP)
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    16
 #  define MOZILLA_MAY_SUPPORT_EDSP 1
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    17
   inline bool supports_edsp() { return true; }
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    18
-#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    19
+#elif 0 \
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    20
    && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    21
   inline bool supports_edsp() { return arm_private::edsp_enabled; }
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    22
 #else
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    23
   inline bool supports_edsp() { return false; }
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    24
 #endif
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    25
 
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    26
 #if defined(MOZILLA_PRESUME_ARMV6)
586eaa2c4dce fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    27
 #  define MOZILLA_MAY_SUPPORT_ARMV6 1