Bug 1205074 - Enable EHABI stack walking on Android r=BenWa

This commit is contained in:
James Willcox 2015-09-15 17:20:52 -05:00
parent 7073cd23a2
commit 63adf04a7b
3 changed files with 4 additions and 3 deletions

View File

@ -70,8 +70,8 @@ typedef ucontext_t tickcontext_t;
pid_t gettid();
#endif
#if defined(SPS_ARCH_arm) && defined(MOZ_WIDGET_GONK)
// Should also work on other Android and ARM Linux, but not tested there yet.
#if defined(__arm__) && defined(ANDROID)
// Should also work on ARM Linux, but not tested there yet.
#define USE_EHABI_STACKWALK
#endif
#ifdef USE_EHABI_STACKWALK

View File

@ -76,7 +76,7 @@
#include "GeckoSampler.h"
#include "ThreadResponsiveness.h"
#if defined(__ARM_EABI__) && defined(MOZ_WIDGET_GONK)
#if defined(__ARM_EABI__) && defined(ANDROID)
// Should also work on other Android and ARM Linux, but not tested there yet.
# define USE_EHABI_STACKWALK
# include "EHABIStackWalk.h"

View File

@ -243,6 +243,7 @@ class Thread {
#undef HAVE_NATIVE_UNWIND
#if defined(MOZ_PROFILING) \
&& (defined(SPS_PLAT_amd64_linux) || defined(SPS_PLAT_arm_android) \
|| (defined(MOZ_WIDGET_ANDROID) && defined(__arm__)) \
|| defined(SPS_PLAT_x86_linux) \
|| defined(SPS_OS_windows) \
|| defined(SPS_OS_darwin))