|
1 # HG changeset patch |
|
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
|
3 # Parent 63af48397aee6985bb8d711bd918a201e5c8c282 |
|
4 # References: bmo#1792159 - Add missing includes to AtomicOperationsGenerated.h |
|
5 |
|
6 diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py |
|
7 --- a/js/src/jit/GenerateAtomicOperations.py |
|
8 +++ b/js/src/jit/GenerateAtomicOperations.py |
|
9 @@ -702,16 +702,18 @@ HEADER_TEMPLATE = """\ |
|
10 * License, v. 2.0. If a copy of the MPL was not distributed with this |
|
11 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
12 |
|
13 #ifndef jit_AtomicOperationsGenerated_h |
|
14 #define jit_AtomicOperationsGenerated_h |
|
15 |
|
16 /* This file is generated by jit/GenerateAtomicOperations.py. Do not edit! */ |
|
17 |
|
18 +#include "mozilla/Attributes.h" |
|
19 + |
|
20 namespace js { |
|
21 namespace jit { |
|
22 |
|
23 %(contents)s |
|
24 |
|
25 } // namespace jit |
|
26 } // namespace js |
|
27 |
|
28 diff --git a/mozglue/misc/SIMD_avx2.cpp b/mozglue/misc/SIMD_avx2.cpp |
|
29 --- a/mozglue/misc/SIMD_avx2.cpp |
|
30 +++ b/mozglue/misc/SIMD_avx2.cpp |
|
31 @@ -50,17 +50,17 @@ template <typename TValue> |
|
32 } |
|
33 if (sizeof(TValue) == 2) { |
|
34 return _mm256_cmpeq_epi16(a, b); |
|
35 } |
|
36 |
|
37 return _mm256_cmpeq_epi64(a, b); |
|
38 } |
|
39 |
|
40 -# if defined(__GNUC__) && !defined(__clang__) |
|
41 +# if 0 |
|
42 |
|
43 // See the comment in SIMD.cpp over Load32BitsIntoXMM. This is just adapted |
|
44 // from that workaround. Testing this, it also yields the correct instructions |
|
45 // across all tested compilers. |
|
46 __m128i Load64BitsIntoXMM(uintptr_t ptr) { |
|
47 int64_t tmp; |
|
48 memcpy(&tmp, reinterpret_cast<const void*>(ptr), sizeof(tmp)); |
|
49 return _mm_cvtsi64_si128(tmp); |