1 |
1 |
2 # HG changeset patch |
2 # HG changeset patch |
3 # User Mike Hommey <mh+mozilla@glandium.org> |
3 # User Mike Hommey <mh+mozilla@glandium.org> |
4 # Date 1526871862 -32400 |
4 # Date 1526871862 -32400 |
5 # Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43 |
5 # Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43 |
6 # Parent 71b9d492b739602dbfe713fd4de3205e9d485f18 |
6 # Parent 0b7e1398ca2e15e27da93144ba9fb30db38367b1 |
7 Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons |
7 Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons |
8 |
8 |
9 For some reason, GNU as is not happy with the assembly generated after |
9 For some reason, GNU as is not happy with the assembly generated after |
10 bug 1238661 anymore on Debian armel. |
10 bug 1238661 anymore on Debian armel. |
11 |
11 |
12 OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this |
12 OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this |
13 workaround anymore, so let's just kill it. |
13 workaround anymore, so let's just kill it. |
14 |
14 |
15 diff --git a/mfbt/moz.build b/mfbt/moz.build |
|
16 --- a/mfbt/moz.build |
|
17 +++ b/mfbt/moz.build |
|
18 @@ -131,20 +131,16 @@ EXPORTS["double-conversion"] = [ |
|
19 LOCAL_INCLUDES += [ |
|
20 '/mfbt/double-conversion', |
|
21 ] |
|
22 |
|
23 if CONFIG['OS_ARCH'] == 'WINNT': |
|
24 EXPORTS.mozilla += [ |
|
25 'WindowsVersion.h', |
|
26 ] |
|
27 -elif CONFIG['OS_ARCH'] == 'Linux': |
|
28 - EXPORTS.mozilla += [ |
|
29 - 'LinuxSignal.h', |
|
30 - ] |
|
31 |
|
32 UNIFIED_SOURCES += [ |
|
33 'Assertions.cpp', |
|
34 'ChaosMode.cpp', |
|
35 'double-conversion/double-conversion/bignum-dtoa.cc', |
|
36 'double-conversion/double-conversion/bignum.cc', |
|
37 'double-conversion/double-conversion/cached-powers.cc', |
|
38 'double-conversion/double-conversion/double-to-string.cc', |
|
39 diff --git a/mozglue/baseprofiler/core/platform-linux-android.cpp b/mozglue/baseprofiler/core/platform-linux-android.cpp |
15 diff --git a/mozglue/baseprofiler/core/platform-linux-android.cpp b/mozglue/baseprofiler/core/platform-linux-android.cpp |
40 --- a/mozglue/baseprofiler/core/platform-linux-android.cpp |
16 --- a/mozglue/baseprofiler/core/platform-linux-android.cpp |
41 +++ b/mozglue/baseprofiler/core/platform-linux-android.cpp |
17 +++ b/mozglue/baseprofiler/core/platform-linux-android.cpp |
42 @@ -55,17 +55,16 @@ |
18 @@ -55,17 +55,16 @@ |
43 #ifdef __GLIBC__ |
19 #ifdef __GLIBC__ |
77 |
53 |
78 void Sampler::Disable(PSLockRef aLock) { |
54 void Sampler::Disable(PSLockRef aLock) { |
79 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp |
55 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp |
80 --- a/tools/profiler/core/platform-linux-android.cpp |
56 --- a/tools/profiler/core/platform-linux-android.cpp |
81 +++ b/tools/profiler/core/platform-linux-android.cpp |
57 +++ b/tools/profiler/core/platform-linux-android.cpp |
82 @@ -55,17 +55,16 @@ |
58 @@ -258,17 +258,17 @@ Sampler::Sampler(PSLockRef aLock) |
83 #ifdef __GLIBC__ |
|
84 # include <execinfo.h> // backtrace, backtrace_symbols |
|
85 #endif // def __GLIBC__ |
|
86 #include <strings.h> // index |
|
87 #include <errno.h> |
|
88 #include <stdarg.h> |
|
89 |
|
90 #include "prenv.h" |
|
91 -#include "mozilla/LinuxSignal.h" |
|
92 #include "mozilla/PodOperations.h" |
|
93 #include "mozilla/DebugOnly.h" |
|
94 |
|
95 #include <string.h> |
|
96 #include <list> |
|
97 |
|
98 using namespace mozilla; |
|
99 |
|
100 @@ -257,17 +256,17 @@ Sampler::Sampler(PSLockRef aLock) |
|
101 |
59 |
102 // NOTE: We don't initialize LUL here, instead initializing it in |
60 // NOTE: We don't initialize LUL here, instead initializing it in |
103 // SamplerThread's constructor. This is because with the |
61 // SamplerThread's constructor. This is because with the |
104 // profiler_suspend_and_sample_thread entry point, we want to be able to |
62 // profiler_suspend_and_sample_thread entry point, we want to be able to |
105 // sample without waiting for LUL to be initialized. |
63 // sample without waiting for LUL to be initialized. |