1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
From 1c3f6dd9bb478fea0622e8a9ba2efbf19d73e302 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Fri, 1 Jun 2018 14:46:47 -0700
Subject: [PATCH] Update the double conversion update script
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
.../add-mfbt-api-markers.patch | 94 -------------------
.../more-architectures.patch | 30 ------
mfbt/double-conversion/update.sh | 8 +-
3 files changed, 3 insertions(+), 129 deletions(-)
delete mode 100644 mfbt/double-conversion/add-mfbt-api-markers.patch
delete mode 100644 mfbt/double-conversion/more-architectures.patch
diff --git a/mfbt/double-conversion/add-mfbt-api-markers.patch b/mfbt/double-conversion/add-mfbt-api-markers.patch
deleted file mode 100644
index b98ec74..0000000
--- a/mfbt/double-conversion/add-mfbt-api-markers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/mfbt/double-conversion/double-conversion.h b/mfbt/double-conversion/double-conversion.h
-index f98edae..e536a01 100644
---- a/mfbt/double-conversion/double-conversion.h
-+++ b/mfbt/double-conversion/double-conversion.h
-@@ -28,6 +28,7 @@
- #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
- #define DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_
-
-+#include "mozilla/Types.h"
- #include "utils.h"
-
- namespace double_conversion {
-@@ -129,7 +130,7 @@ class DoubleToStringConverter {
- }
-
- // Returns a converter following the EcmaScript specification.
-- static const DoubleToStringConverter& EcmaScriptConverter();
-+ static MFBT_API(const DoubleToStringConverter&) EcmaScriptConverter();
-
- // Computes the shortest string of digits that correctly represent the input
- // number. Depending on decimal_in_shortest_low and decimal_in_shortest_high
-@@ -197,7 +198,7 @@ class DoubleToStringConverter {
- // The last two conditions imply that the result will never contain more than
- // 1 + kMaxFixedDigitsBeforePoint + 1 + kMaxFixedDigitsAfterPoint characters
- // (one additional character for the sign, and one for the decimal point).
-- bool ToFixed(double value,
-+ MFBT_API(bool) ToFixed(double value,
- int requested_digits,
- StringBuilder* result_builder) const;
-
-@@ -229,7 +230,7 @@ class DoubleToStringConverter {
- // kMaxExponentialDigits + 8 characters (the sign, the digit before the
- // decimal point, the decimal point, the exponent character, the
- // exponent's sign, and at most 3 exponent digits).
-- bool ToExponential(double value,
-+ MFBT_API(bool) ToExponential(double value,
- int requested_digits,
- StringBuilder* result_builder) const;
-
-@@ -267,7 +268,7 @@ class DoubleToStringConverter {
- // The last condition implies that the result will never contain more than
- // kMaxPrecisionDigits + 7 characters (the sign, the decimal point, the
- // exponent character, the exponent's sign, and at most 3 exponent digits).
-- bool ToPrecision(double value,
-+ MFBT_API(bool) ToPrecision(double value,
- int precision,
- StringBuilder* result_builder) const;
-
-@@ -292,7 +293,7 @@ class DoubleToStringConverter {
- // kBase10MaximalLength.
- // Note that DoubleToAscii null-terminates its input. So the given buffer
- // should be at least kBase10MaximalLength + 1 characters long.
-- static const int kBase10MaximalLength = 17;
-+ static const MFBT_DATA(int) kBase10MaximalLength = 17;
-
- // Converts the given double 'v' to ascii. 'v' must not be NaN, +Infinity, or
- // -Infinity. In SHORTEST_SINGLE-mode this restriction also applies to 'v'
-@@ -332,7 +333,7 @@ class DoubleToStringConverter {
- // terminating null-character when computing the maximal output size.
- // The given length is only used in debug mode to ensure the buffer is big
- // enough.
-- static void DoubleToAscii(double v,
-+ static MFBT_API(void) DoubleToAscii(double v,
- DtoaMode mode,
- int requested_digits,
- char* buffer,
-@@ -343,7 +344,7 @@ class DoubleToStringConverter {
-
- private:
- // Implementation for ToShortest and ToShortestSingle.
-- bool ToShortestIeeeNumber(double value,
-+ MFBT_API(bool) ToShortestIeeeNumber(double value,
- StringBuilder* result_builder,
- DtoaMode mode) const;
-
-@@ -351,15 +352,15 @@ class DoubleToStringConverter {
- // corresponding string using the configured infinity/nan-symbol.
- // If either of them is NULL or the value is not special then the
- // function returns false.
-- bool HandleSpecialValues(double value, StringBuilder* result_builder) const;
-+ MFBT_API(bool) HandleSpecialValues(double value, StringBuilder* result_builder) const;
- // Constructs an exponential representation (i.e. 1.234e56).
- // The given exponent assumes a decimal point after the first decimal digit.
-- void CreateExponentialRepresentation(const char* decimal_digits,
-+ MFBT_API(void) CreateExponentialRepresentation(const char* decimal_digits,
- int length,
- int exponent,
- StringBuilder* result_builder) const;
- // Creates a decimal representation (i.e 1234.5678).
-- void CreateDecimalRepresentation(const char* decimal_digits,
-+ MFBT_API(void) CreateDecimalRepresentation(const char* decimal_digits,
- int length,
- int decimal_point,
- int digits_after_point,
diff --git a/mfbt/double-conversion/more-architectures.patch b/mfbt/double-conversion/more-architectures.patch
deleted file mode 100644
index b8d3804..0000000
--- a/mfbt/double-conversion/more-architectures.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
---- a/mfbt/double-conversion/utils.h
-+++ b/mfbt/double-conversion/utils.h
-@@ -48,20 +48,24 @@
- // An easy way to test if the floating-point operations are correct is to
- // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then
- // the result is equal to 89255e-22.
- // The best way to test this, is to create a division-function and to compare
- // the output of the division with the expected result. (Inlining must be
- // disabled.)
- // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
- #if defined(_M_X64) || defined(__x86_64__) || \
-- defined(__ARMEL__) || \
-+ defined(__ARMEL__) || defined(__avr32__) || \
-+ defined(__hppa__) || defined(__ia64__) || \
-+ defined(__mips__) || defined(__powerpc__) || \
-+ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
-+ defined(__SH4__) || defined(__alpha__) || \
- defined(_MIPS_ARCH_MIPS32R2)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
--#elif defined(_M_IX86) || defined(__i386__)
-+#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
- #if defined(_WIN32)
- // Windows uses a 64bit wide floating point stack.
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #else
- #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
- #endif // _WIN32
- #else
- #error Target architecture was not detected as supported by Double-Conversion.
diff --git a/mfbt/double-conversion/update.sh b/mfbt/double-conversion/update.sh
index 81add8e..9ef2e91 100755
--- a/mfbt/double-conversion/update.sh
+++ b/mfbt/double-conversion/update.sh
@@ -4,14 +4,12 @@
# double-conversion source that we need.
cp $1/LICENSE ./
-cp $1/README ./
+cp $1/COPYING ./
# Includes
-cp $1/src/*.h ./
+cp $1/double-conversion/*.h ./
# Source
-cp $1/src/*.cc ./
+cp $1/double-conversion/*.cc ./
-patch -p3 < add-mfbt-api-markers.patch
patch -p3 < use-StandardInteger.patch
-patch -p3 < more-architectures.patch
--
2.17.0
|
