diff options
Diffstat (limited to 'testing/firefox/fix-tools.patch')
| -rw-r--r-- | testing/firefox/fix-tools.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch index c7357b6f7e..ff6622582f 100644 --- a/testing/firefox/fix-tools.patch +++ b/testing/firefox/fix-tools.patch @@ -1,25 +1,25 @@ +for basename() see https://bugzilla.mozilla.org/show_bug.cgi?id=1041962 + +diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp +index 70b43d5..686748e 100644 --- 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) - { +@@ -505,8 +505,10 @@ TickSample::PopulateContext(ucontext_t* aContext) + MOZ_ASSERT(mIsSynchronous); MOZ_ASSERT(aContext); -+#if defined(__GLIBC__) - ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext); - if (!getcontext(pContext)) { - context = pContext; - SetSampleContext(this, - reinterpret_cast<ucontext_t*>(aContext)->uc_mcontext); + ++#if defined(__GLIBC__) || defined(GP_OS_android) + if (!getcontext(aContext)) { + FillInSample(*this, aContext); } +#endif } - void OS::SleepMicro(int microseconds) diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp -index a922137..d01dde1 100644 +index cb5bee3..2be2aa9 100644 --- a/tools/profiler/lul/LulElf.cpp +++ b/tools/profiler/lul/LulElf.cpp -@@ -483,10 +483,10 @@ string FormatIdentifier(unsigned char identifier[16]) { +@@ -484,10 +484,10 @@ string FormatIdentifier(unsigned char identifier[16]) { // Return the non-directory portion of FILENAME: the portion after the // last slash, or the whole filename if there are no slashes. string BaseFileName(const string &filename) { |