mozilla-aarch64-bmo-963029.patch
author Dirk Müller <dmueller@suse.com>
Sun, 13 Apr 2014 16:54:09 +0200
changeset 715 e1c226a4de34
permissions -rw-r--r--
AArch64 porting
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
715
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     1
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     2
# HG changeset patch
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     3
# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     4
# Date 1390512871 18000
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     5
# Node ID 89e06a821ad5986035de99c8bc1f9d7a99541b2a
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     6
# Parent  feaf8bd56a82749f5d0d8869b7c0a1c01e300362
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     7
Bug 963029 - AArch64 support for MFBT. r=froydnj
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     8
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
     9
Index: mozilla/mfbt/Endian.h
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    10
===================================================================
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    11
--- mozilla.orig/mfbt/Endian.h
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    12
+++ mozilla/mfbt/Endian.h
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    13
@@ -121,14 +121,14 @@
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    14
 #elif defined(__sparc) || defined(__sparc__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    15
       defined(_POWER) || defined(__hppa) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    16
       defined(_MIPSEB) || defined(__ARMEB__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    17
-      defined(__s390__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    18
+      defined(__s390__) || defined(__AARCH64EB__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    19
       (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    20
       (defined(__ia64) && defined(__BIG_ENDIAN__))
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    21
 #  define MOZ_BIG_ENDIAN 1
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    22
 #elif defined(__i386) || defined(__i386__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    23
       defined(__x86_64) || defined(__x86_64__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    24
       defined(_MIPSEL) || defined(__ARMEL__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    25
-      defined(__alpha__) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    26
+      defined(__alpha__) || defined(__AARCH64EL__) ||  \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    27
       (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    28
       (defined(__ia64) && !defined(__BIG_ENDIAN__))
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    29
 #  define MOZ_LITTLE_ENDIAN 1
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    30
Index: mozilla/mfbt/tests/TestPoisonArea.cpp
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    31
===================================================================
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    32
--- mozilla.orig/mfbt/tests/TestPoisonArea.cpp
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    33
+++ mozilla/mfbt/tests/TestPoisonArea.cpp
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    34
@@ -161,6 +161,9 @@
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    35
 #elif defined __s390__
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    36
 #define RETURN_INSTR 0x07fe0000 /* br %r14 */
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    37
 
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    38
+#elif defined __aarch64__
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    39
+#define RETURN_INSTR 0xd65f03c0 /* ret */
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    40
+
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    41
 #elif defined __ia64
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    42
 struct ia64_instr { uint32_t i[4]; };
e1c226a4de34 AArch64 porting
Dirk Müller <dmueller@suse.com>
parents:
diff changeset
    43
 static const ia64_instr _return_instr =