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 fc741a5ea37dbe145e0ca5f85e5dfb100f3c9091 |
6 # Parent 5dc1d2186f44dd6ccfc4b28b9e1ed859cffc63bb |
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 |
34 'ChaosMode.cpp', |
34 'ChaosMode.cpp', |
35 'double-conversion/double-conversion/bignum-dtoa.cc', |
35 'double-conversion/double-conversion/bignum-dtoa.cc', |
36 'double-conversion/double-conversion/bignum.cc', |
36 'double-conversion/double-conversion/bignum.cc', |
37 'double-conversion/double-conversion/cached-powers.cc', |
37 'double-conversion/double-conversion/cached-powers.cc', |
38 'double-conversion/double-conversion/diy-fp.cc', |
38 'double-conversion/double-conversion/diy-fp.cc', |
|
39 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 |
|
41 +++ b/mozglue/baseprofiler/core/platform-linux-android.cpp |
|
42 @@ -55,17 +55,16 @@ |
|
43 #ifdef __GLIBC__ |
|
44 # include <execinfo.h> // backtrace, backtrace_symbols |
|
45 #endif // def __GLIBC__ |
|
46 #include <strings.h> // index |
|
47 #include <errno.h> |
|
48 #include <stdarg.h> |
|
49 |
|
50 #include "prenv.h" |
|
51 -#include "mozilla/LinuxSignal.h" |
|
52 #include "mozilla/PodOperations.h" |
|
53 #include "mozilla/DebugOnly.h" |
|
54 |
|
55 #include <string.h> |
|
56 #include <list> |
|
57 |
|
58 using namespace mozilla; |
|
59 |
|
60 @@ -266,17 +265,17 @@ Sampler::Sampler(PSLockRef aLock) |
|
61 |
|
62 // NOTE: We don't initialize LUL here, instead initializing it in |
|
63 // SamplerThread's constructor. This is because with the |
|
64 // profiler_suspend_and_sample_thread entry point, we want to be able to |
|
65 // sample without waiting for LUL to be initialized. |
|
66 |
|
67 // Request profiling signals. |
|
68 struct sigaction sa; |
|
69 - sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); |
|
70 + sa.sa_sigaction = SigprofHandler; |
|
71 sigemptyset(&sa.sa_mask); |
|
72 sa.sa_flags = SA_RESTART | SA_SIGINFO; |
|
73 if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { |
|
74 MOZ_CRASH("Error installing SIGPROF handler in the profiler"); |
|
75 } |
|
76 } |
|
77 |
|
78 void Sampler::Disable(PSLockRef aLock) { |
39 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp |
79 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp |
40 --- a/tools/profiler/core/platform-linux-android.cpp |
80 --- a/tools/profiler/core/platform-linux-android.cpp |
41 +++ b/tools/profiler/core/platform-linux-android.cpp |
81 +++ b/tools/profiler/core/platform-linux-android.cpp |
42 @@ -55,17 +55,16 @@ |
82 @@ -55,17 +55,16 @@ |
43 #ifdef __GLIBC__ |
83 #ifdef __GLIBC__ |
55 #include <string.h> |
95 #include <string.h> |
56 #include <list> |
96 #include <list> |
57 |
97 |
58 using namespace mozilla; |
98 using namespace mozilla; |
59 |
99 |
60 @@ -248,17 +247,17 @@ Sampler::Sampler(PSLockRef aLock) |
100 @@ -257,17 +256,17 @@ Sampler::Sampler(PSLockRef aLock) |
61 |
101 |
62 // NOTE: We don't initialize LUL here, instead initializing it in |
102 // NOTE: We don't initialize LUL here, instead initializing it in |
63 // SamplerThread's constructor. This is because with the |
103 // SamplerThread's constructor. This is because with the |
64 // profiler_suspend_and_sample_thread entry point, we want to be able to |
104 // profiler_suspend_and_sample_thread entry point, we want to be able to |
65 // sample without waiting for LUL to be initialized. |
105 // sample without waiting for LUL to be initialized. |