1179
|
1 |
# HG changeset patch
|
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
1180
|
3 |
# Parent 39a0846a4f2df1c4669273933d74567a8774e1da
|
1179
|
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 |
|
1180
|
28 |
diff --git a/media/ffvpx/config_unix_aarch64.h b/media/ffvpx/config_unix_aarch64.h
|
|
29 |
--- a/media/ffvpx/config_unix_aarch64.h
|
|
30 |
+++ b/media/ffvpx/config_unix_aarch64.h
|
|
31 |
@@ -324,17 +324,17 @@
|
|
32 |
#define HAVE_SETCONSOLETEXTATTRIBUTE 0
|
|
33 |
#define HAVE_SETCONSOLECTRLHANDLER 0
|
|
34 |
#define HAVE_SETDLLDIRECTORY 0
|
|
35 |
#define HAVE_SETMODE 0
|
|
36 |
#define HAVE_SETRLIMIT 1
|
|
37 |
#define HAVE_SLEEP 0
|
|
38 |
#define HAVE_STRERROR_R 1
|
|
39 |
#define HAVE_SYSCONF 1
|
|
40 |
-#define HAVE_SYSCTL 1
|
|
41 |
+#define HAVE_SYSCTL 0
|
|
42 |
#define HAVE_USLEEP 1
|
|
43 |
#define HAVE_UTGETOSTYPEFROMSTRING 0
|
|
44 |
#define HAVE_VIRTUALALLOC 0
|
|
45 |
#define HAVE_WGLGETPROCADDRESS 0
|
|
46 |
#define HAVE_BCRYPT 0
|
|
47 |
#define HAVE_VAAPI_DRM 0
|
|
48 |
#define HAVE_VAAPI_X11 0
|
|
49 |
#define HAVE_VDPAU_X11 0
|
1179
|
50 |
diff --git a/mozglue/misc/SIMD_avx2.cpp b/mozglue/misc/SIMD_avx2.cpp
|
|
51 |
--- a/mozglue/misc/SIMD_avx2.cpp
|
|
52 |
+++ b/mozglue/misc/SIMD_avx2.cpp
|
|
53 |
@@ -50,17 +50,17 @@ template <typename TValue>
|
|
54 |
}
|
|
55 |
if (sizeof(TValue) == 2) {
|
|
56 |
return _mm256_cmpeq_epi16(a, b);
|
|
57 |
}
|
|
58 |
|
|
59 |
return _mm256_cmpeq_epi64(a, b);
|
|
60 |
}
|
|
61 |
|
|
62 |
-# if defined(__GNUC__) && !defined(__clang__)
|
|
63 |
+# if 0
|
|
64 |
|
|
65 |
// See the comment in SIMD.cpp over Load32BitsIntoXMM. This is just adapted
|
|
66 |
// from that workaround. Testing this, it also yields the correct instructions
|
|
67 |
// across all tested compilers.
|
|
68 |
__m128i Load64BitsIntoXMM(uintptr_t ptr) {
|
|
69 |
int64_t tmp;
|
|
70 |
memcpy(&tmp, reinterpret_cast<const void*>(ptr), sizeof(tmp));
|
|
71 |
return _mm_cvtsi64_si128(tmp);
|