--- a/mozilla-bmo1463035.patch Sat Jan 26 22:42:57 2019 +0100
+++ b/mozilla-bmo1463035.patch Thu Jan 31 11:21:22 2019 +0100
@@ -3,7 +3,7 @@
# User Mike Hommey <mh+mozilla@glandium.org>
# Date 1526871862 -32400
# Node ID 94f21505ff13cd089f7129cd24927cf8b31a0f43
-# Parent 1800b8895c08bc0c60302775dc0a4b5ea4deb310
+# Parent 25ab6bab437517a8a182f1ab77898ae13b26a696
Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r?darchons
For some reason, GNU as is not happy with the assembly generated after
@@ -12,12 +12,11 @@
OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this
workaround anymore, so let's just kill it.
-
diff --git a/mfbt/LinuxSignal.h b/mfbt/LinuxSignal.h
deleted file mode 100644
--- a/mfbt/LinuxSignal.h
+++ /dev/null
-@@ -1,45 +0,0 @@
+@@ -1,38 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -38,35 +37,28 @@
-// will be skipped over.
-
-template <void (*H)(int, siginfo_t*, void*)>
--__attribute__((naked)) void
--SignalTrampoline(int aSignal, siginfo_t* aInfo, void* aContext)
--{
-- asm volatile (
-- "nop; nop; nop; nop"
-- : : : "memory");
+-__attribute__((naked)) void SignalTrampoline(int aSignal, siginfo_t* aInfo,
+- void* aContext) {
+- asm volatile("nop; nop; nop; nop" : : : "memory");
-
-- asm volatile (
-- "b %0"
-- :
-- : "X"(H)
-- : "memory");
+- asm volatile("b %0" : : "X"(H) : "memory");
-}
-
--# define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
+-#define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
-
--#else // __arm__
+-#else // __arm__
-
--# define MOZ_SIGNAL_TRAMPOLINE(h) (h)
+-#define MOZ_SIGNAL_TRAMPOLINE(h) (h)
-
--#endif // __arm__
+-#endif // __arm__
-
--} // namespace mozilla
+-} // namespace mozilla
-
--#endif // mozilla_LinuxSignal_h
+-#endif // mozilla_LinuxSignal_h
diff --git a/mfbt/moz.build b/mfbt/moz.build
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
-@@ -117,20 +117,16 @@ EXPORTS["double-conversion"] = [
+@@ -124,20 +124,16 @@ EXPORTS["double-conversion"] = [
LOCAL_INCLUDES += [
'/mfbt/double-conversion',
]
@@ -92,9 +84,9 @@
+++ b/tools/profiler/core/platform-linux-android.cpp
@@ -55,17 +55,16 @@
#ifdef __GLIBC__
- #include <execinfo.h> // backtrace, backtrace_symbols
- #endif // def __GLIBC__
- #include <strings.h> // index
+ #include <execinfo.h> // backtrace, backtrace_symbols
+ #endif // def __GLIBC__
+ #include <strings.h> // index
#include <errno.h>
#include <stdarg.h>
@@ -108,7 +100,7 @@
using namespace mozilla;
-@@ -272,17 +271,17 @@ Sampler::Sampler(PSLockRef aLock)
+@@ -248,17 +247,17 @@ Sampler::Sampler(PSLockRef aLock)
// NOTE: We don't initialize LUL here, instead initializing it in
// SamplerThread's constructor. This is because with the
@@ -126,5 +118,4 @@
}
}
- void
-
+ void Sampler::Disable(PSLockRef aLock) {