1 

     2 # HG changeset patch

     3 # User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>

     4 # Date 1390512871 18000

     5 # Node ID 89e06a821ad5986035de99c8bc1f9d7a99541b2a

     6 # Parent  feaf8bd56a82749f5d0d8869b7c0a1c01e300362

     7 Bug 963029 - AArch64 support for MFBT. r=froydnj

     8 

     9 Index: mozilla/mfbt/Endian.h

    10 ===================================================================

    11 --- mozilla.orig/mfbt/Endian.h

    12 +++ mozilla/mfbt/Endian.h

    13 @@ -121,14 +121,14 @@

    14  #elif defined(__sparc) || defined(__sparc__) || \

    15        defined(_POWER) || defined(__hppa) || \

    16        defined(_MIPSEB) || defined(__ARMEB__) || \

    17 -      defined(__s390__) || \

    18 +      defined(__s390__) || defined(__AARCH64EB__) || \

    19        (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \

    20        (defined(__ia64) && defined(__BIG_ENDIAN__))

    21  #  define MOZ_BIG_ENDIAN 1

    22  #elif defined(__i386) || defined(__i386__) || \

    23        defined(__x86_64) || defined(__x86_64__) || \

    24        defined(_MIPSEL) || defined(__ARMEL__) || \

    25 -      defined(__alpha__) || \

    26 +      defined(__alpha__) || defined(__AARCH64EL__) ||  \

    27        (defined(__sh__) && defined(__BIG_ENDIAN__)) || \

    28        (defined(__ia64) && !defined(__BIG_ENDIAN__))

    29  #  define MOZ_LITTLE_ENDIAN 1

    30 Index: mozilla/mfbt/tests/TestPoisonArea.cpp

    31 ===================================================================

    32 --- mozilla.orig/mfbt/tests/TestPoisonArea.cpp

    33 +++ mozilla/mfbt/tests/TestPoisonArea.cpp

    34 @@ -161,6 +161,9 @@

    35  #elif defined __s390__

    36  #define RETURN_INSTR 0x07fe0000 /* br %r14 */

    37  

    38 +#elif defined __aarch64__

    39 +#define RETURN_INSTR 0xd65f03c0 /* ret */

    40 +

    41  #elif defined __ia64

    42  struct ia64_instr { uint32_t i[4]; };

    43  static const ia64_instr _return_instr =