mozilla-aarch64-bmo-962488.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Mon, 14 Apr 2014 09:09:11 +0200
changeset 716 cef565f1c325
parent 715 e1c226a4de34
permissions -rw-r--r--
update to Firefox 29.0b7
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 1393440196 18000
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
     5
# Node ID 6a46f53ad944b44385398822d7bcf7621a785d91
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
     6
# Parent  0aa56e2a5f816a30da48701f73d03060ee9692b2
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
     7
Bug 962488 - Update double-conversion for proper AArch64 support. 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
Fix imported from upstream repository:
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    10
https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    11
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    12
diff --git a/mfbt/double-conversion/fix-aarch64-macro.patch b/mfbt/double-conversion/fix-aarch64-macro.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    13
new file mode 100644
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    14
--- /dev/null
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    15
+++ b/mfbt/double-conversion/fix-aarch64-macro.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    16
@@ -0,0 +1,23 @@
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    17
+Backport from upstream.
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    18
+
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    19
+https://code.google.com/p/double-conversion/source/detail?r=4e24bb31bcc76d6d218f3056b4c24a109d367561
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    20
+
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    21
+---
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    22
+ mfbt/double-conversion/utils.h |    2 +-
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    23
+ 1 file changed, 1 insertion(+), 1 deletion(-)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    24
+
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    25
+--- a/mfbt/double-conversion/utils.h
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    26
++++ b/mfbt/double-conversion/utils.h
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    27
+@@ -58,11 +58,11 @@
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    28
+     defined(__mips__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    29
+     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    30
+     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    31
+     defined(__SH4__) || defined(__alpha__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    32
+     defined(_MIPS_ARCH_MIPS32R2) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    33
+-    defined(_AARCH64EL_)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    34
++    defined(__AARCH64EL__)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    35
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    36
+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    37
+ #if defined(_WIN32)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    38
+ // Windows uses a 64bit wide floating point stack.
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    39
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    40
diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    41
--- a/mfbt/double-conversion/update.sh
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    42
+++ b/mfbt/double-conversion/update.sh
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    43
@@ -15,9 +15,12 @@ cp $1/src/*.h ./
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    44
 
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    45
 # Source
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    46
 cp $1/src/*.cc ./
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    47
 
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    48
 patch -p3 < add-mfbt-api-markers.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    49
 patch -p3 < use-StandardInteger.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    50
 patch -p3 < use-mozilla-assertions.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    51
 patch -p3 < use-static_assert.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    52
-patch -p3 < ToPrecision-exponential.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    53
\ No newline at end of file
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    54
+patch -p3 < ToPrecision-exponential.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    55
+
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    56
+# Merged upstream, part of 2.0.1 version
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    57
+patch -p3 < fix-aarch64-macro.patch
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    58
diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    59
--- a/mfbt/double-conversion/utils.h
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    60
+++ b/mfbt/double-conversion/utils.h
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    61
@@ -55,17 +55,17 @@
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    62
 #if defined(_M_X64) || defined(__x86_64__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    63
     defined(__ARMEL__) || defined(__avr32__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    64
     defined(__hppa__) || defined(__ia64__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    65
     defined(__mips__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    66
     defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    67
     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    68
     defined(__SH4__) || defined(__alpha__) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    69
     defined(_MIPS_ARCH_MIPS32R2) || \
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    70
-    defined(_AARCH64EL_)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    71
+    defined(__AARCH64EL__)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    72
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    73
 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    74
 #if defined(_WIN32)
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    75
 // Windows uses a 64bit wide floating point stack.
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    76
 #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    77
 #else
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    78
 #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    79
 #endif  // _WIN32
e1c226a4de34 AArch64 porting
Dirk M?ller <dmueller@suse.com>
parents:
diff changeset
    80