author | Wolfgang Rosenauer <wr@rosenauer.org> |
Mon, 30 Mar 2020 21:49:01 +0200 | |
branch | firefox74 |
changeset 1123 | 7fa561e5d7c7 |
parent 1119 | 4c5d44d40a03 |
child 1125 | 3fd9346c90a6 |
permissions | -rw-r--r-- |
1076 | 1 |
|
2 |
# HG changeset patch |
|
3 |
# User Mike Hommey <mh+mozilla@glandium.org> |
|
4 |
# Date 1526871862 -32400 |
|
5 |
# Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43 |
|
1123 | 6 |
# Parent 71b9d492b739602dbfe713fd4de3205e9d485f18 |
1076 | 7 |
Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons |
8 |
||
9 |
For some reason, GNU as is not happy with the assembly generated after |
|
10 |
bug 1238661 anymore on Debian armel. |
|
11 |
||
12 |
OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this |
|
13 |
workaround anymore, so let's just kill it. |
|
14 |
||
15 |
diff --git a/mfbt/moz.build b/mfbt/moz.build |
|
16 |
--- a/mfbt/moz.build |
|
17 |
+++ b/mfbt/moz.build |
|
1123 | 18 |
@@ -131,20 +131,16 @@ EXPORTS["double-conversion"] = [ |
1076 | 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', |
|
1119 | 38 |
'double-conversion/double-conversion/double-to-string.cc', |
1107
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
39 |
diff --git a/mozglue/baseprofiler/core/platform-linux-android.cpp b/mozglue/baseprofiler/core/platform-linux-android.cpp |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
40 |
--- a/mozglue/baseprofiler/core/platform-linux-android.cpp |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
41 |
+++ b/mozglue/baseprofiler/core/platform-linux-android.cpp |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
42 |
@@ -55,17 +55,16 @@ |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
43 |
#ifdef __GLIBC__ |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
44 |
# include <execinfo.h> // backtrace, backtrace_symbols |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
45 |
#endif // def __GLIBC__ |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
46 |
#include <strings.h> // index |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
47 |
#include <errno.h> |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
48 |
#include <stdarg.h> |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
49 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
50 |
#include "prenv.h" |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
51 |
-#include "mozilla/LinuxSignal.h" |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
52 |
#include "mozilla/PodOperations.h" |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
53 |
#include "mozilla/DebugOnly.h" |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
54 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
55 |
#include <string.h> |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
56 |
#include <list> |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
57 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
58 |
using namespace mozilla; |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
59 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
60 |
@@ -266,17 +265,17 @@ Sampler::Sampler(PSLockRef aLock) |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
61 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
62 |
// NOTE: We don't initialize LUL here, instead initializing it in |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
63 |
// SamplerThread's constructor. This is because with the |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
64 |
// profiler_suspend_and_sample_thread entry point, we want to be able to |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
65 |
// sample without waiting for LUL to be initialized. |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
66 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
67 |
// Request profiling signals. |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
68 |
struct sigaction sa; |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
69 |
- sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
70 |
+ sa.sa_sigaction = SigprofHandler; |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
71 |
sigemptyset(&sa.sa_mask); |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
72 |
sa.sa_flags = SA_RESTART | SA_SIGINFO; |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
73 |
if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
74 |
MOZ_CRASH("Error installing SIGPROF handler in the profiler"); |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
75 |
} |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
76 |
} |
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
77 |
|
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
78 |
void Sampler::Disable(PSLockRef aLock) { |
1076 | 79 |
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 |
|
81 |
+++ b/tools/profiler/core/platform-linux-android.cpp |
|
82 |
@@ -55,17 +55,16 @@ |
|
83 |
#ifdef __GLIBC__ |
|
1089 | 84 |
# include <execinfo.h> // backtrace, backtrace_symbols |
85 |
#endif // def __GLIBC__ |
|
86 |
#include <strings.h> // index |
|
1076 | 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 |
||
1107
a2aa55e10564
Firefox 69 as submitted to TW
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1089
diff
changeset
|
100 |
@@ -257,17 +256,17 @@ Sampler::Sampler(PSLockRef aLock) |
1076 | 101 |
|
102 |
// NOTE: We don't initialize LUL here, instead initializing it in |
|
103 |
// SamplerThread's constructor. This is because with the |
|
104 |
// profiler_suspend_and_sample_thread entry point, we want to be able to |
|
105 |
// sample without waiting for LUL to be initialized. |
|
106 |
||
107 |
// Request profiling signals. |
|
108 |
struct sigaction sa; |
|
109 |
- sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); |
|
110 |
+ sa.sa_sigaction = SigprofHandler; |
|
111 |
sigemptyset(&sa.sa_mask); |
|
112 |
sa.sa_flags = SA_RESTART | SA_SIGINFO; |
|
113 |
if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { |
|
114 |
MOZ_CRASH("Error installing SIGPROF handler in the profiler"); |
|
115 |
} |
|
116 |
} |
|
117 |
||
1085
87f893cf45b9
Firefox 65.0 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1076
diff
changeset
|
118 |
void Sampler::Disable(PSLockRef aLock) { |