--- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100 +++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 @@ -253,7 +253,11 @@ // Request profiling signals. struct sigaction sa; +#if defined(GP_ARCH_arm) + sa.sa_sigaction = SigprofHandler; +#else sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); +#endif sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART | SA_SIGINFO; if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { @@ -497,8 +501,10 @@ ucontext_t sSyncUContext; void Registers::SyncPopulate() { +#if defined(__GLIBC__) if (!getcontext(&sSyncUContext)) { PopulateRegsFromContext(*this, &sSyncUContext); } +#endif } #endif