diff options
Diffstat (limited to 'testing/firefox/fix-tools.patch')
| -rw-r--r-- | testing/firefox/fix-tools.patch | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch index ea5a2cd785..c7357b6f7e 100644 --- a/testing/firefox/fix-tools.patch +++ b/testing/firefox/fix-tools.patch @@ -1,8 +1,6 @@ -diff --git a/tools/profiler/core/platform-linux.cc b/tools/profiler/core/platform-linux.cc -index 0df1e8f..d868895 100644 ---- a/tools/profiler/core/platform-linux.cc -+++ b/tools/profiler/core/platform-linux.cc -@@ -711,11 +711,13 @@ void OS::Startup() { +--- a/tools/profiler/core/platform-linux-android.cpp ++++ b/tools/profiler/core/platform-linux-android.cpp +@@ -715,11 +715,13 @@ void TickSample::PopulateContext(void* aContext) { MOZ_ASSERT(aContext); @@ -10,25 +8,13 @@ index 0df1e8f..d868895 100644 ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext); if (!getcontext(pContext)) { context = pContext; - SetSampleContext(this, aContext); + SetSampleContext(this, + reinterpret_cast<ucontext_t*>(aContext)->uc_mcontext); } +#endif } void OS::SleepMicro(int microseconds) -diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h -index a38b3b5..170bd75 100644 ---- a/tools/profiler/core/platform.h -+++ b/tools/profiler/core/platform.h -@@ -34,6 +34,8 @@ - #define MOZ_COUNT_DTOR(name) - #endif - -+#include <sys/types.h> -+ - #ifdef ANDROID - #include <android/log.h> - #else diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp index a922137..d01dde1 100644 --- a/tools/profiler/lul/LulElf.cpp |