mozilla-arm-disable-edsp.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sat, 11 Oct 2014 10:08:50 +0200
branchfirefox32
changeset 772 a56f903306d9
parent 680 be770d3cbc02
child 869 0dd25a92df97
permissions -rw-r--r--
minor update
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
457
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     1
# HG changeset patch
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     2
# User Adrian Schröter <adrian@suse.de>
680
be770d3cbc02 Firefox 25 beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 457
diff changeset
     3
# Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759
457
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     4
disable ESDP support (no BNC or BMO reference yet :-()
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
     5
680
be770d3cbc02 Firefox 25 beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 457
diff changeset
     6
diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h
be770d3cbc02 Firefox 25 beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 457
diff changeset
     7
--- a/mozglue/build/arm.h
be770d3cbc02 Firefox 25 beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 457
diff changeset
     8
+++ b/mozglue/build/arm.h
be770d3cbc02 Firefox 25 beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 457
diff changeset
     9
@@ -116,17 +116,17 @@ namespace mozilla {
be770d3cbc02 Firefox 25 beta
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 457
diff changeset
    10
     extern bool MFBT_DATA neon_enabled;
457
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    11
 #endif
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    12
 #endif
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    13
   }
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    14
 
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    15
 #if defined(MOZILLA_PRESUME_EDSP)
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    16
 #  define MOZILLA_MAY_SUPPORT_EDSP 1
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    17
   inline bool supports_edsp() { return true; }
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    18
-#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    19
+#elif 0 \
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    20
    && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    21
   inline bool supports_edsp() { return arm_private::edsp_enabled; }
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    22
 #else
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    23
   inline bool supports_edsp() { return false; }
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    24
 #endif
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    25
 
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    26
 #if defined(MOZILLA_PRESUME_ARMV6)
0c2249d015b6 fixed ARM build
Adrian Schr?ter <adrian@suse.de>
parents:
diff changeset
    27
 #  define MOZILLA_MAY_SUPPORT_ARMV6 1